[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 41/51] target/i386/cpu-sysemu: Inline kvm_apic_in_kernel()
From: |
Paolo Bonzini |
Subject: |
[PULL 41/51] target/i386/cpu-sysemu: Inline kvm_apic_in_kernel() |
Date: |
Thu, 7 Sep 2023 14:59:50 +0200 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
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>
---
target/i386/cpu-sysemu.c | 4 ++--
target/i386/kvm/kvm_i386.h | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/target/i386/cpu-sysemu.c b/target/i386/cpu-sysemu.c
index 28115edf44f..2375e48178f 100644
--- a/target/i386/cpu-sysemu.c
+++ b/target/i386/cpu-sysemu.c
@@ -19,9 +19,9 @@
#include "qemu/osdep.h"
#include "cpu.h"
+#include "sysemu/kvm.h"
#include "sysemu/xen.h"
#include "sysemu/whpx.h"
-#include "kvm/kvm_i386.h"
#include "qapi/error.h"
#include "qapi/qapi-visit-run-state.h"
#include "qapi/qmp/qdict.h"
@@ -253,7 +253,7 @@ APICCommonClass *apic_get_class(Error **errp)
/* TODO: in-kernel irqchip for hvf */
if (kvm_enabled()) {
- if (!kvm_apic_in_kernel()) {
+ if (!kvm_irqchip_in_kernel()) {
error_setg(errp, "KVM does not support userspace APIC");
return NULL;
}
diff --git a/target/i386/kvm/kvm_i386.h b/target/i386/kvm/kvm_i386.h
index e24753abfe6..470627b7504 100644
--- a/target/i386/kvm/kvm_i386.h
+++ b/target/i386/kvm/kvm_i386.h
@@ -13,8 +13,6 @@
#include "sysemu/kvm.h"
-#define kvm_apic_in_kernel() (kvm_irqchip_in_kernel())
-
#ifdef CONFIG_KVM
#define kvm_pit_in_kernel() \
--
2.41.0
- [PULL 29/51] configure, meson: move --enable-plugins to meson, (continued)
- [PULL 29/51] configure, meson: move --enable-plugins to meson, Paolo Bonzini, 2023/09/07
- [PULL 31/51] configure, meson: remove target OS symbols from config-host.mak, Paolo Bonzini, 2023/09/07
- [PULL 35/51] mkvenv: assume presence of importlib.metadata, Paolo Bonzini, 2023/09/07
- [PULL 34/51] Python: Drop support for Python 3.7, Paolo Bonzini, 2023/09/07
- [PULL 33/51] configure: remove dead code, Paolo Bonzini, 2023/09/07
- [PULL 39/51] hw/i386/fw_cfg: Include missing 'cpu.h' header, Paolo Bonzini, 2023/09/07
- [PULL 38/51] hw/i386/pc: Include missing 'cpu.h' header, Paolo Bonzini, 2023/09/07
- [PULL 28/51] configure: unify recursion into sub-Makefiles, Paolo Bonzini, 2023/09/07
- [PULL 36/51] Revert "mkvenv: work around broken pip installations on Debian 10", Paolo Bonzini, 2023/09/07
- [PULL 37/51] hw/i386/pc: Include missing 'sysemu/tcg.h' header, Paolo Bonzini, 2023/09/07
- [PULL 41/51] target/i386/cpu-sysemu: Inline kvm_apic_in_kernel(),
Paolo Bonzini <=
- [PULL 40/51] target/i386/helper: Restrict KVM declarations to system emulation, Paolo Bonzini, 2023/09/07
- [PULL 46/51] sysemu/kvm: Restrict kvm_arch_get_supported_cpuid/msr() to x86 targets, Paolo Bonzini, 2023/09/07
- [PULL 48/51] sysemu/kvm: Restrict kvm_has_pit_state2() to x86 targets, Paolo Bonzini, 2023/09/07
- [PULL 47/51] sysemu/kvm: Restrict kvm_get_apic_state() to x86 targets, Paolo Bonzini, 2023/09/07
- [PULL 42/51] target/i386: Remove unused KVM stubs, Paolo Bonzini, 2023/09/07
- [PULL 44/51] target/i386: Allow elision of kvm_hv_vpindex_settable(), Paolo Bonzini, 2023/09/07
- [PULL 51/51] docs/system/replay: do not show removed command line option, Paolo Bonzini, 2023/09/07
- [PULL 49/51] sysemu/kvm: Restrict kvm_pc_setup_irq_routing() to x86 targets, Paolo Bonzini, 2023/09/07
- [PULL 50/51] subprojects: add wrap file for libblkio, Paolo Bonzini, 2023/09/07
- [PULL 45/51] target/i386: Restrict declarations specific to CONFIG_KVM, Paolo Bonzini, 2023/09/07