Commit 2897ae02 authored by Igor Mammedov's avatar Igor Mammedov Committed by Michael S. Tsirkin
Browse files

qdev:pci: refactor PCIDevice to use generic "hotpluggable" property 



Get rid of PCIDevice specific PCIDeviceClass.no_hotplug and use
generic DeviceClass.hotpluggable field instead.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 5fdae20c

hw/acpi/pcihp.c

+2 −1
Original line number Diff line number Diff line
@@ -105,12 +105,13 @@ static PCIBus *acpi_pcihp_find_hotplug_bus(AcpiPciHpState *s, int bsel) 
static bool acpi_pcihp_pc_no_hotplug(AcpiPciHpState *s, PCIDevice *dev)

{

    PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);

    DeviceClass *dc = DEVICE_GET_CLASS(dev);

    /*

     * ACPI doesn't allow hotplug of bridge devices.  Don't allow

     * hot-unplug of bridge devices unless they were added by hotplug

     * (and so, not described by acpi).

     */

    return (pc->is_bridge && !dev->qdev.hotplugged) || pc->no_hotplug;

    return (pc->is_bridge && !dev->qdev.hotplugged) || !dc->hotpluggable;

}



static void acpi_pcihp_eject_slot(AcpiPciHpState *s, unsigned bsel, unsigned slots)

hw/acpi/piix4.c

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,6 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->no_hotplug = 1;

    k->init = piix4_pm_initfn;

    k->config_write = pm_write_config;

    k->vendor_id = PCI_VENDOR_ID_INTEL;
@@ -551,6 +550,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data) 
     * e.g. by mips_malta_init()

     */

    dc->cannot_instantiate_with_device_add_yet = true;

    dc->hotpluggable = false;

}



static const TypeInfo piix4_pm_info = {

hw/display/cirrus_vga.c

+1 −1
Original line number Diff line number Diff line
@@ -2996,7 +2996,6 @@ static void cirrus_vga_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->no_hotplug = 1;

    k->init = pci_cirrus_vga_initfn;

    k->romfile = VGABIOS_CIRRUS_FILENAME;

    k->vendor_id = PCI_VENDOR_ID_CIRRUS;
@@ -3006,6 +3005,7 @@ static void cirrus_vga_class_init(ObjectClass *klass, void *data) 
    dc->desc = "Cirrus CLGD 54xx VGA";

    dc->vmsd = &vmstate_pci_cirrus_vga;

    dc->props = pci_vga_cirrus_properties;

    dc->hotpluggable = false;

}



static const TypeInfo cirrus_vga_info = {

hw/display/qxl.c

+1 −1
Original line number Diff line number Diff line
@@ -2299,7 +2299,6 @@ static void qxl_primary_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->no_hotplug = 1;

    k->init = qxl_init_primary;

    k->romfile = "vgabios-qxl.bin";

    k->vendor_id = REDHAT_PCI_VENDOR_ID;
@@ -2310,6 +2309,7 @@ static void qxl_primary_class_init(ObjectClass *klass, void *data) 
    dc->reset = qxl_reset_handler;

    dc->vmsd = &qxl_vmstate;

    dc->props = qxl_properties;

    dc->hotpluggable = false;

}



static const TypeInfo qxl_primary_info = {

hw/display/vga-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ static void vga_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->no_hotplug = 1;

    k->init = pci_std_vga_initfn;

    k->romfile = "vgabios-stdvga.bin";

    k->vendor_id = PCI_VENDOR_ID_QEMU;
@@ -198,6 +197,7 @@ static void vga_class_init(ObjectClass *klass, void *data) 
    k->class_id = PCI_CLASS_DISPLAY_VGA;

    dc->vmsd = &vmstate_vga_pci;

    dc->props = vga_pci_properties;

    dc->hotpluggable = false;

    set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);

}