[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 05/12] hw/sh4/sh_pci: Use DeviceState::realiz
From: |
Peter Maydell |
Subject: |
Re: [Qemu-devel] [PATCH v2 05/12] hw/sh4/sh_pci: Use DeviceState::realize rather than SysBusDevice::init |
Date: |
Fri, 5 Oct 2018 13:12:26 +0100 |
On 2 October 2018 at 22:25, Philippe Mathieu-Daudé <address@hidden> wrote:
> Move from the legacy SysBusDevice::init method to using DeviceState::realize.
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> hw/sh4/sh_pci.c | 20 +++++++++-----------
> 1 file changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c
> index 4ec2e35500..379d0685ed 100644
> --- a/hw/sh4/sh_pci.c
> +++ b/hw/sh4/sh_pci.c
> @@ -120,16 +120,15 @@ static void sh_pci_set_irq(void *opaque, int irq_num,
> int level)
> qemu_set_irq(pic[irq_num], level);
> }
>
> -static int sh_pci_device_init(SysBusDevice *dev)
> +static void sh_pci_device_realize(DeviceState *dev, Error **errp)
> {
> - PCIHostState *phb;
> - SHPCIState *s;
> + SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
> + SHPCIState *s = SH_PCI_HOST_BRIDGE(dev);
> + PCIHostState *phb = PCI_HOST_BRIDGE(s);
> int i;
>
> - s = SH_PCI_HOST_BRIDGE(dev);
> - phb = PCI_HOST_BRIDGE(s);
> for (i = 0; i < 4; i++) {
> - sysbus_init_irq(dev, &s->irq[i]);
> + sysbus_init_irq(sbd, &s->irq[i]);
> }
> phb->bus = pci_register_root_bus(DEVICE(dev), "pci",
> sh_pci_set_irq, sh_pci_map_irq,
> @@ -143,13 +142,12 @@ static int sh_pci_device_init(SysBusDevice *dev)
> &s->memconfig_p4, 0, 0x224);
> memory_region_init_alias(&s->isa, OBJECT(s), "sh_pci.isa",
> get_system_io(), 0, 0x40000);
> - sysbus_init_mmio(dev, &s->memconfig_p4);
> - sysbus_init_mmio(dev, &s->memconfig_a7);
> + sysbus_init_mmio(sbd, &s->memconfig_p4);
> + sysbus_init_mmio(sbd, &s->memconfig_a7);
> s->iobr = 0xfe240000;
> memory_region_add_subregion(get_system_memory(), s->iobr, &s->isa);
>
> s->dev = pci_create_simple(phb->bus, PCI_DEVFN(0, 0), "sh_pci_host");
> - return 0;
> }
>
> static void sh_pci_host_realize(PCIDevice *d, Error **errp)
> @@ -187,9 +185,9 @@ static const TypeInfo sh_pci_host_info = {
>
> static void sh_pci_device_class_init(ObjectClass *klass, void *data)
> {
> - SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
> + DeviceClass *dc = DEVICE_CLASS(klass);
>
> - sdc->init = sh_pci_device_init;
> + dc->realize = sh_pci_device_realize;
> }
>
> static const TypeInfo sh_pci_device_info = {
> --
Reviewed-by: Peter Maydell <address@hidden>
thanks
-- PMM
- [Qemu-devel] [PATCH v2 00/12] another SysBusDevice::init to Device::realize cleanup, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 01/12] trace-events: Fix copy/paste typo, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 03/12] hw/timer/sun4v-rtc: Use DeviceState::realize rather than SysBusDevice::init, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 04/12] hw/ssi/xilinx_spi: Use DeviceState::realize rather than SysBusDevice::init, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 02/12] hw/timer/sun4v-rtc: Convert from DPRINTF() macro to trace events, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 06/12] hw/pci-host/bonito: Use DeviceState::realize rather than SysBusDevice::init, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 05/12] hw/sh4/sh_pci: Use DeviceState::realize rather than SysBusDevice::init, Philippe Mathieu-Daudé, 2018/10/02
- Re: [Qemu-devel] [PATCH v2 05/12] hw/sh4/sh_pci: Use DeviceState::realize rather than SysBusDevice::init,
Peter Maydell <=
- [Qemu-devel] [PATCH v2 07/12] hw/mips/gt64xxx_pci: Convert gt64120_reset() function into Device reset method, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 08/12] hw/mips/gt64xxx_pci: Mark as bridge device, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 11/12] hw/hppa/dino: Remove unuseful code, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 12/12] hw/mips/malta: Remove unuseful code, Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 09/12] hw/sparc64/niagara: Model the I/O Bridge with the 'unimplemented_device', Philippe Mathieu-Daudé, 2018/10/02
- [Qemu-devel] [PATCH v2 10/12] hw/alpha/typhoon: Remove unuseful code, Philippe Mathieu-Daudé, 2018/10/02
- Re: [Qemu-devel] [PATCH v2 00/12] another SysBusDevice::init to Device::realize cleanup, Philippe Mathieu-Daudé, 2018/10/09