[RFC v1 02/10] i386: move whpx accel files to accel/whpx/

[Claudio Fontana <cfontana@suse.de>]

Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
 MAINTAINERS                                 | 5 +----
 target/i386/accel/whpx/meson.build          | 4 ++++
 target/i386/{ => accel/whpx}/whp-dispatch.h | 0
 target/i386/{ => accel/whpx}/whpx-all.c     | 0
 target/i386/{ => accel/whpx}/whpx-cpus.c    | 0
 target/i386/{ => accel/whpx}/whpx-cpus.h    | 0
 target/i386/meson.build                     | 5 +----
 7 files changed, 6 insertions(+), 8 deletions(-)
 create mode 100644 target/i386/accel/whpx/meson.build
 rename target/i386/{ => accel/whpx}/whp-dispatch.h (100%)
 rename target/i386/{ => accel/whpx}/whpx-all.c (100%)
 rename target/i386/{ => accel/whpx}/whpx-cpus.c (100%)
 rename target/i386/{ => accel/whpx}/whpx-cpus.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 2ce9b36c02..41b613b6a6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -446,10 +446,7 @@ F: include/sysemu/hvf.h
 WHPX CPUs
 M: Sunil Muthuswamy <sunilmut@microsoft.com>
 S: Supported
-F: target/i386/whpx-all.c
-F: target/i386/whpx-cpus.c
-F: target/i386/whp-dispatch.h
-F: accel/stubs/whpx-stub.c
+F: target/i386/accel/whpx/
 F: include/sysemu/whpx.h
 
 Guest CPU Cores (Xen)
diff --git a/target/i386/accel/whpx/meson.build b/target/i386/accel/whpx/meson.build
new file mode 100644
index 0000000000..94a72c8efc
--- /dev/null
+++ b/target/i386/accel/whpx/meson.build
@@ -0,0 +1,4 @@
+i386_softmmu_ss.add(when: 'CONFIG_WHPX', if_true: files(
+  'whpx-all.c',
+  'whpx-cpus.c',
+))
diff --git a/target/i386/whp-dispatch.h b/target/i386/accel/whpx/whp-dispatch.h
similarity index 100%
rename from target/i386/whp-dispatch.h
rename to target/i386/accel/whpx/whp-dispatch.h
diff --git a/target/i386/whpx-all.c b/target/i386/accel/whpx/whpx-all.c
similarity index 100%
rename from target/i386/whpx-all.c
rename to target/i386/accel/whpx/whpx-all.c
diff --git a/target/i386/whpx-cpus.c b/target/i386/accel/whpx/whpx-cpus.c
similarity index 100%
rename from target/i386/whpx-cpus.c
rename to target/i386/accel/whpx/whpx-cpus.c
diff --git a/target/i386/whpx-cpus.h b/target/i386/accel/whpx/whpx-cpus.h
similarity index 100%
rename from target/i386/whpx-cpus.h
rename to target/i386/accel/whpx/whpx-cpus.h
diff --git a/target/i386/meson.build b/target/i386/meson.build
index 629939b195..6c43b7bfb0 100644
--- a/target/i386/meson.build
+++ b/target/i386/meson.build
@@ -27,10 +27,6 @@ i386_softmmu_ss.add(files(
   'machine.c',
   'monitor.c',
 ))
-i386_softmmu_ss.add(when: 'CONFIG_WHPX', if_true: files(
-  'whpx-all.c',
-  'whpx-cpus.c',
-))
 i386_softmmu_ss.add(when: 'CONFIG_HAX', if_true: files(
   'hax-all.c',
   'hax-mem.c',
@@ -40,6 +36,7 @@ i386_softmmu_ss.add(when: ['CONFIG_HAX', 'CONFIG_POSIX'], if_true: files('hax-po
 i386_softmmu_ss.add(when: ['CONFIG_HAX', 'CONFIG_WIN32'], if_true: files('hax-windows.c'))
 
 subdir('accel/kvm')
+subdir('accel/whpx')
 subdir('hvf')
 
 target_arch += {'i386': i386_ss}
-- 
2.26.2