Commit 8ffa52c2 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



acpi,virtio,pc: bugfixes

Fix bug in ACPI which were tripping up guests.
Fix a use-after-free with hotplug of virtio devices.
Block ability to create legacy devices which shouldn't have been
there in the first place.
Fix migration error handling with balloon.
Drop some dead code in virtio.
vtd emulation fixup.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Wed 22 Jul 2020 13:07:26 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:
  virtio-pci: Changed vdev to proxy for VirtIO PCI BAR callbacks.
  intel_iommu: Use correct shift for 256 bits qi descriptor
  virtio: verify that legacy support is not accidentally on
  virtio: list legacy-capable devices
  virtio-balloon: Replace free page hinting references to 'report' with 'hint'
  virtio-balloon: Add locking to prevent possible race when starting hinting
  virtio-balloon: Prevent guest from starting a report when we didn't request one
  virtio: Drop broken and superfluous object_property_set_link()
  acpi: accept byte and word access to core ACPI registers

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 53ce7b47 ccec7e96

hw/acpi/core.c

+6 −3
Original line number Diff line number Diff line
@@ -458,7 +458,8 @@ static void acpi_pm_evt_write(void *opaque, hwaddr addr, uint64_t val, 
static const MemoryRegionOps acpi_pm_evt_ops = {

    .read = acpi_pm_evt_read,

    .write = acpi_pm_evt_write,

    .valid.min_access_size = 2,

    .impl.min_access_size = 2,

    .valid.min_access_size = 1,

    .valid.max_access_size = 2,

    .endianness = DEVICE_LITTLE_ENDIAN,

};
@@ -527,7 +528,8 @@ static void acpi_pm_tmr_write(void *opaque, hwaddr addr, uint64_t val, 
static const MemoryRegionOps acpi_pm_tmr_ops = {

    .read = acpi_pm_tmr_read,

    .write = acpi_pm_tmr_write,

    .valid.min_access_size = 4,

    .impl.min_access_size = 4,

    .valid.min_access_size = 1,

    .valid.max_access_size = 4,

    .endianness = DEVICE_LITTLE_ENDIAN,

};
@@ -599,7 +601,8 @@ static void acpi_pm_cnt_write(void *opaque, hwaddr addr, uint64_t val, 
static const MemoryRegionOps acpi_pm_cnt_ops = {

    .read = acpi_pm_cnt_read,

    .write = acpi_pm_cnt_write,

    .valid.min_access_size = 2,

    .impl.min_access_size = 2,

    .valid.min_access_size = 1,

    .valid.max_access_size = 2,

    .endianness = DEVICE_LITTLE_ENDIAN,

};

hw/i386/intel_iommu.c

+6 −1
Original line number Diff line number Diff line
@@ -2549,6 +2549,11 @@ static bool vtd_process_inv_desc(IntelIOMMUState *s) 
/* Try to fetch and process more Invalidation Descriptors */

static void vtd_fetch_inv_desc(IntelIOMMUState *s)

{

    int qi_shift;



    /* Refer to 10.4.23 of VT-d spec 3.0 */

    qi_shift = s->iq_dw ? VTD_IQH_QH_SHIFT_5 : VTD_IQH_QH_SHIFT_4;



    trace_vtd_inv_qi_fetch();



    if (s->iq_tail >= s->iq_size) {
@@ -2567,7 +2572,7 @@ static void vtd_fetch_inv_desc(IntelIOMMUState *s) 
        }

        /* Must update the IQH_REG in time */

        vtd_set_quad_raw(s, DMAR_IQH_REG,

                         (((uint64_t)(s->iq_head)) << VTD_IQH_QH_SHIFT) &

                         (((uint64_t)(s->iq_head)) << qi_shift) &

                         VTD_IQH_QH_MASK);

    }

}

hw/i386/intel_iommu_internal.h

+2 −1
Original line number Diff line number Diff line
@@ -230,7 +230,8 @@ 
#define VTD_IQA_DW_MASK             0x800



/* IQH_REG */

#define VTD_IQH_QH_SHIFT            4

#define VTD_IQH_QH_SHIFT_4          4

#define VTD_IQH_QH_SHIFT_5          5

#define VTD_IQH_QH_MASK             0x7fff0ULL



/* ICS_REG */

hw/s390x/virtio-ccw-crypto.c

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ static void virtio_ccw_crypto_realize(VirtioCcwDevice *ccw_dev, Error **errp) 
    if (!qdev_realize(vdev, BUS(&ccw_dev->bus), errp)) {

        return;

    }



    object_property_set_link(OBJECT(vdev), "cryptodev",

                             OBJECT(dev->vdev.conf.cryptodev), NULL);

}



static void virtio_ccw_crypto_instance_init(Object *obj)

hw/s390x/virtio-ccw-rng.c

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ static void virtio_ccw_rng_realize(VirtioCcwDevice *ccw_dev, Error **errp) 
    if (!qdev_realize(vdev, BUS(&ccw_dev->bus), errp)) {

        return;

    }



    object_property_set_link(OBJECT(dev), "rng", OBJECT(dev->vdev.conf.rng),

                             NULL);

}



static void virtio_ccw_rng_instance_init(Object *obj)