Commit ee9545ed authored by Peter Maydell's avatar Peter Maydell
Browse files

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



virtio, pc: fixes

A couple of last minute bugfixes.

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

# gpg: Signature made Mon 29 Jul 2019 22:13:22 BST
# gpg:                using RSA key 281F0DB8D28D5469
# 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:
  pc-dimm: fix crash when invalid slot number is used
  Revert "hw: report invalid disable-legacy|modern usage for virtio-1-only devs"
  Revert "Revert "globals: Allow global properties to be optional""

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 34e2746b 22235bb6

hw/core/machine.c

+3 −20
Original line number Diff line number Diff line
@@ -115,26 +115,9 @@ const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); 


GlobalProperty hw_compat_2_6[] = {

    { "virtio-mmio", "format_transport_address", "off" },

    /*

     * don't include devices which are modern-only

     * ie keyboard, mouse, tablet, gpu, vga & crypto

     */

    { "virtio-9p-pci", "disable-modern", "on" },

    { "virtio-9p-pci", "disable-legacy", "off" },

    { "virtio-balloon-pci", "disable-modern", "on" },

    { "virtio-balloon-pci", "disable-legacy", "off" },

    { "virtio-blk-pci", "disable-modern", "on" },

    { "virtio-blk-pci", "disable-legacy", "off" },

    { "virtio-input-host-pci", "disable-modern", "on" },

    { "virtio-input-host-pci", "disable-legacy", "off" },

    { "virtio-net-pci", "disable-modern", "on" },

    { "virtio-net-pci", "disable-legacy", "off" },

    { "virtio-rng-pci", "disable-modern", "on" },

    { "virtio-rng-pci", "disable-legacy", "off" },

    { "virtio-scsi-pci", "disable-modern", "on" },

    { "virtio-scsi-pci", "disable-legacy", "off" },

    { "virtio-serial-pci", "disable-modern", "on" },

    { "virtio-serial-pci", "disable-legacy", "off" },

    /* Optional because not all virtio-pci devices support legacy mode */

    { "virtio-pci", "disable-modern", "on",  .optional = true },

    { "virtio-pci", "disable-legacy", "off", .optional = true },

};

const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6);

hw/display/virtio-gpu-pci.c

+1 −3
Original line number Diff line number Diff line
@@ -33,9 +33,7 @@ static void virtio_gpu_pci_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp) 
    Error *local_error = NULL;



    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));

    if (!virtio_pci_force_virtio_1(vpci_dev, errp)) {

        return;

    }

    virtio_pci_force_virtio_1(vpci_dev);

    object_property_set_bool(OBJECT(vdev), true, "realized", &local_error);



    if (local_error) {

hw/display/virtio-vga.c

+1 −3
Original line number Diff line number Diff line
@@ -137,9 +137,7 @@ static void virtio_vga_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp) 


    /* init virtio bits */

    qdev_set_parent_bus(DEVICE(g), BUS(&vpci_dev->bus));

    if (!virtio_pci_force_virtio_1(vpci_dev, errp)) {

        return;

    }

    virtio_pci_force_virtio_1(vpci_dev);

    object_property_set_bool(OBJECT(g), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

hw/mem/pc-dimm.c

+7 −0
Original line number Diff line number Diff line
@@ -38,6 +38,13 @@ void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, 


    slot = object_property_get_int(OBJECT(dimm), PC_DIMM_SLOT_PROP,

                                   &error_abort);

    if ((slot < 0 || slot >= machine->ram_slots) &&

         slot != PC_DIMM_UNASSIGNED_SLOT) {

        error_setg(&local_err, "invalid slot number, valid range is [0-%"

                   PRIu64 "]", machine->ram_slots - 1);

        goto out;

    }



    slot = pc_dimm_get_free_slot(slot == PC_DIMM_UNASSIGNED_SLOT ? NULL : &slot,

                                 machine->ram_slots, &local_err);

    if (local_err) {

hw/virtio/virtio-crypto-pci.c

+1 −3
Original line number Diff line number Diff line
@@ -53,9 +53,7 @@ static void virtio_crypto_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) 
    }



    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));

    if (!virtio_pci_force_virtio_1(vpci_dev, errp)) {

        return;

    }

    virtio_pci_force_virtio_1(vpci_dev);

    object_property_set_bool(OBJECT(vdev), true, "realized", errp);

    object_property_set_link(OBJECT(vcrypto),

                 OBJECT(vcrypto->vdev.conf.cryptodev), "cryptodev",