SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/i386/cpu-sysemu: Inline kvm_apic_in_kernel()

Browse Source 
In order to have cpu-sysemu.c become accelerator-agnostic,
inline kvm_apic_in_kernel() -- which is a simple wrapper
to kvm_irqchip_in_kernel() -- and use the generic "sysemu/kvm.h"
header.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904124325.79040-6-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2023-09-04 14:43:16 +02:00 committed by Paolo Bonzini
parent 28a43cb4dc
commit 721cf738a5
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/i386/cpu-sysemu.c
View File

@ -19,9 +19,9 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "cpu.h" #include "cpu.h"
#include "sysemu/kvm.h"
#include "sysemu/xen.h" #include "sysemu/xen.h"
#include "sysemu/whpx.h" #include "sysemu/whpx.h"
#include "kvm/kvm_i386.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-visit-run-state.h" #include "qapi/qapi-visit-run-state.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
@ -253,7 +253,7 @@ APICCommonClass *apic_get_class(Error **errp)
/* TODO: in-kernel irqchip for hvf */ /* TODO: in-kernel irqchip for hvf */
if (kvm_enabled()) { if (kvm_enabled()) {
if (!kvm_apic_in_kernel()) { if (!kvm_irqchip_in_kernel()) {
error_setg(errp, "KVM does not support userspace APIC"); error_setg(errp, "KVM does not support userspace APIC");
return NULL; return NULL;
} }

2
target/i386/kvm/kvm_i386.h
View File

@ -13,8 +13,6 @@
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#define kvm_apic_in_kernel() (kvm_irqchip_in_kernel())
#ifdef CONFIG_KVM #ifdef CONFIG_KVM
#define kvm_pit_in_kernel() \ #define kvm_pit_in_kernel() \