The following changes since commit 894fc4fd670aaf04a67dc7507739f914ff4bacf2:
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2021-06-11 09:21:48 +0100) are available in the Git repository at: https://gitlab.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 429f60abe15cca9046e6aeaffd81e991e34c9bf6: configure: map x32 to cpu_family x86_64 for meson (2021-06-14 20:17:55 +0200) ---------------------------------------------------------------- * avoid deprecation warnings for SASL on macOS 10.11 or newer * fix -readconfig when config blocks have an id (like [chardev "qmp"]) * Error* initialization fixes * Improvements to ESP emulation (Mark) * Allow creating noreserve memory backends (David) * Improvements to query-memdev (David) ---------------------------------------------------------------- David Hildenbrand (18): softmmu/physmem: Mark shared anonymous memory RAM_SHARED softmmu/physmem: Fix ram_block_discard_range() to handle shared anonymous memory softmmu/physmem: Fix qemu_ram_remap() to handle shared anonymous memory util/mmap-alloc: Factor out calculation of the pagesize for the guard page util/mmap-alloc: Factor out reserving of a memory region to mmap_reserve() util/mmap-alloc: Factor out activating of memory to mmap_activate() softmmu/memory: Pass ram_flags to qemu_ram_alloc_from_fd() softmmu/memory: Pass ram_flags to memory_region_init_ram_shared_nomigrate() softmmu/memory: Pass ram_flags to qemu_ram_alloc() and qemu_ram_alloc_internal() util/mmap-alloc: Pass flags instead of separate bools to qemu_ram_mmap() memory: Introduce RAM_NORESERVE and wire it up in qemu_ram_mmap() util/mmap-alloc: Support RAM_NORESERVE via MAP_NORESERVE under Linux hostmem: Wire up RAM_NORESERVE via "reserve" property qmp: Clarify memory backend properties returned via query-memdev qmp: Include "share" property of memory backends hmp: Print "share" property of memory backends with "info memdev" qmp: Include "reserve" property of memory backends hmp: Print "reserve" property of memory backends with "info memdev" David Michael (1): configure: map x32 to cpu_family x86_64 for meson Mark Cave-Ayland (8): esp: only assert INTR_DC interrupt flag if selection fails esp: only set ESP_RSEQ at the start of the select sequence esp: allow non-DMA callback in esp_transfer_data() initial transfer esp: handle non-DMA transfers from the target one byte at a time esp: ensure PDMA write transfers are flushed from the FIFO to the target immediately esp: revert 75ef849696 "esp: correctly fill bus id with requested lun" esp: correctly accumulate extended messages for PDMA esp: fix migration version check in esp_is_version_5() Maxim Levitsky (1): block/scsi: correctly emulate the VPD block limits page Paolo Bonzini (3): vnc: avoid deprecation warnings for SASL on OS X qemu-config: use qemu_opts_from_qdict esp: store lun coming from the MESSAGE OUT phase Peng Liang (1): runstate: Initialize Error * to NULL Zhenzhong Duan (1): vl: Fix an assert failure in error path backends/hostmem-file.c | 11 +- backends/hostmem-memfd.c | 8 +- backends/hostmem-ram.c | 7 +- backends/hostmem.c | 36 ++++ configure | 2 +- hw/core/machine-hmp-cmds.c | 6 + hw/core/machine-qmp-cmds.c | 8 + hw/m68k/next-cube.c | 4 +- hw/misc/ivshmem.c | 5 +- hw/scsi/esp.c | 199 ++++++++++++------- hw/scsi/scsi-generic.c | 9 +- hw/scsi/trace-events | 3 +- include/exec/cpu-common.h | 1 + include/exec/memory.h | 42 ++-- include/exec/ram_addr.h | 9 +- include/hw/scsi/esp.h | 1 + include/qemu/mmap-alloc.h | 16 +- include/qemu/osdep.h | 30 ++- include/sysemu/hostmem.h | 2 +- migration/ram.c | 3 +- qapi/machine.json | 16 +- qapi/qom.json | 10 + .../coccinelle/memory-region-housekeeping.cocci | 8 +- softmmu/memory.c | 27 ++- softmmu/physmem.c | 68 ++++--- softmmu/runstate.c | 2 +- softmmu/vl.c | 2 +- ui/vnc-auth-sasl.c | 20 ++ ui/vnc-auth-sasl.h | 1 + ui/vnc.c | 10 +- util/mmap-alloc.c | 212 +++++++++++++++------ util/oslib-posix.c | 7 +- util/oslib-win32.c | 13 +- util/qemu-config.c | 17 +- 34 files changed, 549 insertions(+), 266 deletions(-) -- 2.31.1