diff options
| author | Claudio Fontana <cfontana@suse.de> | 2020-12-12 16:55:09 +0100 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2020-12-16 14:06:53 -0500 |
| commit | 1fc33bb9f05b2c263232ab01dd66d6e33d31cedc (patch) | |
| tree | 036a1db8b26ea86b6b2b07e3f7f40f9aa62a402e | |
| parent | a9dc68d9b240bd4cb0c8910c6d10f6bdf9d53cb3 (diff) | |
i386: move whpx accel files into whpx/
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20201212155530.23098-3-cfontana@suse.de>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | target/i386/meson.build | 6 | ||||
| -rw-r--r-- | target/i386/whpx/meson.build | 5 | ||||
| -rw-r--r-- | target/i386/whpx/whp-dispatch.h (renamed from target/i386/whp-dispatch.h) | 0 | ||||
| -rw-r--r-- | target/i386/whpx/whpx-all.c (renamed from target/i386/whpx-all.c) | 0 | ||||
| -rw-r--r-- | target/i386/whpx/whpx-apic.c (renamed from target/i386/whpx-apic.c) | 0 | ||||
| -rw-r--r-- | target/i386/whpx/whpx-cpus.c (renamed from target/i386/whpx-cpus.c) | 0 | ||||
| -rw-r--r-- | target/i386/whpx/whpx-cpus.h (renamed from target/i386/whpx-cpus.h) | 0 |
8 files changed, 7 insertions, 10 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a77553833a..6f29b37834 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -452,11 +452,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-apic.c -F: target/i386/whpx-cpus.c -F: target/i386/whp-dispatch.h -F: accel/stubs/whpx-stub.c +F: target/i386/whpx/ F: include/sysemu/whpx.h Guest CPU Cores (Xen) diff --git a/target/i386/meson.build b/target/i386/meson.build index 5363757131..62cd042915 100644 --- a/target/i386/meson.build +++ b/target/i386/meson.build @@ -27,11 +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', - 'whpx-apic.c', -)) i386_softmmu_ss.add(when: 'CONFIG_HAX', if_true: files( 'hax-all.c', 'hax-mem.c', @@ -41,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('kvm') +subdir('whpx') subdir('hvf') target_arch += {'i386': i386_ss} diff --git a/target/i386/whpx/meson.build b/target/i386/whpx/meson.build new file mode 100644 index 0000000000..d8aa683999 --- /dev/null +++ b/target/i386/whpx/meson.build @@ -0,0 +1,5 @@ +i386_softmmu_ss.add(when: 'CONFIG_WHPX', if_true: files( + 'whpx-all.c', + 'whpx-apic.c', + 'whpx-cpus.c', +)) diff --git a/target/i386/whp-dispatch.h b/target/i386/whpx/whp-dispatch.h index cef5d848bd..cef5d848bd 100644 --- a/target/i386/whp-dispatch.h +++ b/target/i386/whpx/whp-dispatch.h diff --git a/target/i386/whpx-all.c b/target/i386/whpx/whpx-all.c index 3b824fc9d7..3b824fc9d7 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx/whpx-all.c diff --git a/target/i386/whpx-apic.c b/target/i386/whpx/whpx-apic.c index b127a3cb8a..b127a3cb8a 100644 --- a/target/i386/whpx-apic.c +++ b/target/i386/whpx/whpx-apic.c diff --git a/target/i386/whpx-cpus.c b/target/i386/whpx/whpx-cpus.c index d9bd5a2d36..d9bd5a2d36 100644 --- a/target/i386/whpx-cpus.c +++ b/target/i386/whpx/whpx-cpus.c diff --git a/target/i386/whpx-cpus.h b/target/i386/whpx/whpx-cpus.h index bdb367d1d0..bdb367d1d0 100644 --- a/target/i386/whpx-cpus.h +++ b/target/i386/whpx/whpx-cpus.h |