From: Claudio Fontana <cfontana@suse.de>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <rth@twiddle.net>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Roman Bolshakov" <r.bolshakov@yadro.com>
Cc: Laurent Vivier <lvivier@redhat.com>,
Thomas Huth <thuth@redhat.com>, Alberto Garcia <berto@igalia.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Pavel Dovgalyuk <dovgaluk@ispras.ru>,
Marcelo Tosatti <mtosatti@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com>,
Colin Xu <colin.xu@intel.com>,
Wenchao Wang <wenchao.wang@intel.com>,
haxm-team@intel.com, Sunil Muthuswamy <sunilmut@microsoft.com>,
Claudio Fontana <cfontana@suse.de>
Subject: [PATCH v8 15/17] hax: remove hax specific functions from global includes
Date: Wed, 16 Sep 2020 16:20:02 +0200 [thread overview]
Message-ID: <20200916142004.27429-16-cfontana@suse.de> (raw)
In-Reply-To: <20200916142004.27429-1-cfontana@suse.de>
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/stubs/hax-stub.c | 10 ----------
include/sysemu/hax.h | 17 -----------------
target/i386/hax-all.c | 1 -
target/i386/hax-cpus.c | 1 -
target/i386/hax-cpus.h | 16 ++++++++++++++++
target/i386/hax-mem.c | 2 +-
target/i386/hax-posix.c | 3 +--
target/i386/hax-windows.c | 2 +-
target/i386/hax-windows.h | 2 ++
9 files changed, 21 insertions(+), 33 deletions(-)
diff --git a/accel/stubs/hax-stub.c b/accel/stubs/hax-stub.c
index 7ad190cae2..1a9da83185 100644
--- a/accel/stubs/hax-stub.c
+++ b/accel/stubs/hax-stub.c
@@ -21,13 +21,3 @@ int hax_sync_vcpus(void)
{
return 0;
}
-
-int hax_init_vcpu(CPUState *cpu)
-{
- return -ENOSYS;
-}
-
-int hax_smp_cpu_exec(CPUState *cpu)
-{
- return -ENOSYS;
-}
diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h
index 9b27e65cc7..12fb54f990 100644
--- a/include/sysemu/hax.h
+++ b/include/sysemu/hax.h
@@ -22,29 +22,12 @@
#ifndef QEMU_HAX_H
#define QEMU_HAX_H
-
int hax_sync_vcpus(void);
-int hax_init_vcpu(CPUState *cpu);
-int hax_smp_cpu_exec(CPUState *cpu);
-int hax_populate_ram(uint64_t va, uint64_t size);
-
-void hax_cpu_synchronize_state(CPUState *cpu);
-void hax_cpu_synchronize_post_reset(CPUState *cpu);
-void hax_cpu_synchronize_post_init(CPUState *cpu);
-void hax_cpu_synchronize_pre_loadvm(CPUState *cpu);
#ifdef CONFIG_HAX
int hax_enabled(void);
-#include "qemu/bitops.h"
-#include "exec/memory.h"
-int hax_vcpu_destroy(CPUState *cpu);
-void hax_raise_event(CPUState *cpu);
-void hax_reset_vcpu_state(void *opaque);
-#include "target/i386/hax-interface.h"
-#include "target/i386/hax-i386.h"
-
#else /* CONFIG_HAX */
#define hax_enabled() (0)
diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c
index fd1ab673d7..fecfe8cd6e 100644
--- a/target/i386/hax-all.c
+++ b/target/i386/hax-all.c
@@ -28,7 +28,6 @@
#include "exec/address-spaces.h"
#include "qemu-common.h"
-#include "hax-i386.h"
#include "sysemu/accel.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
diff --git a/target/i386/hax-cpus.c b/target/i386/hax-cpus.c
index 9aad98bc7a..99770e590c 100644
--- a/target/i386/hax-cpus.c
+++ b/target/i386/hax-cpus.c
@@ -22,7 +22,6 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
-#include "hax-i386.h"
#include "sysemu/runstate.h"
#include "sysemu/cpus.h"
#include "qemu/guest-random.h"
diff --git a/target/i386/hax-cpus.h b/target/i386/hax-cpus.h
index a64417fe2d..ee8ab7a631 100644
--- a/target/i386/hax-cpus.h
+++ b/target/i386/hax-cpus.h
@@ -14,4 +14,20 @@
extern const CpusAccel hax_cpus;
+#include "hax-interface.h"
+#include "hax-i386.h"
+
+int hax_init_vcpu(CPUState *cpu);
+int hax_smp_cpu_exec(CPUState *cpu);
+int hax_populate_ram(uint64_t va, uint64_t size);
+
+void hax_cpu_synchronize_state(CPUState *cpu);
+void hax_cpu_synchronize_post_reset(CPUState *cpu);
+void hax_cpu_synchronize_post_init(CPUState *cpu);
+void hax_cpu_synchronize_pre_loadvm(CPUState *cpu);
+
+int hax_vcpu_destroy(CPUState *cpu);
+void hax_raise_event(CPUState *cpu);
+void hax_reset_vcpu_state(void *opaque);
+
#endif /* HAX_CPUS_H */
diff --git a/target/i386/hax-mem.c b/target/i386/hax-mem.c
index 6bb5a24917..71e637cf16 100644
--- a/target/i386/hax-mem.c
+++ b/target/i386/hax-mem.c
@@ -13,7 +13,7 @@
#include "exec/address-spaces.h"
#include "qemu/error-report.h"
-#include "target/i386/hax-i386.h"
+#include "hax-cpus.h"
#include "qemu/queue.h"
#define DEBUG_HAX_MEM 0
diff --git a/target/i386/hax-posix.c b/target/i386/hax-posix.c
index 6fb7867d11..735a749d4b 100644
--- a/target/i386/hax-posix.c
+++ b/target/i386/hax-posix.c
@@ -14,9 +14,8 @@
#include "qemu/osdep.h"
#include <sys/ioctl.h>
-#include "target/i386/hax-i386.h"
-
#include "sysemu/cpus.h"
+#include "hax-cpus.h"
hax_fd hax_mod_open(void)
{
diff --git a/target/i386/hax-windows.c b/target/i386/hax-windows.c
index 469b48e608..6c82dfb54f 100644
--- a/target/i386/hax-windows.c
+++ b/target/i386/hax-windows.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "hax-i386.h"
+#include "hax-cpus.h"
/*
* return 0 when success, -1 when driver not loaded,
diff --git a/target/i386/hax-windows.h b/target/i386/hax-windows.h
index 12cbd813dc..a5ce12d663 100644
--- a/target/i386/hax-windows.h
+++ b/target/i386/hax-windows.h
@@ -23,6 +23,8 @@
#include <winioctl.h>
#include <windef.h>
+#include "hax-cpus.h"
+
#define HAX_INVALID_FD INVALID_HANDLE_VALUE
static inline void hax_mod_close(struct hax_state *hax)
--
2.26.2
next prev parent reply other threads:[~2020-09-16 14:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-16 14:19 [PATCH v8 00/17] QEMU cpus.c refactoring part2 Claudio Fontana
2020-09-16 14:19 ` [PATCH v8 01/17] cpu-timers, icount: new modules Claudio Fontana
2020-09-16 14:19 ` [PATCH v8 02/17] icount: rename functions to be consistent with the module name Claudio Fontana
2020-09-16 14:19 ` [PATCH v8 03/17] cpus: prepare new CpusAccel cpu accelerator interface Claudio Fontana
2020-09-16 14:19 ` [PATCH v8 04/17] cpus: extract out TCG-specific code to accel/tcg Claudio Fontana
2020-09-16 14:19 ` [PATCH v8 05/17] cpus: extract out qtest-specific code to accel/qtest Claudio Fontana
2020-09-16 14:19 ` [PATCH v8 06/17] cpus: extract out kvm-specific code to accel/kvm Claudio Fontana
2020-09-16 14:19 ` [PATCH v8 07/17] cpus: extract out hax-specific code to target/i386/ Claudio Fontana
2020-09-16 14:19 ` [PATCH v8 08/17] cpus: extract out whpx-specific " Claudio Fontana
2020-09-16 14:19 ` [PATCH v8 09/17] cpus: extract out hvf-specific code to target/i386/hvf/ Claudio Fontana
2020-09-16 14:19 ` [PATCH v8 10/17] cpus: cleanup now unneeded includes Claudio Fontana
2020-09-16 14:19 ` [PATCH v8 11/17] cpus: remove checks for non-NULL cpus_accel Claudio Fontana
2020-09-16 14:19 ` [PATCH v8 12/17] cpus: add handle_interrupt to the CpusAccel interface Claudio Fontana
2020-09-16 14:20 ` [PATCH v8 13/17] hvf: remove hvf specific functions from global includes Claudio Fontana
2020-09-16 14:20 ` [PATCH v8 14/17] whpx: remove whpx " Claudio Fontana
2020-09-16 14:20 ` Claudio Fontana [this message]
2020-09-16 14:20 ` [PATCH v8 16/17] kvm: remove kvm " Claudio Fontana
2020-09-16 14:20 ` [PATCH v8 17/17] accel/tcg: use current_machine as it is always set for softmmu Claudio Fontana
2020-09-16 15:24 ` Philippe Mathieu-Daudé
2020-09-18 19:00 ` [PATCH v8 00/17] QEMU cpus.c refactoring part2 Richard Henderson
2020-09-25 13:09 ` Paolo Bonzini
2020-09-25 16:09 ` Claudio Fontana
2020-09-25 16:55 ` Peter Maydell
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=20200916142004.27429-16-cfontana@suse.de \
--to=cfontana@suse.de \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=berto@igalia.com \
--cc=colin.xu@intel.com \
--cc=dovgaluk@ispras.ru \
--cc=ehabkost@redhat.com \
--cc=haxm-team@intel.com \
--cc=lvivier@redhat.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=r.bolshakov@yadro.com \
--cc=richard.henderson@linaro.org \
--cc=rth@twiddle.net \
--cc=sunilmut@microsoft.com \
--cc=thuth@redhat.com \
--cc=wenchao.wang@intel.com \
/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).