Skip to content

Commit 65cb712

Browse files
committed
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) <[email protected]>" [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 <[email protected]>
2 parents 60a07d4 + 1a1f4a5 commit 65cb712

File tree

1,080 files changed

+2575
-2312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,080 files changed

+2575
-2312
lines changed

MAINTAINERS

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ F: include/exec/helper*.h
170170
F: include/exec/helper*.h.inc
171171
F: include/exec/helper-info.c.inc
172172
F: include/exec/page-protection.h
173-
F: include/sysemu/cpus.h
174-
F: include/sysemu/tcg.h
173+
F: include/system/cpus.h
174+
F: include/system/tcg.h
175175
F: include/hw/core/tcg-cpu-ops.h
176176
F: host/include/*/host/cpuinfo.h
177177
F: util/cpuinfo-*.c
@@ -436,7 +436,7 @@ F: */*/kvm*
436436
F: accel/kvm/
437437
F: accel/stubs/kvm-stub.c
438438
F: include/hw/kvm/
439-
F: include/sysemu/kvm*.h
439+
F: include/system/kvm*.h
440440
F: scripts/kvm/kvm_flightrecorder
441441

442442
ARM KVM CPUs
@@ -449,7 +449,7 @@ MIPS KVM CPUs
449449
M: Huacai Chen <[email protected]>
450450
S: Odd Fixes
451451
F: target/mips/kvm*
452-
F: target/mips/sysemu/
452+
F: target/mips/system/
453453

454454
PPC KVM CPUs
455455
M: Nicholas Piggin <[email protected]>
@@ -483,7 +483,7 @@ Xen emulation on X86 KVM CPUs
483483
M: David Woodhouse <[email protected]>
484484
M: Paul Durrant <[email protected]>
485485
S: Supported
486-
F: include/sysemu/kvm_xen.h
486+
F: include/system/kvm_xen.h
487487
F: target/i386/kvm/xen*
488488
F: hw/i386/kvm/xen*
489489
F: tests/avocado/kvm_xen_guest.py
@@ -495,7 +495,7 @@ M: Richard Henderson <[email protected]>
495495
R: Paolo Bonzini <[email protected]>
496496
S: Maintained
497497
F: include/qemu/accel.h
498-
F: include/sysemu/accel-*.h
498+
F: include/system/accel-*.h
499499
F: include/hw/core/accel-cpu.h
500500
F: accel/accel-*.c
501501
F: accel/Makefile.objs
@@ -519,14 +519,14 @@ M: Roman Bolshakov <[email protected]>
519519
W: https://wiki.qemu.org/Features/HVF
520520
S: Maintained
521521
F: accel/hvf/
522-
F: include/sysemu/hvf.h
523-
F: include/sysemu/hvf_int.h
522+
F: include/system/hvf.h
523+
F: include/system/hvf_int.h
524524

525525
WHPX CPUs
526526
M: Sunil Muthuswamy <[email protected]>
527527
S: Supported
528528
F: target/i386/whpx/
529-
F: include/sysemu/whpx.h
529+
F: include/system/whpx.h
530530

531531
Guest CPU Cores (Xen)
532532
---------------------
@@ -552,8 +552,8 @@ F: hw/i386/xen/
552552
F: hw/pci-host/xen_igd_pt.c
553553
F: include/hw/block/dataplane/xen*
554554
F: include/hw/xen/
555-
F: include/sysemu/xen.h
556-
F: include/sysemu/xen-mapcache.h
555+
F: include/system/xen.h
556+
F: include/system/xen-mapcache.h
557557
F: stubs/xen-hw-stub.c
558558
F: docs/system/arm/xenpvh.rst
559559
F: docs/system/i386/xenpvh.rst
@@ -563,7 +563,7 @@ Guest CPU Cores (NVMM)
563563
NetBSD Virtual Machine Monitor (NVMM) CPU support
564564
M: Reinoud Zandijk <[email protected]>
565565
S: Maintained
566-
F: include/sysemu/nvmm.h
566+
F: include/system/nvmm.h
567567
F: target/i386/nvmm/
568568

569569
Hosts
@@ -581,7 +581,7 @@ POSIX
581581
M: Paolo Bonzini <[email protected]>
582582
S: Maintained
583583
F: os-posix.c
584-
F: include/sysemu/os-posix.h
584+
F: include/system/os-posix.h
585585
F: util/*posix*.c
586586
F: include/qemu/*posix*.h
587587

@@ -1874,7 +1874,7 @@ R: Yanan Wang <[email protected]>
18741874
R: Zhao Liu <[email protected]>
18751875
S: Supported
18761876
F: hw/core/cpu-common.c
1877-
F: hw/core/cpu-sysemu.c
1877+
F: hw/core/cpu-system.c
18781878
F: hw/core/machine-qmp-cmds.c
18791879
F: hw/core/machine.c
18801880
F: hw/core/machine-smp.c
@@ -1887,7 +1887,7 @@ F: qapi/machine-target.json
18871887
F: include/hw/boards.h
18881888
F: include/hw/core/cpu.h
18891889
F: include/hw/cpu/cluster.h
1890-
F: include/sysemu/numa.h
1890+
F: include/system/numa.h
18911891
F: tests/functional/test_cpu_queries.py
18921892
F: tests/functional/test_empty_cpu_model.py
18931893
F: tests/unit/test-smp-parse.c
@@ -2197,9 +2197,9 @@ M: Eric Auger <[email protected]>
21972197
M: Zhenzhong Duan <[email protected]>
21982198
S: Supported
21992199
F: backends/iommufd.c
2200-
F: include/sysemu/iommufd.h
2200+
F: include/system/iommufd.h
22012201
F: backends/host_iommu_device.c
2202-
F: include/sysemu/host_iommu_device.h
2202+
F: include/system/host_iommu_device.h
22032203
F: include/qemu/chardev_open.h
22042204
F: util/chardev_open.c
22052205
F: docs/devel/vfio-iommufd.rst
@@ -2213,7 +2213,7 @@ F: docs/interop/vhost-user.json
22132213
F: docs/interop/vhost-user.rst
22142214
F: contrib/vhost-user-*/
22152215
F: backends/vhost-user.c
2216-
F: include/sysemu/vhost-user-backend.h
2216+
F: include/system/vhost-user-backend.h
22172217
F: subprojects/libvhost-user/
22182218

22192219
vhost-shadow-virtqueue
@@ -2241,7 +2241,7 @@ F: docs/interop/virtio-balloon-stats.rst
22412241
F: hw/virtio/virtio-balloon*.c
22422242
F: include/hw/virtio/virtio-balloon.h
22432243
F: system/balloon.c
2244-
F: include/sysemu/balloon.h
2244+
F: include/system/balloon.h
22452245
F: tests/qtest/virtio-balloon-test.c
22462246

22472247
virtio-9p
@@ -2323,7 +2323,7 @@ R: Amit Shah <[email protected]>
23232323
S: Supported
23242324
F: hw/virtio/virtio-rng.c
23252325
F: include/hw/virtio/virtio-rng.h
2326-
F: include/sysemu/rng*.h
2326+
F: include/system/rng*.h
23272327
F: backends/rng*.c
23282328
F: tests/qtest/virtio-rng-test.c
23292329

@@ -2849,7 +2849,7 @@ F: hw/block/
28492849
F: qapi/block*.json
28502850
F: qapi/transaction.json
28512851
F: include/block/
2852-
F: include/sysemu/block-*.h
2852+
F: include/system/block-*.h
28532853
F: qemu-img*
28542854
F: docs/tools/qemu-img.rst
28552855
F: qemu-io*
@@ -2988,7 +2988,7 @@ M: Alistair Francis <[email protected]>
29882988
R: David Gibson <[email protected]>
29892989
S: Maintained
29902990
F: system/device_tree.c
2991-
F: include/sysemu/device_tree.h
2991+
F: include/system/device_tree.h
29922992

29932993
Dump
29942994
S: Supported
@@ -2997,8 +2997,8 @@ F: dump/
29972997
F: hw/misc/vmcoreinfo.c
29982998
F: include/hw/misc/vmcoreinfo.h
29992999
F: include/qemu/win_dump_defs
3000-
F: include/sysemu/dump-arch.h
3001-
F: include/sysemu/dump.h
3000+
F: include/system/dump-arch.h
3001+
F: include/system/dump.h
30023002
F: qapi/dump.json
30033003
F: scripts/dump-guest-memory.py
30043004
F: stubs/dump.c
@@ -3044,7 +3044,7 @@ F: include/exec/memop.h
30443044
F: include/exec/memory.h
30453045
F: include/exec/ram_addr.h
30463046
F: include/exec/ramblock.h
3047-
F: include/sysemu/memory_mapping.h
3047+
F: include/system/memory_mapping.h
30483048
F: system/dma-helpers.c
30493049
F: system/ioport.c
30503050
F: system/memory.c
@@ -3097,8 +3097,8 @@ Main loop
30973097
M: Paolo Bonzini <[email protected]>
30983098
S: Maintained
30993099
F: include/qemu/main-loop.h
3100-
F: include/sysemu/runstate.h
3101-
F: include/sysemu/runstate-action.h
3100+
F: include/system/runstate.h
3101+
F: include/system/runstate-action.h
31023102
F: util/main-loop.c
31033103
F: util/qemu-timer*.c
31043104
F: system/vl.c
@@ -3161,15 +3161,15 @@ M: David Hildenbrand <[email protected]>
31613161
M: Igor Mammedov <[email protected]>
31623162
S: Maintained
31633163
F: backends/hostmem*.c
3164-
F: include/sysemu/hostmem.h
3164+
F: include/system/hostmem.h
31653165
F: docs/system/vm-templating.rst
31663166
T: git https://gitlab.com/ehabkost/qemu.git machine-next
31673167

31683168
Cryptodev Backends
31693169
M: Gonglei <[email protected]>
31703170
M: zhenwei pi <[email protected]>
31713171
S: Maintained
3172-
F: include/sysemu/cryptodev*.h
3172+
F: include/system/cryptodev*.h
31733173
F: backends/cryptodev*.c
31743174
F: qapi/cryptodev.json
31753175

@@ -3318,7 +3318,7 @@ M: Laurent Vivier <[email protected]>
33183318
R: Paolo Bonzini <[email protected]>
33193319
S: Maintained
33203320
F: system/qtest.c
3321-
F: include/sysemu/qtest.h
3321+
F: include/system/qtest.h
33223322
F: accel/qtest/
33233323
F: tests/qtest/
33243324
F: docs/devel/qgraph.rst
@@ -3369,7 +3369,7 @@ T: git https://people.debian.org/~sthibault/qemu.git slirp
33693369

33703370
Stats
33713371
S: Orphan
3372-
F: include/sysemu/stats.h
3372+
F: include/system/stats.h
33733373
F: stats/
33743374
F: qapi/stats.json
33753375

@@ -3410,7 +3410,7 @@ S: Maintained
34103410
F: system/tpm*
34113411
F: hw/tpm/*
34123412
F: include/hw/acpi/tpm.h
3413-
F: include/sysemu/tpm*
3413+
F: include/system/tpm*
34143414
F: qapi/tpm.json
34153415
F: backends/tpm/
34163416
F: tests/qtest/*tpm*
@@ -3421,7 +3421,7 @@ SPDM
34213421
M: Alistair Francis <[email protected]>
34223422
S: Maintained
34233423
F: backends/spdm-socket.c
3424-
F: include/sysemu/spdm-socket.h
3424+
F: include/system/spdm-socket.h
34253425

34263426
Checkpatch
34273427
S: Odd Fixes
@@ -3456,10 +3456,10 @@ Migration dirty limit and dirty page rate
34563456
M: Hyman Huang <[email protected]>
34573457
S: Maintained
34583458
F: system/dirtylimit.c
3459-
F: include/sysemu/dirtylimit.h
3459+
F: include/system/dirtylimit.h
34603460
F: migration/dirtyrate.c
34613461
F: migration/dirtyrate.h
3462-
F: include/sysemu/dirtyrate.h
3462+
F: include/system/dirtyrate.h
34633463
F: docs/devel/migration/dirty-limit.rst
34643464

34653465
Detached LUKS header
@@ -3487,7 +3487,7 @@ Seccomp
34873487
M: Daniel P. Berrange <[email protected]>
34883488
S: Odd Fixes
34893489
F: system/qemu-seccomp.c
3490-
F: include/sysemu/seccomp.h
3490+
F: include/system/seccomp.h
34913491
F: tests/unit/test-seccomp.c
34923492

34933493
Cryptography
@@ -3600,7 +3600,7 @@ F: replay/*
36003600
F: block/blkreplay.c
36013601
F: net/filter-replay.c
36023602
F: include/exec/replay-core.h
3603-
F: include/sysemu/replay.h
3603+
F: include/system/replay.h
36043604
F: docs/devel/replay.rst
36053605
F: docs/system/replay.rst
36063606
F: stubs/replay.c
@@ -3719,7 +3719,7 @@ M: Peter Maydell <[email protected]>
37193719
S: Maintained
37203720
F: include/hw/resettable.h
37213721
F: include/hw/core/resetcontainer.h
3722-
F: include/sysemu/reset.h
3722+
F: include/system/reset.h
37233723
F: hw/core/reset.c
37243724
F: hw/core/resettable.c
37253725
F: hw/core/resetcontainer.c

accel/accel-blocker.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "qemu/thread.h"
3030
#include "qemu/main-loop.h"
3131
#include "hw/core/cpu.h"
32-
#include "sysemu/accel-blocker.h"
32+
#include "system/accel-blocker.h"
3333

3434
static QemuLockCnt accel_in_ioctl_lock;
3535
static QemuEvent accel_in_ioctl_event;

accel/accel-system.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "qemu/osdep.h"
2727
#include "qemu/accel.h"
2828
#include "hw/boards.h"
29-
#include "sysemu/cpus.h"
29+
#include "system/cpus.h"
3030
#include "qemu/error-report.h"
3131
#include "accel-system.h"
3232

accel/dummy-cpus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include "qemu/osdep.h"
1515
#include "qemu/rcu.h"
16-
#include "sysemu/cpus.h"
16+
#include "system/cpus.h"
1717
#include "qemu/guest-random.h"
1818
#include "qemu/main-loop.h"
1919
#include "hw/core/cpu.h"

accel/hvf/hvf-accel-ops.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
#include "exec/exec-all.h"
5555
#include "gdbstub/enums.h"
5656
#include "hw/boards.h"
57-
#include "sysemu/cpus.h"
58-
#include "sysemu/hvf.h"
59-
#include "sysemu/hvf_int.h"
60-
#include "sysemu/runstate.h"
57+
#include "system/cpus.h"
58+
#include "system/hvf.h"
59+
#include "system/hvf_int.h"
60+
#include "system/runstate.h"
6161
#include "qemu/guest-random.h"
6262

6363
HVFState *hvf_state;

accel/hvf/hvf-all.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
#include "qemu/osdep.h"
1212
#include "qemu/error-report.h"
13-
#include "sysemu/hvf.h"
14-
#include "sysemu/hvf_int.h"
13+
#include "system/hvf.h"
14+
#include "system/hvf_int.h"
1515

1616
const char *hvf_return_string(hv_return_t ret)
1717
{

accel/kvm/kvm-accel-ops.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
#include "qemu/osdep.h"
1717
#include "qemu/error-report.h"
1818
#include "qemu/main-loop.h"
19-
#include "sysemu/kvm.h"
20-
#include "sysemu/kvm_int.h"
21-
#include "sysemu/runstate.h"
22-
#include "sysemu/cpus.h"
19+
#include "system/kvm.h"
20+
#include "system/kvm_int.h"
21+
#include "system/runstate.h"
22+
#include "system/cpus.h"
2323
#include "qemu/guest-random.h"
2424
#include "qapi/error.h"
2525

accel/kvm/kvm-all.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
#include "hw/pci/msix.h"
2929
#include "hw/s390x/adapter.h"
3030
#include "gdbstub/enums.h"
31-
#include "sysemu/kvm_int.h"
32-
#include "sysemu/runstate.h"
33-
#include "sysemu/cpus.h"
34-
#include "sysemu/accel-blocker.h"
31+
#include "system/kvm_int.h"
32+
#include "system/runstate.h"
33+
#include "system/cpus.h"
34+
#include "system/accel-blocker.h"
3535
#include "qemu/bswap.h"
3636
#include "exec/memory.h"
3737
#include "exec/ram_addr.h"
@@ -42,15 +42,15 @@
4242
#include "qapi/visitor.h"
4343
#include "qapi/qapi-types-common.h"
4444
#include "qapi/qapi-visit-common.h"
45-
#include "sysemu/reset.h"
45+
#include "system/reset.h"
4646
#include "qemu/guest-random.h"
47-
#include "sysemu/hw_accel.h"
47+
#include "system/hw_accel.h"
4848
#include "kvm-cpus.h"
49-
#include "sysemu/dirtylimit.h"
49+
#include "system/dirtylimit.h"
5050
#include "qemu/range.h"
5151

5252
#include "hw/boards.h"
53-
#include "sysemu/stats.h"
53+
#include "system/stats.h"
5454

5555
/* This check must be after config-host.h is included */
5656
#ifdef CONFIG_EVENTFD

0 commit comments

Comments
 (0)