From: Claudio Fontana <cfontana@suse.de>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Wenchao Wang" <wenchao.wang@intel.com>,
"Roman Bolshakov" <r.bolshakov@yadro.com>,
"Sunil Muthuswamy" <sunilmut@microsoft.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Paul Durrant" <paul@xen.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Jason Wang" <jasowang@redhat.com>,
"Marcelo Tosatti" <mtosatti@redhat.com>,
qemu-devel@nongnu.org, "Peter Xu" <peterx@redhat.com>,
"Dario Faggioli" <dfaggioli@suse.com>,
"Cameron Esfahani" <dirty@apple.com>,
haxm-team@intel.com, "Claudio Fontana" <cfontana@suse.de>,
"Anthony Perard" <anthony.perard@citrix.com>,
"Bruce Rogers" <brogers@suse.com>,
"Olaf Hering" <ohering@suse.de>,
"Emilio G . Cota" <cota@braap.org>,
"Colin Xu" <colin.xu@intel.com>
Subject: [PATCH v10 06/32] i386: move hax accel files into hax/
Date: Thu, 10 Dec 2020 13:12:00 +0100 [thread overview]
Message-ID: <20201210121226.19822-7-cfontana@suse.de> (raw)
In-Reply-To: <20201210121226.19822-1-cfontana@suse.de>
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
---
target/i386/{ => hax}/hax-cpus.h | 0
target/i386/{ => hax}/hax-i386.h | 6 +++---
target/i386/{ => hax}/hax-interface.h | 0
target/i386/{ => hax}/hax-posix.h | 0
target/i386/{ => hax}/hax-windows.h | 0
target/i386/{ => hax}/hax-all.c | 0
target/i386/{ => hax}/hax-cpus.c | 0
target/i386/{ => hax}/hax-mem.c | 0
target/i386/{ => hax}/hax-posix.c | 0
target/i386/{ => hax}/hax-windows.c | 0
MAINTAINERS | 2 +-
target/i386/hax/meson.build | 7 +++++++
target/i386/meson.build | 8 +-------
13 files changed, 12 insertions(+), 11 deletions(-)
rename target/i386/{ => hax}/hax-cpus.h (100%)
rename target/i386/{ => hax}/hax-i386.h (95%)
rename target/i386/{ => hax}/hax-interface.h (100%)
rename target/i386/{ => hax}/hax-posix.h (100%)
rename target/i386/{ => hax}/hax-windows.h (100%)
rename target/i386/{ => hax}/hax-all.c (100%)
rename target/i386/{ => hax}/hax-cpus.c (100%)
rename target/i386/{ => hax}/hax-mem.c (100%)
rename target/i386/{ => hax}/hax-posix.c (100%)
rename target/i386/{ => hax}/hax-windows.c (100%)
create mode 100644 target/i386/hax/meson.build
diff --git a/target/i386/hax-cpus.h b/target/i386/hax/hax-cpus.h
similarity index 100%
rename from target/i386/hax-cpus.h
rename to target/i386/hax/hax-cpus.h
diff --git a/target/i386/hax-i386.h b/target/i386/hax/hax-i386.h
similarity index 95%
rename from target/i386/hax-i386.h
rename to target/i386/hax/hax-i386.h
index 48c4abe14e..efbb346238 100644
--- a/target/i386/hax-i386.h
+++ b/target/i386/hax/hax-i386.h
@@ -84,13 +84,13 @@ void hax_memory_init(void);
#ifdef CONFIG_POSIX
-#include "target/i386/hax-posix.h"
+#include "hax-posix.h"
#endif
#ifdef CONFIG_WIN32
-#include "target/i386/hax-windows.h"
+#include "hax-windows.h"
#endif
-#include "target/i386/hax-interface.h"
+#include "hax-interface.h"
#endif
diff --git a/target/i386/hax-interface.h b/target/i386/hax/hax-interface.h
similarity index 100%
rename from target/i386/hax-interface.h
rename to target/i386/hax/hax-interface.h
diff --git a/target/i386/hax-posix.h b/target/i386/hax/hax-posix.h
similarity index 100%
rename from target/i386/hax-posix.h
rename to target/i386/hax/hax-posix.h
diff --git a/target/i386/hax-windows.h b/target/i386/hax/hax-windows.h
similarity index 100%
rename from target/i386/hax-windows.h
rename to target/i386/hax/hax-windows.h
diff --git a/target/i386/hax-all.c b/target/i386/hax/hax-all.c
similarity index 100%
rename from target/i386/hax-all.c
rename to target/i386/hax/hax-all.c
diff --git a/target/i386/hax-cpus.c b/target/i386/hax/hax-cpus.c
similarity index 100%
rename from target/i386/hax-cpus.c
rename to target/i386/hax/hax-cpus.c
diff --git a/target/i386/hax-mem.c b/target/i386/hax/hax-mem.c
similarity index 100%
rename from target/i386/hax-mem.c
rename to target/i386/hax/hax-mem.c
diff --git a/target/i386/hax-posix.c b/target/i386/hax/hax-posix.c
similarity index 100%
rename from target/i386/hax-posix.c
rename to target/i386/hax/hax-posix.c
diff --git a/target/i386/hax-windows.c b/target/i386/hax/hax-windows.c
similarity index 100%
rename from target/i386/hax-windows.c
rename to target/i386/hax/hax-windows.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 20e079f40c..448593c904 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -491,7 +491,7 @@ W: https://github.com/intel/haxm/issues
S: Maintained
F: accel/stubs/hax-stub.c
F: include/sysemu/hax.h
-F: target/i386/hax-*
+F: target/i386/hax/
Hosts
-----
diff --git a/target/i386/hax/meson.build b/target/i386/hax/meson.build
new file mode 100644
index 0000000000..77ea431b30
--- /dev/null
+++ b/target/i386/hax/meson.build
@@ -0,0 +1,7 @@
+i386_softmmu_ss.add(when: 'CONFIG_HAX', if_true: files(
+ 'hax-all.c',
+ 'hax-mem.c',
+ 'hax-cpus.c',
+))
+i386_softmmu_ss.add(when: ['CONFIG_HAX', 'CONFIG_POSIX'], if_true: files('hax-posix.c'))
+i386_softmmu_ss.add(when: ['CONFIG_HAX', 'CONFIG_WIN32'], if_true: files('hax-windows.c'))
diff --git a/target/i386/meson.build b/target/i386/meson.build
index 62cd042915..284d52ab81 100644
--- a/target/i386/meson.build
+++ b/target/i386/meson.build
@@ -27,15 +27,9 @@ i386_softmmu_ss.add(files(
'machine.c',
'monitor.c',
))
-i386_softmmu_ss.add(when: 'CONFIG_HAX', if_true: files(
- 'hax-all.c',
- 'hax-mem.c',
- 'hax-cpus.c',
-))
-i386_softmmu_ss.add(when: ['CONFIG_HAX', 'CONFIG_POSIX'], if_true: files('hax-posix.c'))
-i386_softmmu_ss.add(when: ['CONFIG_HAX', 'CONFIG_WIN32'], if_true: files('hax-windows.c'))
subdir('kvm')
+subdir('hax')
subdir('whpx')
subdir('hvf')
--
2.26.2
next prev parent reply other threads:[~2020-12-10 12:28 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 12:11 [PATCH v10 00/32] i386 cleanup Claudio Fontana
2020-12-10 12:11 ` [PATCH v10 01/32] accel/tcg: split CpusAccel into three TCG variants Claudio Fontana
2020-12-10 12:11 ` [PATCH v10 02/32] accel/tcg: split tcg_start_vcpu_thread Claudio Fontana
2020-12-10 12:11 ` [PATCH v10 03/32] accel/tcg: rename tcg-cpus functions to match module name Claudio Fontana
2020-12-10 12:11 ` [PATCH v10 04/32] i386: move kvm accel files into kvm/ Claudio Fontana
2020-12-10 12:11 ` [PATCH v10 05/32] i386: move whpx accel files into whpx/ Claudio Fontana
2020-12-10 12:12 ` Claudio Fontana [this message]
2020-12-10 12:12 ` [PATCH v10 07/32] i386: hvf: remove stale MAINTAINERS entry for old hvf stubs Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 08/32] i386: move TCG accel files into tcg/ Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 09/32] i386: move cpu dump out of helper.c into cpu-dump.c Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 10/32] i386: move TCG cpu class initialization out of helper.c Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 11/32] tcg: cpu_exec_{enter,exit} helpers Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 12/32] tcg: make CPUClass.cpu_exec_* optional Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 13/32] tcg: Make CPUClass.debug_excp_handler optional Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 14/32] cpu: Remove unnecessary noop methods Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 15/32] cpu: Introduce TCGCpuOperations struct Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 16/32] target/riscv: remove CONFIG_TCG, as it is always TCG Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 17/32] accel/tcg: split TCG-only code from cpu_exec_realizefn Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 18/32] cpu: Move synchronize_from_tb() to tcg_ops Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 19/32] cpu: Move cpu_exec_* " Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 20/32] cpu: Move tlb_fill " Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 21/32] cpu: Move debug_excp_handler " Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 22/32] target/arm: do not use cc->do_interrupt for KVM directly Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 23/32] cpu: move cc->do_interrupt to tcg_ops Claudio Fontana
2020-12-10 12:55 ` Philippe Mathieu-Daudé
2020-12-10 12:12 ` [PATCH v10 24/32] cpu: move cc->transaction_failed " Claudio Fontana
2020-12-10 12:59 ` Philippe Mathieu-Daudé
2020-12-10 13:10 ` Claudio Fontana
2020-12-10 13:22 ` Philippe Mathieu-Daudé
2020-12-10 12:12 ` [PATCH v10 25/32] cpu: move do_unaligned_access " Claudio Fontana
2020-12-10 13:01 ` Philippe Mathieu-Daudé
2020-12-10 13:14 ` Claudio Fontana
2020-12-10 13:18 ` Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 26/32] accel: extend AccelState and AccelClass to user-mode Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 27/32] accel: replace struct CpusAccel with AccelOpsClass Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 28/32] accel: introduce AccelCPUClass extending CPUClass Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 29/32] i386: split cpu accelerators from cpu.c, using AccelCPUClass Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 30/32] cpu: call AccelCPUClass::cpu_realizefn in cpu_exec_realizefn Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 31/32] hw/core/cpu: call qemu_init_vcpu in cpu_common_realizefn Claudio Fontana
2020-12-10 12:12 ` [PATCH v10 32/32] cpu: introduce cpu_accel_instance_init Claudio Fontana
2020-12-10 13:05 ` [PATCH v10 00/32] i386 cleanup Philippe Mathieu-Daudé
2020-12-10 13:11 ` Claudio Fontana
2020-12-10 21:00 ` no-reply
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=20201210121226.19822-7-cfontana@suse.de \
--to=cfontana@suse.de \
--cc=alex.bennee@linaro.org \
--cc=anthony.perard@citrix.com \
--cc=brogers@suse.com \
--cc=colin.xu@intel.com \
--cc=cota@braap.org \
--cc=dfaggioli@suse.com \
--cc=dirty@apple.com \
--cc=ehabkost@redhat.com \
--cc=haxm-team@intel.com \
--cc=jasowang@redhat.com \
--cc=lvivier@redhat.com \
--cc=mtosatti@redhat.com \
--cc=ohering@suse.de \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=r.bolshakov@yadro.com \
--cc=richard.henderson@linaro.org \
--cc=sstabellini@kernel.org \
--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).