From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkaRT-0007Jp-HU for qemu-devel@nongnu.org; Thu, 06 Jun 2013 09:41:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkaRQ-0004Ok-0X for qemu-devel@nongnu.org; Thu, 06 Jun 2013 09:41:27 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35472 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkaRP-0004O3-Nm for qemu-devel@nongnu.org; Thu, 06 Jun 2013 09:41:23 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 6 Jun 2013 15:41:09 +0200 Message-Id: <1370526073-18136-2-git-send-email-afaerber@suse.de> In-Reply-To: <1370526073-18136-1-git-send-email-afaerber@suse.de> References: <1370526073-18136-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 1/5] usb/hcd-ehci-sysbus: Convert to QOM realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kraxel@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= The SysBus qdev initfn merely calls SysBusDeviceClass::init, so we can replace it with a realizefn already. This avoids getting into any initfn ambiguity with the upcoming Faraday EHCI implementation. Rename internal usb_ehci_initfn() to usb_ehci_realize() to allow to return Errors from common initialization code as well. Signed-off-by: Andreas F=C3=A4rber --- hw/usb/hcd-ehci-pci.c | 2 +- hw/usb/hcd-ehci-sysbus.c | 13 ++++++------- hw/usb/hcd-ehci.c | 2 +- hw/usb/hcd-ehci.h | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index 0eb7826..70fc65e 100644 --- a/hw/usb/hcd-ehci-pci.c +++ b/hw/usb/hcd-ehci-pci.c @@ -68,7 +68,7 @@ static int usb_ehci_pci_initfn(PCIDevice *dev) s->capsbase =3D 0x00; s->opregbase =3D 0x20; =20 - usb_ehci_initfn(s, DEVICE(dev)); + usb_ehci_realize(s, DEVICE(dev), NULL); pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mem); =20 return 0; diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index b68a66a..4be3d17 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -32,8 +32,9 @@ static Property ehci_sysbus_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 -static int usb_ehci_sysbus_initfn(SysBusDevice *dev) +static void usb_ehci_sysbus_realize(DeviceState *dev, Error **errp) { + SysBusDevice *d =3D SYS_BUS_DEVICE(dev); EHCISysBusState *i =3D SYS_BUS_EHCI(dev); SysBusEHCIClass *sec =3D SYS_BUS_EHCI_GET_CLASS(dev); EHCIState *s =3D &i->ehci; @@ -42,18 +43,16 @@ static int usb_ehci_sysbus_initfn(SysBusDevice *dev) s->opregbase =3D sec->opregbase; s->dma =3D &dma_context_memory; =20 - usb_ehci_initfn(s, DEVICE(dev)); - sysbus_init_irq(dev, &s->irq); - sysbus_init_mmio(dev, &s->mem); - return 0; + usb_ehci_realize(s, dev, errp); + sysbus_init_irq(d, &s->irq); + sysbus_init_mmio(d, &s->mem); } =20 static void ehci_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D usb_ehci_sysbus_initfn; + dc->realize =3D usb_ehci_sysbus_realize; dc->vmsd =3D &vmstate_ehci_sysbus; dc->props =3D ehci_sysbus_properties; } diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 0d3799d..66d0cee 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -2508,7 +2508,7 @@ const VMStateDescription vmstate_ehci =3D { } }; =20 -void usb_ehci_initfn(EHCIState *s, DeviceState *dev) +void usb_ehci_realize(EHCIState *s, DeviceState *dev, Error **errp) { int i; =20 diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index e95bb7e..8105fcb 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -322,7 +322,7 @@ struct EHCIState { =20 extern const VMStateDescription vmstate_ehci; =20 -void usb_ehci_initfn(EHCIState *s, DeviceState *dev); +void usb_ehci_realize(EHCIState *s, DeviceState *dev, Error **errp); =20 #define TYPE_PCI_EHCI "pci-ehci-usb" #define PCI_EHCI(obj) OBJECT_CHECK(EHCIPCIState, (obj), TYPE_PCI_EHCI) --=20 1.8.1.4