| Message ID | alpine.DEB.2.02.1510191810510.27957@kaball.uk.xensource.com |
|---|---|
| State | New |
| Headers | show |
On 19/10/2015 19:13, Stefano Stabellini wrote: > Use realize to initialize the xen_platform device > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > > diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c > index 8682c42..5bb701f 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_initfn(PCIDevice *dev, Error **errp) > { > PCIXenPlatformState *d = XEN_PLATFORM(dev); > uint8_t *pci_conf; > @@ -408,7 +408,7 @@ static int xen_platform_initfn(PCIDevice *dev) > > platform_fixed_ioport_init(d); > > - return 0; > + return; Useless return (also this does not remove the problematic assertion). Paolo > } > > static void platform_reset(DeviceState *dev) > @@ -423,7 +423,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_initfn; > k->vendor_id = PCI_VENDOR_ID_XEN; > k->device_id = PCI_DEVICE_ID_XEN_PLATFORM; > k->class_id = PCI_CLASS_OTHERS << 8 | 0x80; > >
diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c index 8682c42..5bb701f 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_initfn(PCIDevice *dev, Error **errp) { PCIXenPlatformState *d = XEN_PLATFORM(dev); uint8_t *pci_conf; @@ -408,7 +408,7 @@ static int xen_platform_initfn(PCIDevice *dev) platform_fixed_ioport_init(d); - return 0; + return; } static void platform_reset(DeviceState *dev) @@ -423,7 +423,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_initfn; k->vendor_id = PCI_VENDOR_ID_XEN; k->device_id = PCI_DEVICE_ID_XEN_PLATFORM; k->class_id = PCI_CLASS_OTHERS << 8 | 0x80;
Use realize to initialize the xen_platform device Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>