diff options
| author | Cao jin <caoj.fnst@cn.fujitsu.com> | 2015-12-22 10:43:16 +0800 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2016-01-21 15:45:22 +0000 |
| commit | c6b14aed77eeed434bdf3ff6cc0d873252c052ba (patch) | |
| tree | 274a3ef5d4cfbcc055b66fe294dee99aff857c10 /hw | |
| parent | 37aa7a0e2fc8219cbe2bda4b7d074b47a67ac917 (diff) | |
| download | qemu-c6b14aed77eeed434bdf3ff6cc0d873252c052ba.tar.gz qemu-c6b14aed77eeed434bdf3ff6cc0d873252c052ba.tar.bz2 qemu-c6b14aed77eeed434bdf3ff6cc0d873252c052ba.zip | |
xen-pvdevice: convert to realize()
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/xen/xen_pvdevice.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c index c2189473ba..9abcf25c1a 100644 --- a/hw/i386/xen/xen_pvdevice.c +++ b/hw/i386/xen/xen_pvdevice.c @@ -69,14 +69,16 @@ static const MemoryRegionOps xen_pv_mmio_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; -static int xen_pv_init(PCIDevice *pci_dev) +static void xen_pv_realize(PCIDevice *pci_dev, Error **errp) { XenPVDevice *d = XEN_PV_DEVICE(pci_dev); uint8_t *pci_conf; /* device-id property must always be supplied */ - if (d->device_id == 0xffff) - return -1; + if (d->device_id == 0xffff) { + error_setg(errp, "Device ID invalid, it must always be supplied"); + return; + } pci_conf = pci_dev->config; @@ -97,8 +99,6 @@ static int xen_pv_init(PCIDevice *pci_dev) pci_register_bar(pci_dev, 1, PCI_BASE_ADDRESS_MEM_PREFETCH, &d->mmio); - - return 0; } static Property xen_pv_props[] = { @@ -114,7 +114,7 @@ static void xen_pv_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - k->init = xen_pv_init; + k->realize = xen_pv_realize; k->class_id = PCI_CLASS_SYSTEM_OTHER; dc->desc = "Xen PV Device"; dc->props = xen_pv_props; |