From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqg4Q-00081d-0p for qemu-devel@nongnu.org; Mon, 26 Oct 2015 07:36:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zqg4L-0004w6-7K for qemu-devel@nongnu.org; Mon, 26 Oct 2015 07:36:09 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:33947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqg4L-0004w1-3C for qemu-devel@nongnu.org; Mon, 26 Oct 2015 07:36:05 -0400 From: Stefano Stabellini Date: Mon, 26 Oct 2015 11:35:48 +0000 Message-ID: <1445859349-17875-2-git-send-email-stefano.stabellini@eu.citrix.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PULL 2/3] xen_platform: switch to realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: qemu-devel@nongnu.org, Eduardo Habkost , Stefano Stabellini Use realize to initialize the xen_platform device Signed-off-by: Stefano Stabellini Signed-off-by: Eduardo Habkost --- hw/i386/xen/xen_platform.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c index 8682c42..3dc68cb 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; -- 1.7.10.4