[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 24/34] acpi:piix4: allow plug/unlug callbacks han
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v3 24/34] acpi:piix4: allow plug/unlug callbacks handle not only PCI devices |
Date: |
Tue, 27 May 2014 15:01:21 +0200 |
... and report error if plugged in device is not supported.
Later these callbacks will be used by memory hotplug.
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/acpi/piix4.c | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 67dc075..4341f82 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -310,19 +310,32 @@ static void piix4_pm_powerdown_req(Notifier *n, void
*opaque)
acpi_pm1_evt_power_down(&s->ar);
}
-static void piix4_pci_device_plug_cb(HotplugHandler *hotplug_dev,
- DeviceState *dev, Error **errp)
+static void piix4_device_plug_cb(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
{
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,
- DeviceState *dev, Error **errp)
+static void piix4_device_unplug_cb(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
{
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)
@@ -553,8 +566,8 @@ static void piix4_pm_class_init(ObjectClass *klass, void
*data)
*/
dc->cannot_instantiate_with_device_add_yet = true;
dc->hotpluggable = false;
- hc->plug = piix4_pci_device_plug_cb;
- hc->unplug = piix4_pci_device_unplug_cb;
+ hc->plug = piix4_device_plug_cb;
+ hc->unplug = piix4_device_unplug_cb;
}
static const TypeInfo piix4_pm_info = {
--
1.7.1
- [Qemu-devel] [PATCH v3 08/34] qdev: hotplug for buss-less devices, (continued)
- [Qemu-devel] [PATCH v3 08/34] qdev: hotplug for buss-less devices, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 10/34] dimm: implement dimm device abstraction, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 11/34] memory: add memory_region_is_mapped() API, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 13/34] pc: initialize memory hotplug address space, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 14/34] pc: exit QEMU if number of slots more than supported 256, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 17/34] pc: add memory hotplug handler to PC_MACHINE, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 18/34] dimm: add busy address check and address auto-allocation, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 22/34] trace: add acpi memory hotplug IO region events, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 21/34] acpi: memory hotplug ACPI hardware implementation, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 23/34] trace: pc: add DIMM slot & address allocation, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 24/34] acpi:piix4: allow plug/unlug callbacks handle not only PCI devices,
Igor Mammedov <=
- [Qemu-devel] [PATCH v3 25/34] acpi:piix4: add memory hotplug handling, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 28/34] pc: migrate piix4 & ich9 MemHotplugState, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 30/34] pc: propagate memory hotplug event to ACPI device, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 31/34] pc: ACPI BIOS: implement memory hotplug interface, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 32/34] pc: add "hotplug-memory-region-size" property to PC_MACHINE, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 29/34] pc: add acpi-device link to PCMachineState, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 33/34] pc: ACPI BIOS: reserve SRAT entry for hotplug mem hole, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 16/34] pc: exit QEMU if compat machine doesn't support memory hotlpug, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 12/34] dimm: do not allow to set already used memdev, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 19/34] dimm: add busy slot check and slot auto-allocation, Igor Mammedov, 2014/05/27