mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 16:53:55 -06:00
Accel & Exec patch queue
- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
- Add '-d invalid_mem' logging option (Zoltan)
- Create QOM containers explicitly (Peter)
- Rename sysemu/ -> system/ (Philippe)
- Re-orderning of include/exec/ headers (Philippe)
Move a lot of declarations from these legacy mixed bag headers:
. "exec/cpu-all.h"
. "exec/cpu-common.h"
. "exec/cpu-defs.h"
. "exec/exec-all.h"
. "exec/translate-all"
to these more specific ones:
. "exec/page-protection.h"
. "exec/translation-block.h"
. "user/cpu_loop.h"
. "user/guest-host.h"
. "user/page-protection.h"
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t
wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt
KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K
A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8
4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe///
5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r
xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl
VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay
ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP
9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd
+kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6
x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo=
=cjz8
-----END PGP SIGNATURE-----
Merge tag 'exec-20241220' of https://github.com/philmd/qemu into staging
Accel & Exec patch queue
- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
- Add '-d invalid_mem' logging option (Zoltan)
- Create QOM containers explicitly (Peter)
- Rename sysemu/ -> system/ (Philippe)
- Re-orderning of include/exec/ headers (Philippe)
Move a lot of declarations from these legacy mixed bag headers:
. "exec/cpu-all.h"
. "exec/cpu-common.h"
. "exec/cpu-defs.h"
. "exec/exec-all.h"
. "exec/translate-all"
to these more specific ones:
. "exec/page-protection.h"
. "exec/translation-block.h"
. "user/cpu_loop.h"
. "user/guest-host.h"
. "user/page-protection.h"
# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t
# wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt
# KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K
# A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8
# 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe///
# 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r
# xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl
# VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay
# ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP
# 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd
# +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6
# x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo=
# =cjz8
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 20 Dec 2024 11:45:20 EST
# gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE
* tag 'exec-20241220' of https://github.com/philmd/qemu: (59 commits)
util/qemu-timer: fix indentation
meson: Do not define CONFIG_DEVICES on user emulation
system/accel-ops: Remove unnecessary 'exec/cpu-common.h' header
system/numa: Remove unnecessary 'exec/cpu-common.h' header
hw/xen: Remove unnecessary 'exec/cpu-common.h' header
target/mips: Drop left-over comment about Jazz machine
target/mips: Remove tswap() calls in semihosting uhi_fstat_cb()
target/xtensa: Remove tswap() calls in semihosting simcall() helper
accel/tcg: Un-inline translator_is_same_page()
accel/tcg: Include missing 'exec/translation-block.h' header
accel/tcg: Move tcg_cflags_has/set() to 'exec/translation-block.h'
accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h'
qemu/coroutine: Include missing 'qemu/atomic.h' header
exec/translation-block: Include missing 'qemu/atomic.h' header
accel/tcg: Declare cpu_loop_exit_requested() in 'exec/cpu-common.h'
exec/cpu-all: Include 'cpu.h' earlier so MMU_USER_IDX is always defined
target/sparc: Move sparc_restore_state_to_opc() to cpu.c
target/sparc: Uninline cpu_get_tb_cpu_state()
target/loongarch: Declare loongarch_cpu_dump_state() locally
user: Move various declarations out of 'exec/exec-all.h'
...
Conflicts:
hw/char/riscv_htif.c
hw/intc/riscv_aplic.c
target/s390x/cpu.c
Apply sysemu header path changes to not in the pull request.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi
commit
65cb7129f4
1080 changed files with 2575 additions and 2312 deletions
|
|
@ -23,7 +23,7 @@
|
|||
*/
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/module.h"
|
||||
#include "sysemu/arch_init.h"
|
||||
#include "system/arch_init.h"
|
||||
|
||||
#ifdef TARGET_SPARC
|
||||
int graphic_width = 1024;
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/atomic.h"
|
||||
#include "sysemu/kvm.h"
|
||||
#include "sysemu/balloon.h"
|
||||
#include "system/kvm.h"
|
||||
#include "system/balloon.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-machine.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
|
|
|
|||
|
|
@ -24,10 +24,10 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "system/system.h"
|
||||
#include "qapi/visitor.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "sysemu/reset.h"
|
||||
#include "system/reset.h"
|
||||
#include "hw/qdev-core.h"
|
||||
#include "hw/boards.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -27,15 +27,15 @@
|
|||
#include "migration/vmstate.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "sysemu/cpus.h"
|
||||
#include "system/cpus.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "qemu/option.h"
|
||||
#include "qemu/seqlock.h"
|
||||
#include "sysemu/replay.h"
|
||||
#include "sysemu/runstate.h"
|
||||
#include "system/replay.h"
|
||||
#include "system/runstate.h"
|
||||
#include "hw/core/cpu.h"
|
||||
#include "sysemu/cpu-timers.h"
|
||||
#include "sysemu/cpu-timers-internal.h"
|
||||
#include "system/cpu-timers.h"
|
||||
#include "system/cpu-timers-internal.h"
|
||||
|
||||
/* clock and ticks */
|
||||
|
||||
|
|
|
|||
|
|
@ -31,18 +31,18 @@
|
|||
#include "qapi/qapi-events-run-state.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "exec/gdbstub.h"
|
||||
#include "sysemu/hw_accel.h"
|
||||
#include "system/hw_accel.h"
|
||||
#include "exec/cpu-common.h"
|
||||
#include "qemu/thread.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "qemu/plugin.h"
|
||||
#include "sysemu/cpus.h"
|
||||
#include "system/cpus.h"
|
||||
#include "qemu/guest-random.h"
|
||||
#include "hw/nmi.h"
|
||||
#include "sysemu/replay.h"
|
||||
#include "sysemu/runstate.h"
|
||||
#include "sysemu/cpu-timers.h"
|
||||
#include "sysemu/whpx.h"
|
||||
#include "system/replay.h"
|
||||
#include "system/runstate.h"
|
||||
#include "system/cpu-timers.h"
|
||||
#include "system/whpx.h"
|
||||
#include "hw/boards.h"
|
||||
#include "hw/hw.h"
|
||||
#include "trace.h"
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include "qemu/bswap.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "qemu/guest-random.h"
|
||||
#include "sysemu/device_tree.h"
|
||||
#include "system/device_tree.h"
|
||||
#include "hw/loader.h"
|
||||
#include "hw/boards.h"
|
||||
#include "qemu/config-file.h"
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
#include "qapi/qapi-commands-migration.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/error.h"
|
||||
#include "sysemu/dirtyrate.h"
|
||||
#include "sysemu/dirtylimit.h"
|
||||
#include "system/dirtyrate.h"
|
||||
#include "system/dirtylimit.h"
|
||||
#include "monitor/hmp.h"
|
||||
#include "monitor/monitor.h"
|
||||
#include "exec/memory.h"
|
||||
#include "exec/target_page.h"
|
||||
#include "hw/boards.h"
|
||||
#include "sysemu/kvm.h"
|
||||
#include "system/kvm.h"
|
||||
#include "trace.h"
|
||||
#include "migration/misc.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "sysemu/dma.h"
|
||||
#include "system/block-backend.h"
|
||||
#include "system/dma.h"
|
||||
#include "trace.h"
|
||||
#include "qemu/thread.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "sysemu/cpu-timers.h"
|
||||
#include "system/cpu-timers.h"
|
||||
#include "qemu/range.h"
|
||||
|
||||
/* #define DEBUG_IOMMU */
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@
|
|||
#include "hw/loader.h"
|
||||
#include "hw/xen/xen.h"
|
||||
#include "net/net.h"
|
||||
#include "sysemu/cpus.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "system/cpus.h"
|
||||
#include "system/system.h"
|
||||
|
||||
enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;
|
||||
int display_opengl;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu-main.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "system/system.h"
|
||||
|
||||
#ifdef CONFIG_SDL
|
||||
#include <SDL.h>
|
||||
|
|
|
|||
|
|
@ -27,9 +27,9 @@
|
|||
|
||||
#include "exec/memory-internal.h"
|
||||
#include "exec/ram_addr.h"
|
||||
#include "sysemu/kvm.h"
|
||||
#include "sysemu/runstate.h"
|
||||
#include "sysemu/tcg.h"
|
||||
#include "system/kvm.h"
|
||||
#include "system/runstate.h"
|
||||
#include "system/tcg.h"
|
||||
#include "qemu/accel.h"
|
||||
#include "hw/boards.h"
|
||||
#include "migration/vmstate.h"
|
||||
|
|
@ -1412,7 +1412,7 @@ bool memory_region_access_valid(MemoryRegion *mr,
|
|||
{
|
||||
if (mr->ops->valid.accepts
|
||||
&& !mr->ops->valid.accepts(mr->opaque, addr, size, is_write, attrs)) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "Invalid %s at addr 0x%" HWADDR_PRIX
|
||||
qemu_log_mask(LOG_INVALID_MEM, "Invalid %s at addr 0x%" HWADDR_PRIX
|
||||
", size %u, region '%s', reason: rejected\n",
|
||||
is_write ? "write" : "read",
|
||||
addr, size, memory_region_name(mr));
|
||||
|
|
@ -1420,7 +1420,7 @@ bool memory_region_access_valid(MemoryRegion *mr,
|
|||
}
|
||||
|
||||
if (!mr->ops->valid.unaligned && (addr & (size - 1))) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "Invalid %s at addr 0x%" HWADDR_PRIX
|
||||
qemu_log_mask(LOG_INVALID_MEM, "Invalid %s at addr 0x%" HWADDR_PRIX
|
||||
", size %u, region '%s', reason: unaligned\n",
|
||||
is_write ? "write" : "read",
|
||||
addr, size, memory_region_name(mr));
|
||||
|
|
@ -1434,7 +1434,7 @@ bool memory_region_access_valid(MemoryRegion *mr,
|
|||
|
||||
if (size > mr->ops->valid.max_access_size
|
||||
|| size < mr->ops->valid.min_access_size) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "Invalid %s at addr 0x%" HWADDR_PRIX
|
||||
qemu_log_mask(LOG_INVALID_MEM, "Invalid %s at addr 0x%" HWADDR_PRIX
|
||||
", size %u, region '%s', reason: invalid size "
|
||||
"(min:%u max:%u)\n",
|
||||
is_write ? "write" : "read",
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#include "qemu/range.h"
|
||||
#include "qapi/error.h"
|
||||
|
||||
#include "sysemu/memory_mapping.h"
|
||||
#include "system/memory_mapping.h"
|
||||
#include "exec/memory.h"
|
||||
#include "exec/address-spaces.h"
|
||||
#include "hw/core/cpu.h"
|
||||
|
|
|
|||
|
|
@ -34,13 +34,14 @@
|
|||
#include "exec/exec-all.h"
|
||||
#include "exec/page-protection.h"
|
||||
#include "exec/target_page.h"
|
||||
#include "exec/translation-block.h"
|
||||
#include "hw/qdev-core.h"
|
||||
#include "hw/qdev-properties.h"
|
||||
#include "hw/boards.h"
|
||||
#include "sysemu/xen.h"
|
||||
#include "sysemu/kvm.h"
|
||||
#include "sysemu/tcg.h"
|
||||
#include "sysemu/qtest.h"
|
||||
#include "system/xen.h"
|
||||
#include "system/kvm.h"
|
||||
#include "system/tcg.h"
|
||||
#include "system/qtest.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "qemu/config-file.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
|
@ -49,10 +50,10 @@
|
|||
#include "qemu/memalign.h"
|
||||
#include "exec/memory.h"
|
||||
#include "exec/ioport.h"
|
||||
#include "sysemu/dma.h"
|
||||
#include "sysemu/hostmem.h"
|
||||
#include "sysemu/hw_accel.h"
|
||||
#include "sysemu/xen-mapcache.h"
|
||||
#include "system/dma.h"
|
||||
#include "system/hostmem.h"
|
||||
#include "system/hw_accel.h"
|
||||
#include "system/xen-mapcache.h"
|
||||
#include "trace.h"
|
||||
|
||||
#ifdef CONFIG_FALLOCATE_PUNCH_HOLE
|
||||
|
|
@ -61,8 +62,7 @@
|
|||
|
||||
#include "qemu/rcu_queue.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "exec/translate-all.h"
|
||||
#include "sysemu/replay.h"
|
||||
#include "system/replay.h"
|
||||
|
||||
#include "exec/memory-internal.h"
|
||||
#include "exec/ram_addr.h"
|
||||
|
|
@ -2745,7 +2745,7 @@ static bool flatview_access_allowed(MemoryRegion *mr, MemTxAttrs attrs,
|
|||
if (memory_region_is_ram(mr)) {
|
||||
return true;
|
||||
}
|
||||
qemu_log_mask(LOG_GUEST_ERROR,
|
||||
qemu_log_mask(LOG_INVALID_MEM,
|
||||
"Invalid access to non-RAM device at "
|
||||
"addr 0x%" HWADDR_PRIX ", size %" HWADDR_PRIu ", "
|
||||
"region '%s'\n", addr, len, memory_region_name(mr));
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@
|
|||
#include "monitor/hmp.h"
|
||||
#include "monitor/monitor.h"
|
||||
#include "monitor/qdev.h"
|
||||
#include "sysemu/arch_init.h"
|
||||
#include "sysemu/runstate.h"
|
||||
#include "system/arch_init.h"
|
||||
#include "system/runstate.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-qdev.h"
|
||||
#include "qapi/qmp/dispatch.h"
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
#include "qemu/option.h"
|
||||
#include "qemu/qemu-print.h"
|
||||
#include "qemu/option_int.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "system/block-backend.h"
|
||||
#include "migration/misc.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "hw/qdev-properties.h"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include "qemu/module.h"
|
||||
#include <sys/prctl.h>
|
||||
#include <seccomp.h>
|
||||
#include "sysemu/seccomp.h"
|
||||
#include "system/seccomp.h"
|
||||
#include <linux/seccomp.h>
|
||||
|
||||
/* For some architectures (notably ARM) cacheflush is not supported until
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
#include "sysemu/qtest.h"
|
||||
#include "sysemu/runstate.h"
|
||||
#include "system/qtest.h"
|
||||
#include "system/runstate.h"
|
||||
#include "chardev/char-fe.h"
|
||||
#include "exec/ioport.h"
|
||||
#include "exec/memory.h"
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
#include "hw/irq.h"
|
||||
#include "hw/core/cpu.h"
|
||||
#include "qemu/accel.h"
|
||||
#include "sysemu/cpu-timers.h"
|
||||
#include "system/cpu-timers.h"
|
||||
#include "qemu/config-file.h"
|
||||
#include "qemu/option.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@
|
|||
#include "qemu/option.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "qom/object.h"
|
||||
#include "sysemu/replay.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "sysemu/rtc.h"
|
||||
#include "system/replay.h"
|
||||
#include "system/system.h"
|
||||
#include "system/rtc.h"
|
||||
#include "hw/rtc/mc146818rtc.h"
|
||||
|
||||
static enum {
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "sysemu/runstate-action.h"
|
||||
#include "sysemu/watchdog.h"
|
||||
#include "system/runstate-action.h"
|
||||
#include "system/watchdog.h"
|
||||
#include "qemu/config-file.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/option_int.h"
|
||||
|
|
|
|||
|
|
@ -51,14 +51,14 @@
|
|||
#include "qemu/thread.h"
|
||||
#include "qom/object.h"
|
||||
#include "qom/object_interfaces.h"
|
||||
#include "sysemu/cpus.h"
|
||||
#include "sysemu/qtest.h"
|
||||
#include "sysemu/replay.h"
|
||||
#include "sysemu/reset.h"
|
||||
#include "sysemu/runstate.h"
|
||||
#include "sysemu/runstate-action.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "sysemu/tpm.h"
|
||||
#include "system/cpus.h"
|
||||
#include "system/qtest.h"
|
||||
#include "system/replay.h"
|
||||
#include "system/reset.h"
|
||||
#include "system/runstate.h"
|
||||
#include "system/runstate-action.h"
|
||||
#include "system/system.h"
|
||||
#include "system/tpm.h"
|
||||
#include "trace.h"
|
||||
|
||||
static NotifierList exit_notifiers =
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-tpm.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "sysemu/tpm_backend.h"
|
||||
#include "sysemu/tpm.h"
|
||||
#include "system/tpm_backend.h"
|
||||
#include "system/tpm.h"
|
||||
#include "qemu/config-file.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
|
|
|
|||
56
system/vl.c
56
system/vl.c
|
|
@ -39,12 +39,12 @@
|
|||
#include "qemu/help_option.h"
|
||||
#include "qemu/hw-version.h"
|
||||
#include "qemu/uuid.h"
|
||||
#include "sysemu/reset.h"
|
||||
#include "sysemu/runstate.h"
|
||||
#include "sysemu/runstate-action.h"
|
||||
#include "sysemu/seccomp.h"
|
||||
#include "sysemu/tcg.h"
|
||||
#include "sysemu/xen.h"
|
||||
#include "system/reset.h"
|
||||
#include "system/runstate.h"
|
||||
#include "system/runstate-action.h"
|
||||
#include "system/seccomp.h"
|
||||
#include "system/tcg.h"
|
||||
#include "system/xen.h"
|
||||
|
||||
#include "qemu/error-report.h"
|
||||
#include "qemu/sockets.h"
|
||||
|
|
@ -64,30 +64,30 @@
|
|||
#include "monitor/monitor.h"
|
||||
#include "ui/console.h"
|
||||
#include "ui/input.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "sysemu/numa.h"
|
||||
#include "sysemu/hostmem.h"
|
||||
#include "system/system.h"
|
||||
#include "system/numa.h"
|
||||
#include "system/hostmem.h"
|
||||
#include "exec/gdbstub.h"
|
||||
#include "gdbstub/enums.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "chardev/char.h"
|
||||
#include "qemu/bitmap.h"
|
||||
#include "qemu/log.h"
|
||||
#include "sysemu/blockdev.h"
|
||||
#include "system/blockdev.h"
|
||||
#include "hw/block/block.h"
|
||||
#include "hw/i386/x86.h"
|
||||
#include "hw/i386/pc.h"
|
||||
#include "migration/misc.h"
|
||||
#include "migration/snapshot.h"
|
||||
#include "sysemu/tpm.h"
|
||||
#include "sysemu/dma.h"
|
||||
#include "system/tpm.h"
|
||||
#include "system/dma.h"
|
||||
#include "hw/audio/soundhw.h"
|
||||
#include "audio/audio.h"
|
||||
#include "sysemu/cpus.h"
|
||||
#include "sysemu/cpu-timers.h"
|
||||
#include "system/cpus.h"
|
||||
#include "system/cpu-timers.h"
|
||||
#include "migration/colo.h"
|
||||
#include "migration/postcopy-ram.h"
|
||||
#include "sysemu/kvm.h"
|
||||
#include "system/kvm.h"
|
||||
#include "qapi/qobject-input-visitor.h"
|
||||
#include "qemu/option.h"
|
||||
#include "qemu/config-file.h"
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
#ifdef CONFIG_VIRTFS
|
||||
#include "fsdev/qemu-fsdev.h"
|
||||
#endif
|
||||
#include "sysemu/qtest.h"
|
||||
#include "system/qtest.h"
|
||||
#ifdef CONFIG_TCG
|
||||
#include "tcg/perf.h"
|
||||
#endif
|
||||
|
|
@ -106,8 +106,8 @@
|
|||
#include "trace/control.h"
|
||||
#include "qemu/plugin.h"
|
||||
#include "qemu/queue.h"
|
||||
#include "sysemu/arch_init.h"
|
||||
#include "exec/confidential-guest-support.h"
|
||||
#include "system/arch_init.h"
|
||||
#include "system/confidential-guest-support.h"
|
||||
|
||||
#include "ui/qemu-spice.h"
|
||||
#include "qapi/string-input-visitor.h"
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
#include "qom/object_interfaces.h"
|
||||
#include "semihosting/semihost.h"
|
||||
#include "crypto/init.h"
|
||||
#include "sysemu/replay.h"
|
||||
#include "system/replay.h"
|
||||
#include "qapi/qapi-events-run-state.h"
|
||||
#include "qapi/qapi-types-audio.h"
|
||||
#include "qapi/qapi-visit-audio.h"
|
||||
|
|
@ -131,7 +131,7 @@
|
|||
#include "qapi/qapi-commands-ui.h"
|
||||
#include "block/qdict.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "sysemu/iothread.h"
|
||||
#include "system/iothread.h"
|
||||
#include "qemu/guest-random.h"
|
||||
#include "qemu/keyval.h"
|
||||
|
||||
|
|
@ -2113,6 +2113,21 @@ static void parse_memory_options(void)
|
|||
loc_pop(&loc);
|
||||
}
|
||||
|
||||
static const char *const machine_containers[] = {
|
||||
"unattached",
|
||||
"peripheral",
|
||||
"peripheral-anon"
|
||||
};
|
||||
|
||||
static void qemu_create_machine_containers(Object *machine)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(machine_containers); i++) {
|
||||
object_property_add_new_container(machine, machine_containers[i]);
|
||||
}
|
||||
}
|
||||
|
||||
static void qemu_create_machine(QDict *qdict)
|
||||
{
|
||||
MachineClass *machine_class = select_machine(qdict, &error_fatal);
|
||||
|
|
@ -2121,6 +2136,7 @@ static void qemu_create_machine(QDict *qdict)
|
|||
current_machine = MACHINE(object_new_with_class(OBJECT_CLASS(machine_class)));
|
||||
object_property_add_child(object_get_root(), "machine",
|
||||
OBJECT(current_machine));
|
||||
qemu_create_machine_containers(OBJECT(current_machine));
|
||||
object_property_add_child(container_get(OBJECT(current_machine),
|
||||
"/unattached"),
|
||||
"sysbus", OBJECT(sysbus_get_default()));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue