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 14/17] whpx: remove whpx specific functions from global includes
Date: Wed, 16 Sep 2020 16:20:01 +0200 [thread overview]
Message-ID: <20200916142004.27429-15-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/meson.build | 1 -
accel/stubs/whpx-stub.c | 47 -----------------------------------------
include/sysemu/whpx.h | 19 -----------------
target/i386/whpx-cpus.h | 17 +++++++++++++++
4 files changed, 17 insertions(+), 67 deletions(-)
delete mode 100644 accel/stubs/whpx-stub.c
diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build
index 3fbe34e5bb..12dd1539af 100644
--- a/accel/stubs/meson.build
+++ b/accel/stubs/meson.build
@@ -2,4 +2,3 @@ specific_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c'))
specific_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c'))
specific_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
specific_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c'))
-specific_ss.add(when: 'CONFIG_WHPX', if_false: files('whpx-stub.c'))
diff --git a/accel/stubs/whpx-stub.c b/accel/stubs/whpx-stub.c
deleted file mode 100644
index 1efb89f25e..0000000000
--- a/accel/stubs/whpx-stub.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * QEMU Windows Hypervisor Platform accelerator (WHPX) stub
- *
- * Copyright Microsoft Corp. 2017
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include "cpu.h"
-#include "sysemu/whpx.h"
-
-int whpx_init_vcpu(CPUState *cpu)
-{
- return -1;
-}
-
-int whpx_vcpu_exec(CPUState *cpu)
-{
- return -1;
-}
-
-void whpx_destroy_vcpu(CPUState *cpu)
-{
-}
-
-void whpx_vcpu_kick(CPUState *cpu)
-{
-}
-
-void whpx_cpu_synchronize_state(CPUState *cpu)
-{
-}
-
-void whpx_cpu_synchronize_post_reset(CPUState *cpu)
-{
-}
-
-void whpx_cpu_synchronize_post_init(CPUState *cpu)
-{
-}
-
-void whpx_cpu_synchronize_pre_loadvm(CPUState *cpu)
-{
-}
diff --git a/include/sysemu/whpx.h b/include/sysemu/whpx.h
index a84b49e749..59edf13742 100644
--- a/include/sysemu/whpx.h
+++ b/include/sysemu/whpx.h
@@ -13,18 +13,6 @@
#ifndef QEMU_WHPX_H
#define QEMU_WHPX_H
-
-int whpx_init_vcpu(CPUState *cpu);
-int whpx_vcpu_exec(CPUState *cpu);
-void whpx_destroy_vcpu(CPUState *cpu);
-void whpx_vcpu_kick(CPUState *cpu);
-
-
-void whpx_cpu_synchronize_state(CPUState *cpu);
-void whpx_cpu_synchronize_post_reset(CPUState *cpu);
-void whpx_cpu_synchronize_post_init(CPUState *cpu);
-void whpx_cpu_synchronize_pre_loadvm(CPUState *cpu);
-
#ifdef CONFIG_WHPX
int whpx_enabled(void);
@@ -35,11 +23,4 @@ int whpx_enabled(void);
#endif /* CONFIG_WHPX */
-/* state subset only touched by the VCPU itself during runtime */
-#define WHPX_SET_RUNTIME_STATE 1
-/* state subset modified during VCPU reset */
-#define WHPX_SET_RESET_STATE 2
-/* full state set, modified during initialization or on vmload */
-#define WHPX_SET_FULL_STATE 3
-
#endif /* QEMU_WHPX_H */
diff --git a/target/i386/whpx-cpus.h b/target/i386/whpx-cpus.h
index 2393944954..bdb367d1d0 100644
--- a/target/i386/whpx-cpus.h
+++ b/target/i386/whpx-cpus.h
@@ -14,4 +14,21 @@
extern const CpusAccel whpx_cpus;
+int whpx_init_vcpu(CPUState *cpu);
+int whpx_vcpu_exec(CPUState *cpu);
+void whpx_destroy_vcpu(CPUState *cpu);
+void whpx_vcpu_kick(CPUState *cpu);
+
+void whpx_cpu_synchronize_state(CPUState *cpu);
+void whpx_cpu_synchronize_post_reset(CPUState *cpu);
+void whpx_cpu_synchronize_post_init(CPUState *cpu);
+void whpx_cpu_synchronize_pre_loadvm(CPUState *cpu);
+
+/* state subset only touched by the VCPU itself during runtime */
+#define WHPX_SET_RUNTIME_STATE 1
+/* state subset modified during VCPU reset */
+#define WHPX_SET_RESET_STATE 2
+/* full state set, modified during initialization or on vmload */
+#define WHPX_SET_FULL_STATE 3
+
#endif /* WHPX_CPUS_H */
--
2.26.2
next prev parent reply other threads:[~2020-09-16 14:34 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 ` Claudio Fontana [this message]
2020-09-16 14:20 ` [PATCH v8 15/17] hax: remove hax " Claudio Fontana
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-15-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).