]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Sun, 16 May 2021 16:22:46 +0000 (17:22 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Sun, 16 May 2021 16:22:46 +0000 (17:22 +0100)
pc,pci,virtio: bugfixes, improvements

Fixes all over the place. Faster boot for virtio. ioeventfd support for
mmio.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Fri 14 May 2021 15:27:13 BST
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "mst@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  Fix build with 64 bits time_t
  vhost-vdpa: Make vhost_vdpa_get_device_id() static
  hw/virtio: enable ioeventfd configuring for mmio
  hw/smbios: support for type 41 (onboard devices extended information)
  checkpatch: Fix use of uninitialized value
  virtio-scsi: Configure all host notifiers in a single MR transaction
  virtio-scsi: Set host notifiers and callbacks separately
  virtio-blk: Configure all host notifiers in a single MR transaction
  virtio-blk: Fix rollback path in virtio_blk_data_plane_start()
  pc-dimm: remove unnecessary get_vmstate_memory_region() method
  amd_iommu: fix wrong MMIO operations
  virtio-net: Constify VirtIOFeature feature_sizes[]
  virtio-blk: Constify VirtIOFeature feature_sizes[]
  hw/virtio: Pass virtio_feature_get_config_size() a const argument
  x86: acpi: use offset instead of pointer when using build_header()
  amd_iommu: Fix pte_override_page_mask()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
# hw/arm/virt.c

1  2 
hw/arm/virt.c
hw/i386/acpi-build.c
hw/virtio/virtio.c
qemu-options.hx

diff --cc hw/arm/virt.c
index 0a78532018aef45fd2d02c602a1d33a32a31540f,26a1e252fe6f241c195825cd38b8e4267d207c48..840758666d471cf5cc7872330b022bb0fa46e796
@@@ -50,6 -51,9 +50,7 @@@
  #include "sysemu/tpm.h"
  #include "sysemu/kvm.h"
  #include "hw/loader.h"
 -#include "exec/address-spaces.h"
+ #include "qapi/error.h"
  #include "qemu/bitops.h"
  #include "qemu/error-report.h"
  #include "qemu/module.h"
Simple merge
Simple merge
diff --cc qemu-options.hx
Simple merge