[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 03/26] ohci: use realize for ohci
From: |
Andreas Färber |
Subject: |
Re: [Qemu-devel] [PATCH v2 03/26] ohci: use realize for ohci |
Date: |
Sun, 07 Jul 2013 17:22:44 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130620 Thunderbird/17.0.7 |
Am 01.07.2013 12:18, schrieb Hu Tao:
> Signed-off-by: Hu Tao <address@hidden>
> ---
> hw/usb/hcd-ohci.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
> index 912255d..ee824ee 100644
> --- a/hw/usb/hcd-ohci.c
> +++ b/hw/usb/hcd-ohci.c
> @@ -1880,17 +1880,16 @@ typedef struct {
> dma_addr_t dma_offset;
> } OHCISysBusState;
>
> -static int ohci_init_pxa(SysBusDevice *dev)
> +static void ohci_realize_pxa(DeviceState *dev, Error **errp)
> {
> OHCISysBusState *s = SYSBUS_OHCI(dev);
> + SysBusDevice *b = SYS_BUS_DEVICE(dev);
I stumbled over b not being very descriptive for SysBusDevice (I
would've expected d for ...Device). Seeing that PCIDevice *pd was used
elsewhere, I will adopt sbd here, as suggested by Peter C.
https://github.com/afaerber/qemu-cpu/commits/qom-next
Regards,
Andreas
>
> /* Cannot fail as we pass NULL for masterbus */
> - usb_ohci_init(&s->ohci, DEVICE(dev), s->num_ports, s->dma_offset, NULL,
> 0,
> + usb_ohci_init(&s->ohci, dev, s->num_ports, s->dma_offset, NULL, 0,
> &address_space_memory);
> - sysbus_init_irq(dev, &s->ohci.irq);
> - sysbus_init_mmio(dev, &s->ohci.mem);
> -
> - return 0;
> + sysbus_init_irq(b, &s->ohci.irq);
> + sysbus_init_mmio(b, &s->ohci.mem);
> }
>
> static Property ohci_pci_properties[] = {
> @@ -1930,9 +1929,8 @@ static Property ohci_sysbus_properties[] = {
> static void ohci_sysbus_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> - SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);
>
> - sbc->init = ohci_init_pxa;
> + dc->realize = ohci_realize_pxa;
> dc->desc = "OHCI USB Controller";
> dc->props = ohci_sysbus_properties;
> }
>
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
- [Qemu-devel] [PATCH v2 00/26] use realizefn for SysBusDevice, part 1, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 01/26] sysbus: document SysBusDeviceClass about @init, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 02/26] ohci: QOM'ify some more, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 03/26] ohci: use realize for ohci, Hu Tao, 2013/07/01
- Re: [Qemu-devel] [PATCH v2 03/26] ohci: use realize for ohci,
Andreas Färber <=
- [Qemu-devel] [PATCH v2 05/26] i440fx: use type-safe cast instead of directly access of parent dev, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 04/26] i440fx-pcihost: use realize for i440fx-pcihost, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 06/26] q35: use type-safe cast instead of directly access of parent dev, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 08/26] fdc: QOM'ify some more, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 07/26] q35: use realize for q35 host, Hu Tao, 2013/07/01
- [Qemu-devel] [PATCH v2 11/26] pflash_cfi01: use realize for pflash_cfi01, Hu Tao, 2013/07/01