Browse Source

system: Rename softmmu/ directory as system/

The softmmu/ directory contains files specific to system
emulation. Rename it as system/. Update meson rules, the
MAINTAINERS file and all the documentation and comments.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231004090629.37473-14-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
pull/254/head
Philippe Mathieu-Daudé 3 years ago
committed by Paolo Bonzini
parent
commit
8d7f2e767d
  1. 42
      MAINTAINERS
  2. 2
      accel/tcg/icount-common.c
  3. 2
      docs/devel/qtest.rst
  4. 0
      include/sysemu/cpu-timers-internal.h
  5. 2
      include/sysemu/runstate-action.h
  6. 8
      meson.build
  7. 2
      scripts/checkpatch.pl
  8. 2
      scripts/coverity-scan/COMPONENTS.md
  9. 2
      scripts/get_maintainer.pl
  10. 6
      scripts/oss-fuzz/build.sh
  11. 1
      softmmu/trace.h
  12. 0
      system/arch_init.c
  13. 0
      system/async-teardown.c
  14. 0
      system/balloon.c
  15. 0
      system/bootdevice.c
  16. 0
      system/cpu-throttle.c
  17. 2
      system/cpu-timers.c
  18. 0
      system/cpus.c
  19. 0
      system/datadir.c
  20. 0
      system/device_tree.c
  21. 0
      system/dirtylimit.c
  22. 0
      system/dma-helpers.c
  23. 0
      system/globals.c
  24. 0
      system/ioport.c
  25. 0
      system/main.c
  26. 0
      system/memory.c
  27. 0
      system/memory_mapping.c
  28. 0
      system/meson.build
  29. 6
      system/physmem.c
  30. 0
      system/qdev-monitor.c
  31. 0
      system/qemu-seccomp.c
  32. 0
      system/qtest.c
  33. 0
      system/rtc.c
  34. 0
      system/runstate-action.c
  35. 0
      system/runstate-hmp-cmds.c
  36. 0
      system/runstate.c
  37. 0
      system/tpm-hmp-cmds.c
  38. 0
      system/tpm.c
  39. 0
      system/trace-events
  40. 1
      system/trace.h
  41. 0
      system/vl.c
  42. 0
      system/watchpoint.c
  43. 2
      tests/unit/meson.build

42
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>

2
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

2
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

0
softmmu/timers-state.h → include/sysemu/cpu-timers-internal.h

2
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;

8
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

2
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) {

2
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/.*)

2
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;

6
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

1
softmmu/trace.h

@ -1 +0,0 @@
#include "trace/trace-softmmu.h"

0
softmmu/arch_init.c → system/arch_init.c

0
softmmu/async-teardown.c → system/async-teardown.c

0
softmmu/balloon.c → system/balloon.c

0
softmmu/bootdevice.c → system/bootdevice.c

0
softmmu/cpu-throttle.c → system/cpu-throttle.c

2
softmmu/cpu-timers.c → 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 */

0
softmmu/cpus.c → system/cpus.c

0
softmmu/datadir.c → system/datadir.c

0
softmmu/device_tree.c → system/device_tree.c

0
softmmu/dirtylimit.c → system/dirtylimit.c

0
softmmu/dma-helpers.c → system/dma-helpers.c

0
softmmu/globals.c → system/globals.c

0
softmmu/ioport.c → system/ioport.c

0
softmmu/main.c → system/main.c

0
softmmu/memory.c → system/memory.c

0
softmmu/memory_mapping.c → system/memory_mapping.c

0
softmmu/meson.build → system/meson.build

6
softmmu/physmem.c → 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;

0
softmmu/qdev-monitor.c → system/qdev-monitor.c

0
softmmu/qemu-seccomp.c → system/qemu-seccomp.c

0
softmmu/qtest.c → system/qtest.c

0
softmmu/rtc.c → system/rtc.c

0
softmmu/runstate-action.c → system/runstate-action.c

0
softmmu/runstate-hmp-cmds.c → system/runstate-hmp-cmds.c

0
softmmu/runstate.c → system/runstate.c

0
softmmu/tpm-hmp-cmds.c → system/tpm-hmp-cmds.c

0
softmmu/tpm.c → system/tpm.c

0
softmmu/trace-events → system/trace-events

1
system/trace.h

@ -0,0 +1 @@
#include "trace/trace-system.h"

0
softmmu/vl.c → system/vl.c

0
softmmu/watchpoint.c → system/watchpoint.c

2
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

Loading…
Cancel
Save