The following changes since commit ecba223da6215d6f6ce2d343b70b2e9a19bfb90b:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20210624' into staging (2021-06-24 15:00:34 +0100) are available in the Git repository at: https://gitlab.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 0aebebb561c9c23b9c6d3d58040f83547f059b5c: machine: reject -smp dies!=1 for non-PC machines (2021-06-25 16:16:11 +0200) Starting to flush my own queue before 6.1 soft freeze. The block/file-posix.c patches have been reviewed/acked by Max. ---------------------------------------------------------------- * Some Meson test conversions * KVM dirty page ring buffer fix * KVM TSC scaling support * Fixes for SG_IO with /dev/sdX devices * (Non)support for host devices on iOS * -smp cleanups ---------------------------------------------------------------- Joelle van Dyne (3): block: feature detection for host block support block: check for sys/disk.h block: detect DKIOCGETBLOCKCOUNT/SIZE before use Paolo Bonzini (24): target/i386: kvm: add support for TSC scaling meson: drop unused CONFIG_GCRYPT_HMAC configure: drop unused variables for xts meson: remove preadv from summary tests: remove QCRYPTO_HAVE_TLS_TEST_SUPPORT configure, meson: convert crypto detection to meson configure, meson: convert libtasn1 detection to meson configure, meson: convert pam detection to meson configure, meson: convert libusb detection to meson configure, meson: convert libcacard detection to meson configure, meson: convert libusbredir detection to meson file-posix: fix max_iov for /dev/sg devices scsi-generic: pass max_segments via max_iov field in BlockLimits osdep: provide ROUND_DOWN macro block-backend: align max_transfer to request alignment block: add max_hw_transfer to BlockLimits file-posix: try BLKSECTGET on block devices too, do not round to power of 2 block: try BSD disk size ioctls one after another file-posix: handle EINTR during ioctl machine: move dies from X86MachineState to CpuTopology machine: move common smp_parse code to caller machine: add error propagation to mc->smp_parse machine: pass QAPI struct to mc->smp_parse machine: reject -smp dies!=1 for non-PC machines Peter Xu (1): KVM: Fix dirty ring mmap incorrect size due to renaming accident accel/kvm/kvm-all.c | 4 +- authz/meson.build | 2 +- block.c | 2 +- block/block-backend.c | 19 +- block/file-posix.c | 144 +++++++++------ block/io.c | 2 + configure | 326 +++------------------------------- crypto/meson.build | 41 ++--- hw/core/machine.c | 140 +++++++++------ hw/i386/pc.c | 110 +++++------- hw/i386/x86.c | 15 +- hw/scsi/scsi-generic.c | 6 +- hw/usb/meson.build | 6 +- include/block/block_int.h | 7 + include/hw/boards.h | 3 +- include/hw/i386/pc.h | 3 - include/hw/i386/x86.h | 1 - include/qemu/osdep.h | 28 ++- include/sysemu/block-backend.h | 1 + meson.build | 159 ++++++++++++----- meson_options.txt | 14 ++ qapi/block-core.json | 14 +- qapi/machine.json | 28 +++ target/i386/cpu.c | 2 +- target/i386/cpu.h | 1 + target/i386/kvm/kvm.c | 12 +- tests/unit/crypto-tls-psk-helpers.c | 6 - tests/unit/crypto-tls-psk-helpers.h | 4 - tests/unit/crypto-tls-x509-helpers.c | 4 - tests/unit/crypto-tls-x509-helpers.h | 11 +- tests/unit/meson.build | 10 +- tests/unit/pkix_asn1_tab.c | 3 - tests/unit/test-crypto-tlscredsx509.c | 12 -- tests/unit/test-crypto-tlssession.c | 12 -- tests/unit/test-io-channel-tls.c | 12 -- 35 files changed, 501 insertions(+), 663 deletions(-) -- 2.31.1