On 5/12/22 10:24, Paolo Bonzini wrote:
> The following changes since commit ec11dc41eec5142b4776db1296972c6323ba5847:
>
> Merge tag 'pull-misc-2022-05-11' of git://repo.or.cz/qemu/armbru into staging (2022-05-11 09:00:26 -0700)
>
> are available in the Git repository at:
>
> https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 333dbac358acc6cc174029263d633a22f66584b4:
>
> vmxcap: add tertiary execution controls (2022-05-12 14:23:19 +0200)
>
> ----------------------------------------------------------------
> * small cleanups for pc-bios/optionrom Makefiles
> * checkpatch: fix g_malloc check
> * fix mremap() and RDMA detection
> * confine igd-passthrough-isa-bridge to Xen-enabled builds
> * cover PCI in arm-virt machine qtests
> * add -M boot and -M mem compound properties
> * bump SLIRP submodule
> * support CFI with system libslirp (>= 4.7)
> * clean up CoQueue wakeup functions
> * fix vhost-vsock regression
> * fix --disable-vnc compilation
> * other minor bugfixes
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/7.1 as appropriate.
r~
>
> ----------------------------------------------------------------
> Bernhard Beschow (2):
> hw/xen/xen_pt: Confine igd-passthrough-isa-bridge to XEN
> hw/xen/xen_pt: Resolve igd_passthrough_isa_bridge_create() indirection
>
> Eric Auger (3):
> tests/qtest/libqos/pci: Introduce pio_limit
> tests/qtest/libqos: Skip hotplug tests if pci root bus is not hotpluggable
> tests/qtest/libqos: Add generic pci host bridge in arm-virt machine
>
> Juan Quintela (1):
> meson: Make mremap() detecting works correctly
>
> Kshitij Suri (1):
> meson: link libpng independent of vnc
>
> Paolo Bonzini (20):
> pc-bios/optionrom: detect -fno-pie
> pc-bios/optionrom: compile with -Wno-array-bounds
> target/i386: do not consult nonexistent host leaves
> checkpatch: fix g_malloc check
> machine: use QAPI struct for boot configuration
> machine: add boot compound property
> machine: add mem compound property
> machine: make memory-backend a link property
> machine: move more memory validation to Machine object
> slirp: bump submodule past 4.7 release
> net: slirp: introduce a wrapper struct for QemuTimer
> net: slirp: switch to slirp_new
> net: slirp: add support for CFI-friendly timer API
> net: slirp: allow CFI with libslirp >= 4.7
> coroutine-lock: qemu_co_queue_next is a coroutine-only qemu_co_enter_next
> coroutine-lock: introduce qemu_co_queue_enter_all
> coroutine-lock: qemu_co_queue_restart_all is a coroutine-only qemu_co_enter_all
> vhost-backend: do not depend on CONFIG_VHOST_VSOCK
> vl: make machine type deprecation a warning
> vmxcap: add tertiary execution controls
>
> block/io.c | 2 +-
> configure | 1 -
> hw/arm/nseries.c | 2 +-
> hw/core/machine.c | 241 ++++++++++++++++++++++++++++++----
> hw/core/numa.c | 2 +-
> hw/hppa/machine.c | 6 +-
> hw/i386/pc.c | 2 +-
> hw/i386/pc_piix.c | 118 -----------------
> hw/nvram/fw_cfg.c | 27 +---
> hw/ppc/mac_newworld.c | 2 +-
> hw/ppc/mac_oldworld.c | 2 +-
> hw/ppc/prep.c | 2 +-
> hw/ppc/spapr.c | 4 +-
> hw/s390x/ipl.c | 20 +--
> hw/sparc/sun4m.c | 9 +-
> hw/sparc64/sun4u.c | 4 +-
> hw/virtio/vhost-backend.c | 4 -
> hw/xen/xen_pt.c | 12 --
> hw/xen/xen_pt.h | 2 +
> hw/xen/xen_pt_graphics.c | 122 +++++++++++++++++
> include/hw/boards.h | 7 +-
> include/hw/i386/pc.h | 1 -
> include/qemu/coroutine.h | 27 +++-
> include/sysemu/sysemu.h | 2 -
> meson.build | 38 +++---
> net/slirp.c | 85 ++++++++++--
> pc-bios/optionrom/Makefile | 4 +-
> qapi/machine.json | 48 +++++++
> scripts/checkpatch.pl | 4 +-
> scripts/kvm/vmxcap | 17 +++
> slirp | 2 +-
> softmmu/bootdevice.c | 3 +-
> softmmu/globals.c | 2 -
> softmmu/vl.c | 231 +++++++++-----------------------
> target/i386/cpu.c | 41 +++++-
> tests/qtest/e1000e-test.c | 6 +
> tests/qtest/libqos/arm-virt-machine.c | 19 ++-
> tests/qtest/libqos/generic-pcihost.c | 231 ++++++++++++++++++++++++++++++++
> tests/qtest/libqos/generic-pcihost.h | 54 ++++++++
> tests/qtest/libqos/meson.build | 1 +
> tests/qtest/libqos/pci-pc.c | 1 +
> tests/qtest/libqos/pci-spapr.c | 1 +
> tests/qtest/libqos/pci.c | 78 +++++++----
> tests/qtest/libqos/pci.h | 6 +-
> tests/qtest/vhost-user-blk-test.c | 10 ++
> tests/qtest/virtio-blk-test.c | 5 +
> tests/qtest/virtio-net-test.c | 5 +
> tests/qtest/virtio-rng-test.c | 5 +
> ui/console.c | 2 +-
> ui/meson.build | 3 +-
> util/qemu-coroutine-lock.c | 47 +++----
> 51 files changed, 1072 insertions(+), 498 deletions(-)
> create mode 100644 tests/qtest/libqos/generic-pcihost.c
> create mode 100644 tests/qtest/libqos/generic-pcihost.h