From: Claudio Fontana <cfontana@suse.de>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Richard Henderson" <rth@twiddle.net>,
"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>,
Eduardo Habkost <ehabkost@redhat.com>,
Paul Durrant <paul@xen.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>, Colin Xu <colin.xu@intel.com>
Subject: [RFC v1 03/10] i386: move hax accel files to accel/hax/
Date: Mon, 9 Nov 2020 18:27:48 +0100 [thread overview]
Message-ID: <20201109172755.16500-4-cfontana@suse.de> (raw)
In-Reply-To: <20201109172755.16500-1-cfontana@suse.de>
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
MAINTAINERS | 2 +-
target/i386/{ => accel/hax}/hax-all.c | 0
target/i386/{ => accel/hax}/hax-cpus.c | 0
target/i386/{ => accel/hax}/hax-cpus.h | 0
target/i386/{ => accel/hax}/hax-i386.h | 6 +++---
target/i386/{ => accel/hax}/hax-interface.h | 0
target/i386/{ => accel/hax}/hax-mem.c | 0
target/i386/{ => accel/hax}/hax-posix.c | 0
target/i386/{ => accel/hax}/hax-posix.h | 0
target/i386/{ => accel/hax}/hax-windows.c | 0
target/i386/{ => accel/hax}/hax-windows.h | 0
target/i386/accel/hax/meson.build | 7 +++++++
target/i386/meson.build | 8 +-------
13 files changed, 12 insertions(+), 11 deletions(-)
rename target/i386/{ => accel/hax}/hax-all.c (100%)
rename target/i386/{ => accel/hax}/hax-cpus.c (100%)
rename target/i386/{ => accel/hax}/hax-cpus.h (100%)
rename target/i386/{ => accel/hax}/hax-i386.h (95%)
rename target/i386/{ => accel/hax}/hax-interface.h (100%)
rename target/i386/{ => accel/hax}/hax-mem.c (100%)
rename target/i386/{ => accel/hax}/hax-posix.c (100%)
rename target/i386/{ => accel/hax}/hax-posix.h (100%)
rename target/i386/{ => accel/hax}/hax-windows.c (100%)
rename target/i386/{ => accel/hax}/hax-windows.h (100%)
create mode 100644 target/i386/accel/hax/meson.build
diff --git a/MAINTAINERS b/MAINTAINERS
index 41b613b6a6..6dabd972c9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -486,7 +486,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/accel/hax/
Hosts
-----
diff --git a/target/i386/hax-all.c b/target/i386/accel/hax/hax-all.c
similarity index 100%
rename from target/i386/hax-all.c
rename to target/i386/accel/hax/hax-all.c
diff --git a/target/i386/hax-cpus.c b/target/i386/accel/hax/hax-cpus.c
similarity index 100%
rename from target/i386/hax-cpus.c
rename to target/i386/accel/hax/hax-cpus.c
diff --git a/target/i386/hax-cpus.h b/target/i386/accel/hax/hax-cpus.h
similarity index 100%
rename from target/i386/hax-cpus.h
rename to target/i386/accel/hax/hax-cpus.h
diff --git a/target/i386/hax-i386.h b/target/i386/accel/hax/hax-i386.h
similarity index 95%
rename from target/i386/hax-i386.h
rename to target/i386/accel/hax/hax-i386.h
index 48c4abe14e..efbb346238 100644
--- a/target/i386/hax-i386.h
+++ b/target/i386/accel/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/accel/hax/hax-interface.h
similarity index 100%
rename from target/i386/hax-interface.h
rename to target/i386/accel/hax/hax-interface.h
diff --git a/target/i386/hax-mem.c b/target/i386/accel/hax/hax-mem.c
similarity index 100%
rename from target/i386/hax-mem.c
rename to target/i386/accel/hax/hax-mem.c
diff --git a/target/i386/hax-posix.c b/target/i386/accel/hax/hax-posix.c
similarity index 100%
rename from target/i386/hax-posix.c
rename to target/i386/accel/hax/hax-posix.c
diff --git a/target/i386/hax-posix.h b/target/i386/accel/hax/hax-posix.h
similarity index 100%
rename from target/i386/hax-posix.h
rename to target/i386/accel/hax/hax-posix.h
diff --git a/target/i386/hax-windows.c b/target/i386/accel/hax/hax-windows.c
similarity index 100%
rename from target/i386/hax-windows.c
rename to target/i386/accel/hax/hax-windows.c
diff --git a/target/i386/hax-windows.h b/target/i386/accel/hax/hax-windows.h
similarity index 100%
rename from target/i386/hax-windows.h
rename to target/i386/accel/hax/hax-windows.h
diff --git a/target/i386/accel/hax/meson.build b/target/i386/accel/hax/meson.build
new file mode 100644
index 0000000000..77ea431b30
--- /dev/null
+++ b/target/i386/accel/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 6c43b7bfb0..34ec93dbef 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('accel/kvm')
+subdir('accel/hax')
subdir('accel/whpx')
subdir('hvf')
--
2.26.2
next prev parent reply other threads:[~2020-11-09 17:36 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-09 17:27 [RFC v1 00/10] i386 cleanup Claudio Fontana
2020-11-09 17:27 ` [RFC v1 01/10] i386: move kvm accel files into accel/kvm/ Claudio Fontana
2020-11-09 17:27 ` [RFC v1 02/10] i386: move whpx accel files to accel/whpx/ Claudio Fontana
2020-11-09 17:27 ` Claudio Fontana [this message]
2020-11-09 17:27 ` [RFC v1 04/10] i386: move hvf accel files into accel/hvf/ Claudio Fontana
2020-11-09 17:27 ` [RFC v1 05/10] i386: move TCG accel files into accel/tcg/ Claudio Fontana
2020-11-09 17:27 ` [RFC v1 06/10] i386: move cpu dump out of helper.c into cpu-dump.c Claudio Fontana
2020-11-09 17:27 ` [RFC v1 07/10] i386: move TCG cpu class initialization out of helper.c Claudio Fontana
2020-11-09 17:39 ` Paolo Bonzini
2020-11-10 10:05 ` Claudio Fontana
2020-11-10 10:42 ` Paolo Bonzini
2020-11-09 17:27 ` [RFC v1 08/10] module: introduce MODULE_INIT_ACCEL_CPU Claudio Fontana
2020-11-09 17:27 ` [RFC v1 09/10] i386: split cpu.c and defer x86 models registration Claudio Fontana
2020-11-09 17:34 ` Paolo Bonzini
2020-11-09 17:37 ` Paolo Bonzini
2020-11-09 18:03 ` Daniel P. Berrangé
2020-11-10 9:40 ` Claudio Fontana
2020-11-10 10:04 ` Daniel P. Berrangé
2020-11-10 10:13 ` Claudio Fontana
2020-11-10 10:41 ` Paolo Bonzini
2020-11-10 15:23 ` Eduardo Habkost
2020-11-10 16:05 ` Paolo Bonzini
2020-11-10 17:55 ` Eduardo Habkost
2020-11-10 20:39 ` Paolo Bonzini
2020-11-10 20:45 ` Eduardo Habkost
2020-11-10 17:38 ` Claudio Fontana
2020-11-10 18:14 ` Eduardo Habkost
2020-11-11 12:59 ` Claudio Fontana
2020-11-16 17:53 ` Claudio Fontana
2020-11-09 19:04 ` Eduardo Habkost
2020-11-10 9:49 ` Claudio Fontana
2020-11-09 17:27 ` [RFC v1 10/10] module: add priority to module_init Claudio Fontana
2020-11-09 17:45 ` [RFC v1 00/10] i386 cleanup 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=20201109172755.16500-4-cfontana@suse.de \
--to=cfontana@suse.de \
--cc=anthony.perard@citrix.com \
--cc=brogers@suse.com \
--cc=colin.xu@intel.com \
--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=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=r.bolshakov@yadro.com \
--cc=rth@twiddle.net \
--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).