* [Qemu-devel] [PATCH] xen_platform: switch to realize
@ 2015-10-19 17:13 Stefano Stabellini
2015-10-19 19:43 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Stefano Stabellini @ 2015-10-19 17:13 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, Stefano Stabellini
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;
}
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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] xen_platform: switch to realize
2015-10-19 17:13 [Qemu-devel] [PATCH] xen_platform: switch to realize Stefano Stabellini
@ 2015-10-19 19:43 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2015-10-19 19:43 UTC (permalink / raw)
To: Stefano Stabellini, qemu-devel
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;
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-19 19:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-19 17:13 [Qemu-devel] [PATCH] xen_platform: switch to realize Stefano Stabellini
2015-10-19 19:43 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).