mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acpi:piix4: allow plug/unlug callbacks handle not only PCI devices

Browse Source 
... and report error if plugged in device is not supported.
Later these callbacks will be used by memory hotplug.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2014-06-02 15:25:19 +02:00 committed by Michael S. Tsirkin
parent 2e1ac493f1
commit f1adc360b4
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/acpi/piix4.c
View File

@ -308,19 +308,32 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque)
acpi_pm1_evt_power_down(&s->ar); acpi_pm1_evt_power_down(&s->ar);
} }
static void piix4_pci_device_plug_cb(HotplugHandler *hotplug_dev, static void piix4_device_plug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp) DeviceState *dev, Error **errp)
{ {
PIIX4PMState *s = PIIX4_PM(hotplug_dev); PIIX4PMState *s = PIIX4_PM(hotplug_dev);
acpi_pcihp_device_plug_cb(&s->ar, s->irq, &s->acpi_pci_hotplug, dev, errp);
if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
acpi_pcihp_device_plug_cb(&s->ar, s->irq, &s->acpi_pci_hotplug, dev,
errp);
} else {
error_setg(errp, "acpi: device plug request for not supported device"
" type: %s", object_get_typename(OBJECT(dev)));
}
} }
static void piix4_pci_device_unplug_cb(HotplugHandler *hotplug_dev, static void piix4_device_unplug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp) DeviceState *dev, Error **errp)
{ {
PIIX4PMState *s = PIIX4_PM(hotplug_dev); PIIX4PMState *s = PIIX4_PM(hotplug_dev);
acpi_pcihp_device_unplug_cb(&s->ar, s->irq, &s->acpi_pci_hotplug, dev,
errp); if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
acpi_pcihp_device_unplug_cb(&s->ar, s->irq, &s->acpi_pci_hotplug, dev,
errp);
} else {
error_setg(errp, "acpi: device unplug request for not supported device"
" type: %s", object_get_typename(OBJECT(dev)));
}
} }
static void piix4_update_bus_hotplug(PCIBus *pci_bus, void *opaque) static void piix4_update_bus_hotplug(PCIBus *pci_bus, void *opaque)
@ -551,8 +564,8 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data)
*/ */
dc->cannot_instantiate_with_device_add_yet = true; dc->cannot_instantiate_with_device_add_yet = true;
dc->hotpluggable = false; dc->hotpluggable = false;
hc->plug = piix4_pci_device_plug_cb; hc->plug = piix4_device_plug_cb;
hc->unplug = piix4_pci_device_unplug_cb; hc->unplug = piix4_device_unplug_cb;
} }
static const TypeInfo piix4_pm_info = { static const TypeInfo piix4_pm_info = {