[RFC v1 03/10] i386: move hax accel files to accel/hax/

[Claudio Fontana]

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