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

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



pc,vhost,virtio fixes, test

Bugfixes all over the place.

There's a  non bugfix here: re-enabling the vhost-user test,
though the patch just brings back functionality that
I disabled earlier to fix mingw build failures.
This is now sorted, and keeping the unit test enabled
seems important since the feature relies on an external
server to work, so isn't easy to test.

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

# gpg: Signature made Sun 06 Jul 2014 11:01:35 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  qemu-char: add chr_add_watch support in mux chardev
  virtio-pci: fix MSI memory region use after free
  qdev: Fix crash when using non-device class name on -global
  qdev: Don't abort() in case globals can't be set
  hw/virtio: enable common virtio feature for mmio device
  acpi: fix typo in memory hotplug MMIO region name
  pci: assign devfn to pci_dev before calling pci_device_iommu_address_space()
  Handle G_IO_HUP in tcp_chr_read for tcp chardev
  virtio: move common virtio properties to bus class device
  pc-dimm: error out if memory hotplug is not enabled
  numa: check for busy memory backend
  qtest: enable vhost-user-test

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9540d1f8 3f0838ab

hw/acpi/memory_hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ void acpi_memory_hotplug_init(MemoryRegion *as, Object *owner, 


    state->devs = g_malloc0(sizeof(*state->devs) * state->dev_count);

    memory_region_init_io(&state->io, owner, &acpi_memory_hotplug_ops, state,

                          "apci-mem-hotplug", ACPI_MEMORY_HOTPLUG_IO_LEN);

                          "acpi-mem-hotplug", ACPI_MEMORY_HOTPLUG_IO_LEN);

    memory_region_add_subregion(as, ACPI_MEMORY_HOTPLUG_BASE, &state->io);

}

hw/core/qdev-properties-system.c

+2 −1
Original line number Diff line number Diff line
@@ -394,7 +394,8 @@ static int qdev_add_one_global(QemuOpts *opts, void *opaque) 
    g->driver   = qemu_opt_get(opts, "driver");

    g->property = qemu_opt_get(opts, "property");

    g->value    = qemu_opt_get(opts, "value");

    oc = object_class_by_name(g->driver);

    oc = object_class_dynamic_cast(object_class_by_name(g->driver),

                                   TYPE_DEVICE);

    if (oc) {

        DeviceClass *dc = DEVICE_CLASS(oc);

hw/core/qdev.c

+7 −1
Original line number Diff line number Diff line
@@ -957,7 +957,13 @@ static void device_initfn(Object *obj) 


static void device_post_init(Object *obj)

{

    qdev_prop_set_globals(DEVICE(obj), &error_abort);

    Error *err = NULL;

    qdev_prop_set_globals(DEVICE(obj), &err);

    if (err) {

        qerror_report_err(err);

        error_free(err);

        exit(EXIT_FAILURE);

    }

}



/* Unlink device from bus and free the structure.  */

hw/mem/pc-dimm.c

+7 −1
Original line number Diff line number Diff line
@@ -146,7 +146,13 @@ uint64_t pc_dimm_get_free_addr(uint64_t address_space_start, 
    uint64_t new_addr, ret = 0;

    uint64_t address_space_end = address_space_start + address_space_size;



    assert(address_space_end > address_space_size);

    if (!address_space_size) {

        error_setg(errp, "memory hotplug is not enabled, "

                         "please add maxmem option");

        goto out;

    }



    assert(address_space_end > address_space_start);

    object_child_foreach(qdev_get_machine(), pc_dimm_built_list, &list);



    if (hint) {

hw/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -827,6 +827,7 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, 
    }



    pci_dev->bus = bus;

    pci_dev->devfn = devfn;

    dma_as = pci_device_iommu_address_space(pci_dev);



    memory_region_init_alias(&pci_dev->bus_master_enable_region,
@@ -836,7 +837,6 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, 
    address_space_init(&pci_dev->bus_master_as, &pci_dev->bus_master_enable_region,

                       name);



    pci_dev->devfn = devfn;

    pstrcpy(pci_dev->name, sizeof(pci_dev->name), name);

    pci_dev->irq_state = 0;

    pci_config_alloc(pci_dev);