From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Marcelo Tosatti" <mtosatti@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
kvm@vger.kernel.org, "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 05/13] target/i386/cpu-sysemu: Inline kvm_apic_in_kernel()
Date: Mon, 4 Sep 2023 14:43:16 +0200 [thread overview]
Message-ID: <20230904124325.79040-6-philmd@linaro.org> (raw)
In-Reply-To: <20230904124325.79040-1-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>
---
target/i386/kvm/kvm_i386.h | 2 --
target/i386/cpu-sysemu.c | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/target/i386/kvm/kvm_i386.h b/target/i386/kvm/kvm_i386.h
index e24753abfe..470627b750 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() \
diff --git a/target/i386/cpu-sysemu.c b/target/i386/cpu-sysemu.c
index 28115edf44..2375e48178 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;
}
--
2.41.0
next prev parent reply other threads:[~2023-09-04 12:44 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-04 12:43 [PATCH 00/13] target/i386: Cleanups around KVM declarations Philippe Mathieu-Daudé
2023-09-04 12:43 ` [PATCH 01/13] hw/i386/pc: Include missing 'sysemu/tcg.h' header Philippe Mathieu-Daudé
2023-09-09 23:29 ` Richard Henderson
2023-09-04 12:43 ` [PATCH 02/13] hw/i386/pc: Include missing 'cpu.h' header Philippe Mathieu-Daudé
2023-09-09 23:31 ` Richard Henderson
2023-09-04 12:43 ` [PATCH 03/13] hw/i386/fw_cfg: " Philippe Mathieu-Daudé
2023-09-09 23:31 ` Richard Henderson
2023-09-04 12:43 ` [PATCH 04/13] target/i386/helper: Restrict KVM declarations to system emulation Philippe Mathieu-Daudé
2023-09-09 23:31 ` Richard Henderson
2023-09-04 12:43 ` Philippe Mathieu-Daudé [this message]
2023-09-09 23:32 ` [PATCH 05/13] target/i386/cpu-sysemu: Inline kvm_apic_in_kernel() Richard Henderson
2023-09-04 12:43 ` [PATCH 06/13] target/i386: Remove unused KVM stubs Philippe Mathieu-Daudé
2023-09-04 12:43 ` [PATCH 07/13] target/i386: Allow elision of kvm_enable_x2apic() Philippe Mathieu-Daudé
2023-09-04 13:40 ` Paolo Bonzini
2023-09-04 13:43 ` Philippe Mathieu-Daudé
2023-09-04 12:43 ` [PATCH 08/13] target/i386: Allow elision of kvm_hv_vpindex_settable() Philippe Mathieu-Daudé
2023-09-04 12:43 ` [PATCH 09/13] target/i386: Restrict declarations specific to CONFIG_KVM Philippe Mathieu-Daudé
2023-09-04 12:43 ` [PATCH 10/13] sysemu/kvm: Restrict kvm_arch_get_supported_cpuid/msr() to x86 targets Philippe Mathieu-Daudé
2023-09-04 12:43 ` [PATCH 11/13] sysemu/kvm: Restrict kvm_get_apic_state() " Philippe Mathieu-Daudé
2023-09-04 12:43 ` [PATCH 12/13] sysemu/kvm: Restrict kvm_has_pit_state2() " Philippe Mathieu-Daudé
2023-09-04 12:43 ` [PATCH 13/13] sysemu/kvm: Restrict kvm_pc_setup_irq_routing() " Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230904124325.79040-6-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=kvm@vger.kernel.org \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).