Commit 32694e98 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging 



Machine queue, 2019-03-06

* qdev: Hotplug handler chaining (David Hildenbrand)
* qdev: fix qbus_is_full() (Tony Krowiak)
* hostmem: fix crash when querying empty host-nodes property via
  QMP (Igor Mammedov)

# gpg: Signature made Wed 06 Mar 2019 18:39:29 GMT
# gpg:                using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-next-pull-request:
  qdev: Provide qdev_get_bus_hotplug_handler()
  qdev: Let machine hotplug handler to override bus hotplug handler
  qdev: Let the hotplug_handler_unplug() caller delete the device
  hostmem: fix crash when querying empty host-nodes property via QMP
  qdev/core: fix qbus_is_full()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c557a8c7 14405c27

backends/hostmem.c

+2 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name, 


    value = find_first_bit(backend->host_nodes, MAX_NODES);

    if (value == MAX_NODES) {

        return;

        goto ret;

    }



    *node = g_malloc0(sizeof(**node));
@@ -106,6 +106,7 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name, 
        node = &(*node)->next;

    } while (true);



ret:

    visit_type_uint16List(v, name, &host_nodes, errp);

}

hw/acpi/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ static void cpu_hotplug_wr(void *opaque, hwaddr addr, uint64_t data, 
            dev = DEVICE(cdev->cpu);

            hotplug_ctrl = qdev_get_hotplug_handler(dev);

            hotplug_handler_unplug(hotplug_ctrl, dev, NULL);

            object_unparent(OBJECT(dev));

        }

        break;

    case ACPI_CPU_CMD_OFFSET_WR:

hw/acpi/memory_hotplug.c

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ static void acpi_memory_hotplug_write(void *opaque, hwaddr addr, uint64_t data, 
                error_free(local_err);

                break;

            }

            object_unparent(OBJECT(dev));

            trace_mhp_acpi_pc_dimm_deleted(mem_st->selector);

        }

        break;

hw/acpi/pcihp.c

+2 −1
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ static void acpi_pcihp_eject_slot(AcpiPciHpState *s, unsigned bsel, unsigned slo 
            if (!acpi_pcihp_pc_no_hotplug(s, dev)) {

                hotplug_ctrl = qdev_get_hotplug_handler(qdev);

                hotplug_handler_unplug(hotplug_ctrl, qdev, &error_abort);

                object_unparent(OBJECT(qdev));

            }

        }

    }
@@ -269,7 +270,7 @@ void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, 
void acpi_pcihp_device_unplug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s,

                                 DeviceState *dev, Error **errp)

{

    object_unparent(OBJECT(dev));

    object_property_set_bool(OBJECT(dev), false, "realized", NULL);

}



void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev,

hw/core/qdev.c

+15 −7
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ static void bus_remove_child(BusState *bus, DeviceState *child) 
            snprintf(name, sizeof(name), "child[%d]", kid->index);

            QTAILQ_REMOVE(&bus->children, kid, sibling);



            bus->num_children--;



            /* This gives back ownership of kid->child back to us.  */

            object_property_del(OBJECT(bus), name, NULL);

            object_unref(OBJECT(kid->child));
@@ -73,6 +75,7 @@ static void bus_add_child(BusState *bus, DeviceState *child) 
    char name[32];

    BusChild *kid = g_malloc0(sizeof(*kid));



    bus->num_children++;

    kid->index = bus->max_index++;

    kid->child = child;

    object_ref(OBJECT(kid->child));
@@ -233,14 +236,20 @@ HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev) 
    return NULL;

}



HotplugHandler *qdev_get_bus_hotplug_handler(DeviceState *dev)

{

    if (dev->parent_bus) {

        return dev->parent_bus->hotplug_handler;

    }

    return NULL;

}



HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev)

{

    HotplugHandler *hotplug_ctrl;

    HotplugHandler *hotplug_ctrl = qdev_get_machine_hotplug_handler(dev);



    if (dev->parent_bus && dev->parent_bus->hotplug_handler) {

        hotplug_ctrl = dev->parent_bus->hotplug_handler;

    } else {

        hotplug_ctrl = qdev_get_machine_hotplug_handler(dev);

    if (hotplug_ctrl == NULL && dev->parent_bus) {

        hotplug_ctrl = qdev_get_bus_hotplug_handler(dev);

    }

    return hotplug_ctrl;

}
@@ -286,8 +295,7 @@ void qbus_reset_all_fn(void *opaque) 
void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev,

                                  DeviceState *dev, Error **errp)

{

    /* just zap it */

    object_unparent(OBJECT(dev));

    object_property_set_bool(OBJECT(dev), false, "realized", NULL);

}



/*