From: Stefano Stabellini Date: Wed, 21 Oct 2015 15:46:49 +0000 (-0200) Subject: xen_platform: switch to realize X-Git-Tag: v2.5.0-rc0~47^2~1 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4098d49db549e20a2d87ca3cced28ace6e5864bf;p=qemu-xen-unstable.git xen_platform: switch to realize Use realize to initialize the xen_platform device Signed-off-by: Stefano Stabellini Signed-off-by: Eduardo Habkost --- diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c index 8682c42e46..3dc68cb0fe 100644 --- a/hw/i386/xen/xen_platform.c +++ b/hw/i386/xen/xen_platform.c @@ -382,7 +382,7 @@ static const VMStateDescription vmstate_xen_platform = { } }; -static int xen_platform_initfn(PCIDevice *dev) +static void xen_platform_realize(PCIDevice *dev, Error **errp) { PCIXenPlatformState *d = XEN_PLATFORM(dev); uint8_t *pci_conf; @@ -407,8 +407,6 @@ static int xen_platform_initfn(PCIDevice *dev) &d->mmio_bar); platform_fixed_ioport_init(d); - - return 0; } static void platform_reset(DeviceState *dev) @@ -423,7 +421,7 @@ static void xen_platform_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - k->init = xen_platform_initfn; + k->realize = xen_platform_realize; k->vendor_id = PCI_VENDOR_ID_XEN; k->device_id = PCI_DEVICE_ID_XEN_PLATFORM; k->class_id = PCI_CLASS_OTHERS << 8 | 0x80;