43 files changed, 41 insertions, 39 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index ea91f9e804..a5ce4c0856 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -137,8 +137,8 @@ Overall TCG CPUs
 M: Richard Henderson <richard.henderson@linaro.org>
 R: Paolo Bonzini <pbonzini@redhat.com>
 S: Maintained
-F: softmmu/cpus.c
-F: softmmu/watchpoint.c
+F: system/cpus.c
+F: system/watchpoint.c
 F: cpu-common.c
 F: cpu-target.c
 F: page-vary-target.c
@@ -2108,7 +2108,7 @@ S: Maintained
 F: docs/interop/virtio-balloon-stats.rst
 F: hw/virtio/virtio-balloon*.c
 F: include/hw/virtio/virtio-balloon.h
-F: softmmu/balloon.c
+F: system/balloon.c
 F: include/sysemu/balloon.h
 
 virtio-9p
@@ -2795,7 +2795,7 @@ Device Tree
 M: Alistair Francis <alistair.francis@wdc.com>
 R: David Gibson <david@gibson.dropbear.id.au>
 S: Maintained
-F: softmmu/device_tree.c
+F: system/device_tree.c
 F: include/sysemu/device_tree.h
 
 Dump
@@ -2851,11 +2851,11 @@ F: include/exec/memory.h
 F: include/exec/ram_addr.h
 F: include/exec/ramblock.h
 F: include/sysemu/memory_mapping.h
-F: softmmu/dma-helpers.c
-F: softmmu/ioport.c
-F: softmmu/memory.c
-F: softmmu/memory_mapping.c
-F: softmmu/physmem.c
+F: system/dma-helpers.c
+F: system/ioport.c
+F: system/memory.c
+F: system/memory_mapping.c
+F: system/physmem.c
 F: include/exec/memory-internal.h
 F: scripts/coccinelle/memory-region-housekeeping.cocci
 
@@ -2908,12 +2908,12 @@ F: include/sysemu/runstate.h
 F: include/sysemu/runstate-action.h
 F: util/main-loop.c
 F: util/qemu-timer.c
-F: softmmu/vl.c
-F: softmmu/main.c
-F: softmmu/cpus.c
-F: softmmu/cpu-throttle.c
-F: softmmu/cpu-timers.c
-F: softmmu/runstate*
+F: system/vl.c
+F: system/main.c
+F: system/cpus.c
+F: system/cpu-throttle.c
+F: system/cpu-timers.c
+F: system/runstate*
 F: qapi/run-state.json
 
 Read, Copy, Update (RCU)
@@ -3087,7 +3087,7 @@ F: qapi/qom.json
 F: qapi/qdev.json
 F: scripts/coccinelle/qom-parent-type.cocci
 F: scripts/qom-cast-macro-clean-cocci-gen.py
-F: softmmu/qdev-monitor.c
+F: system/qdev-monitor.c
 F: stubs/qdev.c
 F: qom/
 F: tests/unit/check-qom-interface.c
@@ -3121,7 +3121,7 @@ M: Thomas Huth <thuth@redhat.com>
 M: Laurent Vivier <lvivier@redhat.com>
 R: Paolo Bonzini <pbonzini@redhat.com>
 S: Maintained
-F: softmmu/qtest.c
+F: system/qtest.c
 F: accel/qtest/
 F: tests/qtest/
 F: docs/devel/qgraph.rst
@@ -3197,7 +3197,7 @@ F: scripts/simpletrace.py
 TPM
 M: Stefan Berger <stefanb@linux.ibm.com>
 S: Maintained
-F: softmmu/tpm*
+F: system/tpm*
 F: hw/tpm/*
 F: include/hw/acpi/tpm.h
 F: include/sysemu/tpm*
@@ -3242,7 +3242,7 @@ F: migration/rdma*
 Migration dirty limit and dirty page rate
 M: Hyman Huang <yong.huang@smartx.com>
 S: Maintained
-F: softmmu/dirtylimit.c
+F: system/dirtylimit.c
 F: include/sysemu/dirtylimit.h
 F: migration/dirtyrate.c
 F: migration/dirtyrate.h
@@ -3266,7 +3266,7 @@ F: scripts/xml-preprocess*
 Seccomp
 M: Daniel P. Berrange <berrange@redhat.com>
 S: Odd Fixes
-F: softmmu/qemu-seccomp.c
+F: system/qemu-seccomp.c
 F: include/sysemu/seccomp.h
 F: tests/unit/test-seccomp.c
 
@@ -3685,7 +3685,7 @@ T: git https://github.com/stefanha/qemu.git block
 Bootdevice
 M: Gonglei <arei.gonglei@huawei.com>
 S: Maintained
-F: softmmu/bootdevice.c
+F: system/bootdevice.c
 
 Quorum
 M: Alberto Garcia <berto@igalia.com>
diff --git a/accel/tcg/icount-common.c b/accel/tcg/icount-common.c
index 0bf5bb5e21..ec57192be8 100644
--- a/accel/tcg/icount-common.c
+++ b/accel/tcg/icount-common.c
@@ -37,7 +37,7 @@
 #include "hw/core/cpu.h"
 #include "sysemu/cpu-timers.h"
 #include "sysemu/cpu-throttle.h"
-#include "softmmu/timers-state.h"
+#include "sysemu/cpu-timers-internal.h"
 
 /*
  * ICOUNT: Instruction Counter
diff --git a/docs/devel/qtest.rst b/docs/devel/qtest.rst
index 0455aa06ab..c5b8546b3e 100644
--- a/docs/devel/qtest.rst
+++ b/docs/devel/qtest.rst
@@ -81,7 +81,7 @@ which you can run manually.
 QTest Protocol
 --------------
 
-.. kernel-doc:: softmmu/qtest.c
+.. kernel-doc:: system/qtest.c
    :doc: QTest Protocol
 
 
diff --git a/softmmu/timers-state.h b/include/sysemu/cpu-timers-internal.h
index 94bb7394c5..94bb7394c5 100644
--- a/softmmu/timers-state.h
+++ b/include/sysemu/cpu-timers-internal.h
diff --git a/include/sysemu/runstate-action.h b/include/sysemu/runstate-action.h
index cff45a047b..db4e3099ae 100644
--- a/include/sysemu/runstate-action.h
+++ b/include/sysemu/runstate-action.h
@@ -11,7 +11,7 @@
 
 #include "qapi/qapi-commands-run-state.h"
 
-/* in softmmu/runstate-action.c */
+/* in system/runstate-action.c */
 extern RebootAction reboot_action;
 extern ShutdownAction shutdown_action;
 extern PanicAction panic_action;
diff --git a/meson.build b/meson.build
index 167cb70956..79aef19bdc 100644
--- a/meson.build
+++ b/meson.build
@@ -3291,7 +3291,7 @@ if have_system
     'hw/gpio',
     'migration',
     'net',
-    'softmmu',
+    'system',
     'ui',
     'hw/remote',
   ]
@@ -3418,7 +3418,7 @@ endif
 common_ss.add(files('cpu-common.c'))
 specific_ss.add(files('cpu-target.c'))
 
-subdir('softmmu')
+subdir('system')
 
 # Work around a gcc bug/misfeature wherein constant propagation looks
 # through an alias:
@@ -3797,14 +3797,14 @@ foreach target : target_dirs
     execs = [{
       'name': 'qemu-system-' + target_name,
       'win_subsystem': 'console',
-      'sources': files('softmmu/main.c'),
+      'sources': files('system/main.c'),
       'dependencies': []
     }]
     if targetos == 'windows' and (sdl.found() or gtk.found())
       execs += [{
         'name': 'qemu-system-' + target_name + 'w',
         'win_subsystem': 'windows',
-        'sources': files('softmmu/main.c'),
+        'sources': files('system/main.c'),
         'dependencies': []
       }]
     endif
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 1ad9ccb74b..6e4100d2a4 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -466,7 +466,7 @@ sub top_of_kernel_tree {
 	my @tree_check = (
 		"COPYING", "MAINTAINERS", "Makefile",
 		"README.rst", "docs", "VERSION",
-		"linux-user", "softmmu"
+		"linux-user", "system"
 	);
 
 	foreach my $check (@tree_check) {
diff --git a/scripts/coverity-scan/COMPONENTS.md b/scripts/coverity-scan/COMPONENTS.md
index 883da95aff..0e62f10aad 100644
--- a/scripts/coverity-scan/COMPONENTS.md
+++ b/scripts/coverity-scan/COMPONENTS.md
@@ -148,7 +148,7 @@ tcg
   ~ (/qemu)?(/accel/tcg|/replay|/tcg)/.*
 
 sysemu
-  ~ (/qemu)?(/softmmu/.*|/accel/.*)
+  ~ (/qemu)?(/system/.*|/accel/.*)
 
 (headers)
   ~ (/qemu)?(/include/.*)
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index e5499b94b4..02fa828100 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -796,7 +796,7 @@ sub top_of_tree {
         && (-d "${lk_path}docs")
         && (-f "${lk_path}VERSION")
         && (-d "${lk_path}linux-user/")
-        && (-d "${lk_path}softmmu/")) {
+        && (-d "${lk_path}system/")) {
 	return 1;
     }
     return 0;
diff --git a/scripts/oss-fuzz/build.sh b/scripts/oss-fuzz/build.sh
index 3bda0d72c7..5238f83343 100755
--- a/scripts/oss-fuzz/build.sh
+++ b/scripts/oss-fuzz/build.sh
@@ -43,10 +43,10 @@ EXTRA_CFLAGS="$CFLAGS -U __OPTIMIZE__"
 if ! { [ -e "./COPYING" ] &&
    [ -e "./MAINTAINERS" ] &&
    [ -e "./Makefile" ] &&
-   [ -e "./docs" ] &&
+   [ -d "./docs" ] &&
    [ -e "./VERSION" ] &&
-   [ -e "./linux-user" ] &&
-   [ -e "./softmmu" ];} ; then
+   [ -d "./linux-user" ] &&
+   [ -d "./system" ];} ; then
     fatal "Please run the script from the top of the QEMU tree"
 fi
 
diff --git a/softmmu/trace.h b/softmmu/trace.h
deleted file mode 100644
index 2ad1011572..0000000000
--- a/softmmu/trace.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "trace/trace-softmmu.h"
diff --git a/softmmu/arch_init.c b/system/arch_init.c
index 79716f959b..79716f959b 100644
--- a/softmmu/arch_init.c
+++ b/system/arch_init.c
diff --git a/softmmu/async-teardown.c b/system/async-teardown.c
index 396963c091..396963c091 100644
--- a/softmmu/async-teardown.c
+++ b/system/async-teardown.c
diff --git a/softmmu/balloon.c b/system/balloon.c
index e0e8969a4b..e0e8969a4b 100644
--- a/softmmu/balloon.c
+++ b/system/balloon.c
diff --git a/softmmu/bootdevice.c b/system/bootdevice.c
index 2106f1026f..2106f1026f 100644
--- a/softmmu/bootdevice.c
+++ b/system/bootdevice.c
diff --git a/softmmu/cpu-throttle.c b/system/cpu-throttle.c
index d9bb30a223..d9bb30a223 100644
--- a/softmmu/cpu-throttle.c
+++ b/system/cpu-throttle.c
diff --git a/softmmu/cpu-timers.c b/system/cpu-timers.c
index 117408cb83..7452d97b67 100644
--- a/softmmu/cpu-timers.c
+++ b/system/cpu-timers.c
@@ -36,7 +36,7 @@
 #include "hw/core/cpu.h"
 #include "sysemu/cpu-timers.h"
 #include "sysemu/cpu-throttle.h"
-#include "timers-state.h"
+#include "sysemu/cpu-timers-internal.h"
 
 /* clock and ticks */
 
diff --git a/softmmu/cpus.c b/system/cpus.c
index 0848e0dbdb..0848e0dbdb 100644
--- a/softmmu/cpus.c
+++ b/system/cpus.c
diff --git a/softmmu/datadir.c b/system/datadir.c
index c9237cb5d4..c9237cb5d4 100644
--- a/softmmu/datadir.c
+++ b/system/datadir.c
diff --git a/softmmu/device_tree.c b/system/device_tree.c
index eb5166ca36..eb5166ca36 100644
--- a/softmmu/device_tree.c
+++ b/system/device_tree.c
diff --git a/softmmu/dirtylimit.c b/system/dirtylimit.c
index fa959d7743..fa959d7743 100644
--- a/softmmu/dirtylimit.c
+++ b/system/dirtylimit.c
diff --git a/softmmu/dma-helpers.c b/system/dma-helpers.c
index 36211acc7e..36211acc7e 100644
--- a/softmmu/dma-helpers.c
+++ b/system/dma-helpers.c
diff --git a/softmmu/globals.c b/system/globals.c
index e83b5428d1..e83b5428d1 100644
--- a/softmmu/globals.c
+++ b/system/globals.c
diff --git a/softmmu/ioport.c b/system/ioport.c
index 1824aa808c..1824aa808c 100644
--- a/softmmu/ioport.c
+++ b/system/ioport.c
diff --git a/softmmu/main.c b/system/main.c
index 694388bd7f..694388bd7f 100644
--- a/softmmu/main.c
+++ b/system/main.c
diff --git a/softmmu/memory.c b/system/memory.c
index fa1c99f9ba..fa1c99f9ba 100644
--- a/softmmu/memory.c
+++ b/system/memory.c
diff --git a/softmmu/memory_mapping.c b/system/memory_mapping.c
index d7f1d096e0..d7f1d096e0 100644
--- a/softmmu/memory_mapping.c
+++ b/system/memory_mapping.c
diff --git a/softmmu/meson.build b/system/meson.build
index 3a64dd89de..3a64dd89de 100644
--- a/softmmu/meson.build
+++ b/system/meson.build
diff --git a/softmmu/physmem.c b/system/physmem.c
index 309653c722..edc3ed8ab9 100644
--- a/softmmu/physmem.c
+++ b/system/physmem.c
@@ -2301,8 +2301,10 @@ RAMBlock *qemu_ram_block_by_name(const char *name)
     return NULL;
 }
 
-/* Some of the softmmu routines need to translate from a host pointer
-   (typically a TLB entry) back to a ram offset.  */
+/*
+ * Some of the system routines need to translate from a host pointer
+ * (typically a TLB entry) back to a ram offset.
+ */
 ram_addr_t qemu_ram_addr_from_host(void *ptr)
 {
     RAMBlock *block;
diff --git a/softmmu/qdev-monitor.c b/system/qdev-monitor.c
index 74f4e41338..74f4e41338 100644
--- a/softmmu/qdev-monitor.c
+++ b/system/qdev-monitor.c
diff --git a/softmmu/qemu-seccomp.c b/system/qemu-seccomp.c
index 4d7439e7f7..4d7439e7f7 100644
--- a/softmmu/qemu-seccomp.c
+++ b/system/qemu-seccomp.c
diff --git a/softmmu/qtest.c b/system/qtest.c
index 35b643a274..35b643a274 100644
--- a/softmmu/qtest.c
+++ b/system/qtest.c
diff --git a/softmmu/rtc.c b/system/rtc.c
index 4904581abe..4904581abe 100644
--- a/softmmu/rtc.c
+++ b/system/rtc.c
diff --git a/softmmu/runstate-action.c b/system/runstate-action.c
index ae0761a9c3..ae0761a9c3 100644
--- a/softmmu/runstate-action.c
+++ b/system/runstate-action.c
diff --git a/softmmu/runstate-hmp-cmds.c b/system/runstate-hmp-cmds.c
index 2df670f0c0..2df670f0c0 100644
--- a/softmmu/runstate-hmp-cmds.c
+++ b/system/runstate-hmp-cmds.c
diff --git a/softmmu/runstate.c b/system/runstate.c
index 1652ed0439..1652ed0439 100644
--- a/softmmu/runstate.c
+++ b/system/runstate.c
diff --git a/softmmu/tpm-hmp-cmds.c b/system/tpm-hmp-cmds.c
index 9ed6ad6c4d..9ed6ad6c4d 100644
--- a/softmmu/tpm-hmp-cmds.c
+++ b/system/tpm-hmp-cmds.c
diff --git a/softmmu/tpm.c b/system/tpm.c
index 578563f05a..578563f05a 100644
--- a/softmmu/tpm.c
+++ b/system/tpm.c
diff --git a/softmmu/trace-events b/system/trace-events
index 69c9044151..69c9044151 100644
--- a/softmmu/trace-events
+++ b/system/trace-events
diff --git a/system/trace.h b/system/trace.h
new file mode 100644
index 0000000000..cd0136dcdc
--- /dev/null
+++ b/system/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-system.h"
diff --git a/softmmu/vl.c b/system/vl.c
index 98e071e63b..98e071e63b 100644
--- a/softmmu/vl.c
+++ b/system/vl.c
diff --git a/softmmu/watchpoint.c b/system/watchpoint.c
index 45d1f12faf..45d1f12faf 100644
--- a/softmmu/watchpoint.c
+++ b/system/watchpoint.c
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index 1977b302e2..f33ae64b8d 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -59,7 +59,7 @@ if have_system or have_tools
   }
 
   if seccomp.found()
-    tests += {'test-seccomp': ['../../softmmu/qemu-seccomp.c', seccomp]}
+    tests += {'test-seccomp': ['../../system/qemu-seccomp.c', seccomp]}
   endif
 endif