Commit 9af21dbe authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael S. Tsirkin
Browse files

pci: Trivial device model conversions to realize 



Convert the device models where initialization obviously can't fail.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarGonglei <arei.gonglei@huawei.com>
parent 7ee6c1e1

hw/acpi/piix4.c

+2 −3
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static void piix4_pm_add_propeties(PIIX4PMState *s) 
                                  &s->io_base, NULL);

}



static int piix4_pm_initfn(PCIDevice *dev)

static void piix4_pm_realize(PCIDevice *dev, Error **errp)

{

    PIIX4PMState *s = PIIX4_PM(dev);

    uint8_t *pci_conf;
@@ -470,7 +470,6 @@ static int piix4_pm_initfn(PCIDevice *dev) 
    piix4_acpi_system_hot_add_init(pci_address_space_io(dev), dev->bus, s);



    piix4_pm_add_propeties(s);

    return 0;

}



Object *piix4_pm_find(void)
@@ -593,7 +592,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data) 
    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);

    AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_CLASS(klass);



    k->init = piix4_pm_initfn;

    k->realize = piix4_pm_realize;

    k->config_write = pm_write_config;

    k->vendor_id = PCI_VENDOR_ID_INTEL;

    k->device_id = PCI_DEVICE_ID_INTEL_82371AB_3;

hw/audio/ac97.c

+2 −3
Original line number Diff line number Diff line
@@ -1337,7 +1337,7 @@ static void ac97_on_reset (DeviceState *dev) 
    mixer_reset (s);

}



static int ac97_initfn (PCIDevice *dev)

static void ac97_realize(PCIDevice *dev, Error **errp)

{

    AC97LinkState *s = DO_UPCAST (AC97LinkState, dev, dev);

    uint8_t *c = s->dev.config;
@@ -1384,7 +1384,6 @@ static int ac97_initfn (PCIDevice *dev) 
    pci_register_bar (&s->dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nabm);

    AUD_register_card ("ac97", &s->card);

    ac97_on_reset (&s->dev.qdev);

    return 0;

}



static int ac97_init (PCIBus *bus)
@@ -1403,7 +1402,7 @@ static void ac97_class_init (ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS (klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS (klass);



    k->init = ac97_initfn;

    k->realize = ac97_realize;

    k->vendor_id = PCI_VENDOR_ID_INTEL;

    k->device_id = PCI_DEVICE_ID_INTEL_82801AA_5;

    k->revision = 0x01;

hw/audio/es1370.c

+2 −3
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ static void es1370_on_reset (void *opaque) 
    es1370_reset (s);

}



static int es1370_initfn (PCIDevice *dev)

static void es1370_realize(PCIDevice *dev, Error **errp)

{

    ES1370State *s = DO_UPCAST (ES1370State, dev, dev);

    uint8_t *c = s->dev.config;
@@ -1039,7 +1039,6 @@ static int es1370_initfn (PCIDevice *dev) 


    AUD_register_card ("es1370", &s->card);

    es1370_reset (s);

    return 0;

}



static int es1370_init (PCIBus *bus)
@@ -1053,7 +1052,7 @@ static void es1370_class_init (ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS (klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS (klass);



    k->init = es1370_initfn;

    k->realize = es1370_realize;

    k->vendor_id = PCI_VENDOR_ID_ENSONIQ;

    k->device_id = PCI_DEVICE_ID_ENSONIQ_ES1370;

    k->class_id = PCI_CLASS_MULTIMEDIA_AUDIO;

hw/audio/intel-hda.c

+2 −4
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ static void intel_hda_reset(DeviceState *dev) 
    intel_hda_update_irq(d);

}



static int intel_hda_init(PCIDevice *pci)

static void intel_hda_realize(PCIDevice *pci, Error **errp)

{

    IntelHDAState *d = INTEL_HDA(pci);

    uint8_t *conf = d->pci.config;
@@ -1147,8 +1147,6 @@ static int intel_hda_init(PCIDevice *pci) 


    hda_codec_bus_init(DEVICE(pci), &d->codecs, sizeof(d->codecs),

                       intel_hda_response, intel_hda_xfer);



    return 0;

}



static void intel_hda_exit(PCIDevice *pci)
@@ -1245,7 +1243,7 @@ static void intel_hda_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->init = intel_hda_init;

    k->realize = intel_hda_realize;

    k->exit = intel_hda_exit;

    k->vendor_id = PCI_VENDOR_ID_INTEL;

    k->class_id = PCI_CLASS_MULTIMEDIA_HD_AUDIO;

hw/display/vga-pci.c

+4 −7
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static const MemoryRegionOps pci_vga_qext_ops = { 
    .endianness = DEVICE_LITTLE_ENDIAN,

};



static int pci_std_vga_initfn(PCIDevice *dev)

static void pci_std_vga_realize(PCIDevice *dev, Error **errp)

{

    PCIVGAState *d = DO_UPCAST(PCIVGAState, dev, dev);

    VGACommonState *s = &d->vga;
@@ -232,11 +232,9 @@ static int pci_std_vga_initfn(PCIDevice *dev) 
        /* compatibility with pc-0.13 and older */

        vga_init_vbe(s, OBJECT(dev), pci_address_space(dev));

    }



    return 0;

}



static int pci_secondary_vga_initfn(PCIDevice *dev)

static void pci_secondary_vga_realize(PCIDevice *dev, Error **errp)

{

    PCIVGAState *d = DO_UPCAST(PCIVGAState, dev, dev);

    VGACommonState *s = &d->vga;
@@ -268,7 +266,6 @@ static int pci_secondary_vga_initfn(PCIDevice *dev) 
    pci_register_bar(&d->dev, 0, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->vram);

    pci_register_bar(&d->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio);



    return 0;

}



static void pci_secondary_vga_reset(DeviceState *dev)
@@ -298,7 +295,7 @@ static void vga_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->init = pci_std_vga_initfn;

    k->realize = pci_std_vga_realize;

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

    k->vendor_id = PCI_VENDOR_ID_QEMU;

    k->device_id = PCI_DEVICE_ID_QEMU_VGA;
@@ -314,7 +311,7 @@ static void secondary_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->init = pci_secondary_vga_initfn;

    k->realize = pci_secondary_vga_realize;

    k->vendor_id = PCI_VENDOR_ID_QEMU;

    k->device_id = PCI_DEVICE_ID_QEMU_VGA;

    k->class_id = PCI_CLASS_DISPLAY_OTHER;