mirror of
https://github.com/qemu/qemu.git
synced 2025-08-09 19:15:32 +00:00
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>
This commit is contained in:
parent
01c85e60a4
commit
8d7f2e767d
42
MAINTAINERS
42
MAINTAINERS
@ -137,8 +137,8 @@ Overall TCG CPUs
|
|||||||
M: Richard Henderson <richard.henderson@linaro.org>
|
M: Richard Henderson <richard.henderson@linaro.org>
|
||||||
R: Paolo Bonzini <pbonzini@redhat.com>
|
R: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: softmmu/cpus.c
|
F: system/cpus.c
|
||||||
F: softmmu/watchpoint.c
|
F: system/watchpoint.c
|
||||||
F: cpu-common.c
|
F: cpu-common.c
|
||||||
F: cpu-target.c
|
F: cpu-target.c
|
||||||
F: page-vary-target.c
|
F: page-vary-target.c
|
||||||
@ -2108,7 +2108,7 @@ S: Maintained
|
|||||||
F: docs/interop/virtio-balloon-stats.rst
|
F: docs/interop/virtio-balloon-stats.rst
|
||||||
F: hw/virtio/virtio-balloon*.c
|
F: hw/virtio/virtio-balloon*.c
|
||||||
F: include/hw/virtio/virtio-balloon.h
|
F: include/hw/virtio/virtio-balloon.h
|
||||||
F: softmmu/balloon.c
|
F: system/balloon.c
|
||||||
F: include/sysemu/balloon.h
|
F: include/sysemu/balloon.h
|
||||||
|
|
||||||
virtio-9p
|
virtio-9p
|
||||||
@ -2795,7 +2795,7 @@ Device Tree
|
|||||||
M: Alistair Francis <alistair.francis@wdc.com>
|
M: Alistair Francis <alistair.francis@wdc.com>
|
||||||
R: David Gibson <david@gibson.dropbear.id.au>
|
R: David Gibson <david@gibson.dropbear.id.au>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: softmmu/device_tree.c
|
F: system/device_tree.c
|
||||||
F: include/sysemu/device_tree.h
|
F: include/sysemu/device_tree.h
|
||||||
|
|
||||||
Dump
|
Dump
|
||||||
@ -2851,11 +2851,11 @@ F: include/exec/memory.h
|
|||||||
F: include/exec/ram_addr.h
|
F: include/exec/ram_addr.h
|
||||||
F: include/exec/ramblock.h
|
F: include/exec/ramblock.h
|
||||||
F: include/sysemu/memory_mapping.h
|
F: include/sysemu/memory_mapping.h
|
||||||
F: softmmu/dma-helpers.c
|
F: system/dma-helpers.c
|
||||||
F: softmmu/ioport.c
|
F: system/ioport.c
|
||||||
F: softmmu/memory.c
|
F: system/memory.c
|
||||||
F: softmmu/memory_mapping.c
|
F: system/memory_mapping.c
|
||||||
F: softmmu/physmem.c
|
F: system/physmem.c
|
||||||
F: include/exec/memory-internal.h
|
F: include/exec/memory-internal.h
|
||||||
F: scripts/coccinelle/memory-region-housekeeping.cocci
|
F: scripts/coccinelle/memory-region-housekeeping.cocci
|
||||||
|
|
||||||
@ -2908,12 +2908,12 @@ F: include/sysemu/runstate.h
|
|||||||
F: include/sysemu/runstate-action.h
|
F: include/sysemu/runstate-action.h
|
||||||
F: util/main-loop.c
|
F: util/main-loop.c
|
||||||
F: util/qemu-timer.c
|
F: util/qemu-timer.c
|
||||||
F: softmmu/vl.c
|
F: system/vl.c
|
||||||
F: softmmu/main.c
|
F: system/main.c
|
||||||
F: softmmu/cpus.c
|
F: system/cpus.c
|
||||||
F: softmmu/cpu-throttle.c
|
F: system/cpu-throttle.c
|
||||||
F: softmmu/cpu-timers.c
|
F: system/cpu-timers.c
|
||||||
F: softmmu/runstate*
|
F: system/runstate*
|
||||||
F: qapi/run-state.json
|
F: qapi/run-state.json
|
||||||
|
|
||||||
Read, Copy, Update (RCU)
|
Read, Copy, Update (RCU)
|
||||||
@ -3087,7 +3087,7 @@ F: qapi/qom.json
|
|||||||
F: qapi/qdev.json
|
F: qapi/qdev.json
|
||||||
F: scripts/coccinelle/qom-parent-type.cocci
|
F: scripts/coccinelle/qom-parent-type.cocci
|
||||||
F: scripts/qom-cast-macro-clean-cocci-gen.py
|
F: scripts/qom-cast-macro-clean-cocci-gen.py
|
||||||
F: softmmu/qdev-monitor.c
|
F: system/qdev-monitor.c
|
||||||
F: stubs/qdev.c
|
F: stubs/qdev.c
|
||||||
F: qom/
|
F: qom/
|
||||||
F: tests/unit/check-qom-interface.c
|
F: tests/unit/check-qom-interface.c
|
||||||
@ -3121,7 +3121,7 @@ M: Thomas Huth <thuth@redhat.com>
|
|||||||
M: Laurent Vivier <lvivier@redhat.com>
|
M: Laurent Vivier <lvivier@redhat.com>
|
||||||
R: Paolo Bonzini <pbonzini@redhat.com>
|
R: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: softmmu/qtest.c
|
F: system/qtest.c
|
||||||
F: accel/qtest/
|
F: accel/qtest/
|
||||||
F: tests/qtest/
|
F: tests/qtest/
|
||||||
F: docs/devel/qgraph.rst
|
F: docs/devel/qgraph.rst
|
||||||
@ -3197,7 +3197,7 @@ F: scripts/simpletrace.py
|
|||||||
TPM
|
TPM
|
||||||
M: Stefan Berger <stefanb@linux.ibm.com>
|
M: Stefan Berger <stefanb@linux.ibm.com>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: softmmu/tpm*
|
F: system/tpm*
|
||||||
F: hw/tpm/*
|
F: hw/tpm/*
|
||||||
F: include/hw/acpi/tpm.h
|
F: include/hw/acpi/tpm.h
|
||||||
F: include/sysemu/tpm*
|
F: include/sysemu/tpm*
|
||||||
@ -3242,7 +3242,7 @@ F: migration/rdma*
|
|||||||
Migration dirty limit and dirty page rate
|
Migration dirty limit and dirty page rate
|
||||||
M: Hyman Huang <yong.huang@smartx.com>
|
M: Hyman Huang <yong.huang@smartx.com>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: softmmu/dirtylimit.c
|
F: system/dirtylimit.c
|
||||||
F: include/sysemu/dirtylimit.h
|
F: include/sysemu/dirtylimit.h
|
||||||
F: migration/dirtyrate.c
|
F: migration/dirtyrate.c
|
||||||
F: migration/dirtyrate.h
|
F: migration/dirtyrate.h
|
||||||
@ -3266,7 +3266,7 @@ F: scripts/xml-preprocess*
|
|||||||
Seccomp
|
Seccomp
|
||||||
M: Daniel P. Berrange <berrange@redhat.com>
|
M: Daniel P. Berrange <berrange@redhat.com>
|
||||||
S: Odd Fixes
|
S: Odd Fixes
|
||||||
F: softmmu/qemu-seccomp.c
|
F: system/qemu-seccomp.c
|
||||||
F: include/sysemu/seccomp.h
|
F: include/sysemu/seccomp.h
|
||||||
F: tests/unit/test-seccomp.c
|
F: tests/unit/test-seccomp.c
|
||||||
|
|
||||||
@ -3685,7 +3685,7 @@ T: git https://github.com/stefanha/qemu.git block
|
|||||||
Bootdevice
|
Bootdevice
|
||||||
M: Gonglei <arei.gonglei@huawei.com>
|
M: Gonglei <arei.gonglei@huawei.com>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: softmmu/bootdevice.c
|
F: system/bootdevice.c
|
||||||
|
|
||||||
Quorum
|
Quorum
|
||||||
M: Alberto Garcia <berto@igalia.com>
|
M: Alberto Garcia <berto@igalia.com>
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
#include "hw/core/cpu.h"
|
#include "hw/core/cpu.h"
|
||||||
#include "sysemu/cpu-timers.h"
|
#include "sysemu/cpu-timers.h"
|
||||||
#include "sysemu/cpu-throttle.h"
|
#include "sysemu/cpu-throttle.h"
|
||||||
#include "softmmu/timers-state.h"
|
#include "sysemu/cpu-timers-internal.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ICOUNT: Instruction Counter
|
* ICOUNT: Instruction Counter
|
||||||
|
@ -81,7 +81,7 @@ which you can run manually.
|
|||||||
QTest Protocol
|
QTest Protocol
|
||||||
--------------
|
--------------
|
||||||
|
|
||||||
.. kernel-doc:: softmmu/qtest.c
|
.. kernel-doc:: system/qtest.c
|
||||||
:doc: QTest Protocol
|
:doc: QTest Protocol
|
||||||
|
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
#include "qapi/qapi-commands-run-state.h"
|
#include "qapi/qapi-commands-run-state.h"
|
||||||
|
|
||||||
/* in softmmu/runstate-action.c */
|
/* in system/runstate-action.c */
|
||||||
extern RebootAction reboot_action;
|
extern RebootAction reboot_action;
|
||||||
extern ShutdownAction shutdown_action;
|
extern ShutdownAction shutdown_action;
|
||||||
extern PanicAction panic_action;
|
extern PanicAction panic_action;
|
||||||
|
@ -3291,7 +3291,7 @@ if have_system
|
|||||||
'hw/gpio',
|
'hw/gpio',
|
||||||
'migration',
|
'migration',
|
||||||
'net',
|
'net',
|
||||||
'softmmu',
|
'system',
|
||||||
'ui',
|
'ui',
|
||||||
'hw/remote',
|
'hw/remote',
|
||||||
]
|
]
|
||||||
@ -3418,7 +3418,7 @@ endif
|
|||||||
common_ss.add(files('cpu-common.c'))
|
common_ss.add(files('cpu-common.c'))
|
||||||
specific_ss.add(files('cpu-target.c'))
|
specific_ss.add(files('cpu-target.c'))
|
||||||
|
|
||||||
subdir('softmmu')
|
subdir('system')
|
||||||
|
|
||||||
# Work around a gcc bug/misfeature wherein constant propagation looks
|
# Work around a gcc bug/misfeature wherein constant propagation looks
|
||||||
# through an alias:
|
# through an alias:
|
||||||
@ -3797,14 +3797,14 @@ foreach target : target_dirs
|
|||||||
execs = [{
|
execs = [{
|
||||||
'name': 'qemu-system-' + target_name,
|
'name': 'qemu-system-' + target_name,
|
||||||
'win_subsystem': 'console',
|
'win_subsystem': 'console',
|
||||||
'sources': files('softmmu/main.c'),
|
'sources': files('system/main.c'),
|
||||||
'dependencies': []
|
'dependencies': []
|
||||||
}]
|
}]
|
||||||
if targetos == 'windows' and (sdl.found() or gtk.found())
|
if targetos == 'windows' and (sdl.found() or gtk.found())
|
||||||
execs += [{
|
execs += [{
|
||||||
'name': 'qemu-system-' + target_name + 'w',
|
'name': 'qemu-system-' + target_name + 'w',
|
||||||
'win_subsystem': 'windows',
|
'win_subsystem': 'windows',
|
||||||
'sources': files('softmmu/main.c'),
|
'sources': files('system/main.c'),
|
||||||
'dependencies': []
|
'dependencies': []
|
||||||
}]
|
}]
|
||||||
endif
|
endif
|
||||||
|
@ -466,7 +466,7 @@ sub top_of_kernel_tree {
|
|||||||
my @tree_check = (
|
my @tree_check = (
|
||||||
"COPYING", "MAINTAINERS", "Makefile",
|
"COPYING", "MAINTAINERS", "Makefile",
|
||||||
"README.rst", "docs", "VERSION",
|
"README.rst", "docs", "VERSION",
|
||||||
"linux-user", "softmmu"
|
"linux-user", "system"
|
||||||
);
|
);
|
||||||
|
|
||||||
foreach my $check (@tree_check) {
|
foreach my $check (@tree_check) {
|
||||||
|
@ -148,7 +148,7 @@ tcg
|
|||||||
~ (/qemu)?(/accel/tcg|/replay|/tcg)/.*
|
~ (/qemu)?(/accel/tcg|/replay|/tcg)/.*
|
||||||
|
|
||||||
sysemu
|
sysemu
|
||||||
~ (/qemu)?(/softmmu/.*|/accel/.*)
|
~ (/qemu)?(/system/.*|/accel/.*)
|
||||||
|
|
||||||
(headers)
|
(headers)
|
||||||
~ (/qemu)?(/include/.*)
|
~ (/qemu)?(/include/.*)
|
||||||
|
@ -796,7 +796,7 @@ sub top_of_tree {
|
|||||||
&& (-d "${lk_path}docs")
|
&& (-d "${lk_path}docs")
|
||||||
&& (-f "${lk_path}VERSION")
|
&& (-f "${lk_path}VERSION")
|
||||||
&& (-d "${lk_path}linux-user/")
|
&& (-d "${lk_path}linux-user/")
|
||||||
&& (-d "${lk_path}softmmu/")) {
|
&& (-d "${lk_path}system/")) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -43,10 +43,10 @@ EXTRA_CFLAGS="$CFLAGS -U __OPTIMIZE__"
|
|||||||
if ! { [ -e "./COPYING" ] &&
|
if ! { [ -e "./COPYING" ] &&
|
||||||
[ -e "./MAINTAINERS" ] &&
|
[ -e "./MAINTAINERS" ] &&
|
||||||
[ -e "./Makefile" ] &&
|
[ -e "./Makefile" ] &&
|
||||||
[ -e "./docs" ] &&
|
[ -d "./docs" ] &&
|
||||||
[ -e "./VERSION" ] &&
|
[ -e "./VERSION" ] &&
|
||||||
[ -e "./linux-user" ] &&
|
[ -d "./linux-user" ] &&
|
||||||
[ -e "./softmmu" ];} ; then
|
[ -d "./system" ];} ; then
|
||||||
fatal "Please run the script from the top of the QEMU tree"
|
fatal "Please run the script from the top of the QEMU tree"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -1 +0,0 @@
|
|||||||
#include "trace/trace-softmmu.h"
|
|
@ -36,7 +36,7 @@
|
|||||||
#include "hw/core/cpu.h"
|
#include "hw/core/cpu.h"
|
||||||
#include "sysemu/cpu-timers.h"
|
#include "sysemu/cpu-timers.h"
|
||||||
#include "sysemu/cpu-throttle.h"
|
#include "sysemu/cpu-throttle.h"
|
||||||
#include "timers-state.h"
|
#include "sysemu/cpu-timers-internal.h"
|
||||||
|
|
||||||
/* clock and ticks */
|
/* clock and ticks */
|
||||||
|
|
@ -2301,8 +2301,10 @@ RAMBlock *qemu_ram_block_by_name(const char *name)
|
|||||||
return NULL;
|
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)
|
ram_addr_t qemu_ram_addr_from_host(void *ptr)
|
||||||
{
|
{
|
||||||
RAMBlock *block;
|
RAMBlock *block;
|
1
system/trace.h
Normal file
1
system/trace.h
Normal file
@ -0,0 +1 @@
|
|||||||
|
#include "trace/trace-system.h"
|
@ -59,7 +59,7 @@ if have_system or have_tools
|
|||||||
}
|
}
|
||||||
|
|
||||||
if seccomp.found()
|
if seccomp.found()
|
||||||
tests += {'test-seccomp': ['../../softmmu/qemu-seccomp.c', seccomp]}
|
tests += {'test-seccomp': ['../../system/qemu-seccomp.c', seccomp]}
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user