Misc macio clean ups
PATCH 1/4 hw/misc/macio: Avoid some QOM casts
In reply to BALATON ZoltanAt several places we already have the object pointer with the right type so we don't need to cast it back and forth. Avoiding these casts improves readability.
--- hw/misc/macio/macio.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
hw/misc/macio/macio.c +7 -7
@@ -220,11 +220,11 @@ static void macio_oldworld_init(Object *obj)DeviceState *dev;int i; -object_initialize_child (OBJECT (s),"pic" , &os->pic,TYPE_HEATHROW ); +object_initialize_child (obj,"pic" , &os->pic,TYPE_HEATHROW ); -object_initialize_child (OBJECT (s),"cuda" , &s->cuda,TYPE_CUDA ); +object_initialize_child (obj,"cuda" , &s->cuda,TYPE_CUDA ); -object_initialize_child (OBJECT (s),"nvram" , &os->nvram,TYPE_MACIO_NVRAM ); +object_initialize_child (obj,"nvram" , &os->nvram,TYPE_MACIO_NVRAM ); dev =DEVICE (&os->nvram);qdev_prop_set_uint32 (dev,"size" ,MACIO_NVRAM_SIZE );qdev_prop_set_uint32 (dev,"it_shift" ,4 );
@@ -372,9 +372,9 @@ static void macio_newworld_init(Object *obj)NewWorldMacIOState *ns =NEWWORLD_MACIO (obj);int i; -object_initialize_child (OBJECT (s),"pic" , &ns->pic,TYPE_OPENPIC ); +object_initialize_child (obj,"pic" , &ns->pic,TYPE_OPENPIC ); -object_initialize_child (OBJECT (s),"gpio" , &ns->gpio,TYPE_MACIO_GPIO ); +object_initialize_child (obj,"gpio" , &ns->gpio,TYPE_MACIO_GPIO );for (i =0 ; i <2 ; i++) {macio_init_ide (s, &ns->ide[i], i);
@@ -390,9 +390,9 @@ static void macio_instance_init(Object *obj)qbus_init (&s->macio_bus,sizeof (s->macio_bus),TYPE_MACIO_BUS ,DEVICE (obj),"macio.0" ); -object_initialize_child (OBJECT (s),"dbdma" , &s->dbdma,TYPE_MAC_DBDMA ); +object_initialize_child (obj,"dbdma" , &s->dbdma,TYPE_MAC_DBDMA ); -object_initialize_child (OBJECT (s),"escc" , &s->escc,TYPE_ESCC ); +object_initialize_child (obj,"escc" , &s->escc,TYPE_ESCC ); }static const VMStateDescription vmstate_macio_oldworld = {
Signature · 1 line
2.30.6
PATCH 3/4 hw/misc/macio: Remove some single use local variables
In reply to BALATON ZoltanDrop some local variables that could just be substituted at the single place they were used. This makes the code shorter and simpler.
--- hw/misc/macio/macio.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
hw/misc/macio/macio.c +5 -8
@@ -53,10 +53,8 @@*/ static void macio_escc_legacy_setup (MacIOState *s) { -ESCCState *escc =ESCC (&s->escc); -SysBusDevice *sbd =SYS_BUS_DEVICE (escc); +SysBusDevice *sbd =SYS_BUS_DEVICE (&s->escc);MemoryRegion *escc_legacy =g_new (MemoryRegion,1 ); -MemoryRegion *bar = &s->bar;int i;static const int maps[] = {0x00 ,0x00 ,/* Command B */
@@ -80,16 +78,15 @@ static void macio_escc_legacy_setup(MacIOState *s)memory_region_add_subregion (escc_legacy, maps[i], port); } -memory_region_add_subregion (bar,0x12000 , escc_legacy); +memory_region_add_subregion (&s->bar,0x12000 , escc_legacy); }static void macio_bar_setup (MacIOState *s) { -ESCCState *escc =ESCC (&s->escc); -SysBusDevice *sbd =SYS_BUS_DEVICE (escc); -MemoryRegion *bar = &s->bar; +SysBusDevice *sbd =SYS_BUS_DEVICE (&s->escc); +MemoryRegion *bar =sysbus_mmio_get_region (sbd,0 ); -memory_region_add_subregion (bar,0x13000 ,sysbus_mmio_get_region (sbd,0 )); +memory_region_add_subregion (&s->bar,0x13000 , bar);macio_escc_legacy_setup (s); }
Signature · 1 line
2.30.6
cover Misc macio clean ups
Just some small trivial clean ups that I've found while looking at hw/misc/macio/macio.c
Regards,
BALATON Zoltan
BALATON Zoltan (4):
hw/misc/macio: Avoid some QOM casts
hw/misc/macio: Rename sysbus_dev to sbd for consistency and brevity hw/misc/macio: Remove some single use local variables hw/misc/macio: Return bool from functions taking errp
hw/misc/macio/macio.c | 167 ++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 95 deletions(-)
Signature · 1 line
2.30.6
PATCH 2/4 hw/misc/macio: Rename sysbus_dev to sbd for consistency and brevity
Some functions use sysbus_dev while others sbd name for local variable storing a sysbus device pointer. Standardise on the shorter name to be consistent and make the code easier to read as short name is less distracting and needs less line breaks.
--- hw/misc/macio/macio.c | 78 +++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 43 deletions(-)
hw/misc/macio/macio.c +35 -43
@@ -96,14 +96,14 @@ static void macio_bar_setup(MacIOState *s)static void macio_common_realize (PCIDevice *d,Error **errp) {MacIOState *s =MACIO (d); -SysBusDevice *sysbus_dev; +SysBusDevice *sbd;if (!qdev_realize (DEVICE (&s->dbdma),BUS (&s->macio_bus), errp)) {return ; } - sysbus_dev =SYS_BUS_DEVICE (&s->dbdma); + sbd =SYS_BUS_DEVICE (&s->dbdma);memory_region_add_subregion (&s->bar,0x08000 , -sysbus_mmio_get_region (sysbus_dev,0 )); +sysbus_mmio_get_region (sbd,0 ));qdev_prop_set_uint32 (DEVICE (&s->escc),"disabled" ,0 );qdev_prop_set_uint32 (DEVICE (&s->escc),"frequency" ,ESCC_CLOCK );
@@ -122,11 +122,10 @@ static void macio_realize_ide(MacIOState *s, MACIOIDEState *ide, qemu_irq irq0, qemu_irq irq1, int dmaid, Error **errp) { - SysBusDevice *sysbus_dev; + SysBusDevice *sbd = SYS_BUS_DEVICE(ide); - sysbus_dev =SYS_BUS_DEVICE (ide); -sysbus_connect_irq (sysbus_dev,0 , irq0); -sysbus_connect_irq (sysbus_dev,1 , irq1); +sysbus_connect_irq (sbd,0 , irq0); +sysbus_connect_irq (sbd,1 , irq1);qdev_prop_set_uint32 (DEVICE (ide),"channel" , dmaid);object_property_set_link (OBJECT (ide),"dbdma" ,OBJECT (&s->dbdma), &error_abort);
@@ -141,7 +140,7 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp)OldWorldMacIOState *os =OLDWORLD_MACIO (d);DeviceState *pic_dev =DEVICE (&os->pic);Error *err =NULL ; -SysBusDevice *sysbus_dev; +SysBusDevice *sbd;macio_common_realize (d, &err);if (err) {
@@ -153,33 +152,30 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp)if (!qdev_realize (DEVICE (&os->pic),BUS (&s->macio_bus), errp)) {return ; } - sysbus_dev =SYS_BUS_DEVICE (&os->pic); + sbd =SYS_BUS_DEVICE (&os->pic);memory_region_add_subregion (&s->bar,0x0 , -sysbus_mmio_get_region (sysbus_dev,0 )); +sysbus_mmio_get_region (sbd,0 ));qdev_prop_set_uint64 (DEVICE (&s->cuda),"timebase-frequency" , s->frequency);if (!qdev_realize (DEVICE (&s->cuda),BUS (&s->macio_bus), errp)) {return ; } - sysbus_dev =SYS_BUS_DEVICE (&s->cuda); + sbd =SYS_BUS_DEVICE (&s->cuda);memory_region_add_subregion (&s->bar,0x16000 , -sysbus_mmio_get_region (sysbus_dev,0 )); -sysbus_connect_irq (sysbus_dev,0 ,qdev_get_gpio_in (pic_dev, -OLDWORLD_CUDA_IRQ )); +sysbus_mmio_get_region (sbd,0 )); +sysbus_connect_irq (sbd,0 ,qdev_get_gpio_in (pic_dev,OLDWORLD_CUDA_IRQ )); - sysbus_dev =SYS_BUS_DEVICE (&s->escc); -sysbus_connect_irq (sysbus_dev,0 ,qdev_get_gpio_in (pic_dev, -OLDWORLD_ESCCB_IRQ )); -sysbus_connect_irq (sysbus_dev,1 ,qdev_get_gpio_in (pic_dev, -OLDWORLD_ESCCA_IRQ )); + sbd =SYS_BUS_DEVICE (&s->escc); +sysbus_connect_irq (sbd,0 ,qdev_get_gpio_in (pic_dev,OLDWORLD_ESCCB_IRQ )); +sysbus_connect_irq (sbd,1 ,qdev_get_gpio_in (pic_dev,OLDWORLD_ESCCA_IRQ ));if (!qdev_realize (DEVICE (&os->nvram),BUS (&s->macio_bus), errp)) {return ; } - sysbus_dev =SYS_BUS_DEVICE (&os->nvram); + sbd =SYS_BUS_DEVICE (&os->nvram);memory_region_add_subregion (&s->bar,0x60000 , -sysbus_mmio_get_region (sysbus_dev,0 )); +sysbus_mmio_get_region (sbd,0 ));pmac_format_nvram_partition (&os->nvram, os->nvram.size);/* IDE buses */
@@ -274,7 +270,7 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)NewWorldMacIOState *ns =NEWWORLD_MACIO (d);DeviceState *pic_dev =DEVICE (&ns->pic);Error *err =NULL ; -SysBusDevice *sysbus_dev; +SysBusDevice *sbd;MemoryRegion *timer_memory =NULL ;macio_common_realize (d, &err);
@@ -285,16 +281,14 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)/* OpenPIC */ qdev_prop_set_uint32 (pic_dev,"model" ,OPENPIC_MODEL_KEYLARGO ); - sysbus_dev =SYS_BUS_DEVICE (&ns->pic); -sysbus_realize_and_unref (sysbus_dev, &error_fatal); + sbd =SYS_BUS_DEVICE (&ns->pic); +sysbus_realize_and_unref (sbd, &error_fatal);memory_region_add_subregion (&s->bar,0x40000 , -sysbus_mmio_get_region (sysbus_dev,0 )); +sysbus_mmio_get_region (sbd,0 )); - sysbus_dev =SYS_BUS_DEVICE (&s->escc); -sysbus_connect_irq (sysbus_dev,0 ,qdev_get_gpio_in (pic_dev, -NEWWORLD_ESCCB_IRQ )); -sysbus_connect_irq (sysbus_dev,1 ,qdev_get_gpio_in (pic_dev, -NEWWORLD_ESCCA_IRQ )); + sbd =SYS_BUS_DEVICE (&s->escc); +sysbus_connect_irq (sbd,0 ,qdev_get_gpio_in (pic_dev,NEWWORLD_ESCCB_IRQ )); +sysbus_connect_irq (sbd,1 ,qdev_get_gpio_in (pic_dev,NEWWORLD_ESCCA_IRQ ));/* IDE buses */ macio_realize_ide(s, &ns->ide[0],
@@ -326,27 +320,26 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)if (!qdev_realize (DEVICE (&ns->gpio),BUS (&s->macio_bus), errp)) {return ; } - sysbus_dev =SYS_BUS_DEVICE (&ns->gpio); -sysbus_connect_irq (sysbus_dev,1 ,qdev_get_gpio_in (pic_dev, + sbd =SYS_BUS_DEVICE (&ns->gpio); +sysbus_connect_irq (sbd,1 ,qdev_get_gpio_in (pic_dev,NEWWORLD_EXTING_GPIO1 )); -sysbus_connect_irq (sysbus_dev,9 ,qdev_get_gpio_in (pic_dev, +sysbus_connect_irq (sbd,9 ,qdev_get_gpio_in (pic_dev,NEWWORLD_EXTING_GPIO9 ));memory_region_add_subregion (&s->bar,0x50 , -sysbus_mmio_get_region (sysbus_dev,0 )); +sysbus_mmio_get_region (sbd,0 ));/* PMU */ object_initialize_child (OBJECT (s),"pmu" , &s->pmu,TYPE_VIA_PMU ); -object_property_set_link (OBJECT (&s->pmu),"gpio" ,OBJECT (sysbus_dev), +object_property_set_link (OBJECT (&s->pmu),"gpio" ,OBJECT (sbd), &error_abort);qdev_prop_set_bit (DEVICE (&s->pmu),"has-adb" , ns->has_adb);if (!qdev_realize (DEVICE (&s->pmu),BUS (&s->macio_bus), errp)) {return ; } - sysbus_dev =SYS_BUS_DEVICE (&s->pmu); -sysbus_connect_irq (sysbus_dev,0 ,qdev_get_gpio_in (pic_dev, -NEWWORLD_PMU_IRQ )); + sbd =SYS_BUS_DEVICE (&s->pmu); +sysbus_connect_irq (sbd,0 ,qdev_get_gpio_in (pic_dev,NEWWORLD_PMU_IRQ ));memory_region_add_subregion (&s->bar,0x16000 , -sysbus_mmio_get_region (sysbus_dev,0 )); +sysbus_mmio_get_region (sbd,0 )); }else {object_unparent (OBJECT (&ns->gpio));
@@ -358,11 +351,10 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)if (!qdev_realize (DEVICE (&s->cuda),BUS (&s->macio_bus), errp)) {return ; } - sysbus_dev =SYS_BUS_DEVICE (&s->cuda); -sysbus_connect_irq (sysbus_dev,0 ,qdev_get_gpio_in (pic_dev, -NEWWORLD_CUDA_IRQ )); + sbd =SYS_BUS_DEVICE (&s->cuda); +sysbus_connect_irq (sbd,0 ,qdev_get_gpio_in (pic_dev,NEWWORLD_CUDA_IRQ ));memory_region_add_subregion (&s->bar,0x16000 , -sysbus_mmio_get_region (sysbus_dev,0 )); +sysbus_mmio_get_region (sbd,0 )); } }
Signature · 1 line
2.30.6
PATCH 4/4 hw/misc/macio: Return bool from functions taking errp
In reply to BALATON ZoltanUse the convention to return bool from functions which take an error pointer which allows for callers to pass through their error pointer without needing a local.
--- hw/misc/macio/macio.c | 62 +++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 37 deletions(-)
hw/misc/macio/macio.c +25 -37
@@ -90,13 +90,13 @@ static void macio_bar_setup(MacIOState *s)macio_escc_legacy_setup (s); } -static void macio_common_realize (PCIDevice *d,Error **errp) +static bool macio_common_realize (PCIDevice *d,Error **errp) {MacIOState *s =MACIO (d);SysBusDevice *sbd;if (!qdev_realize (DEVICE (&s->dbdma),BUS (&s->macio_bus), errp)) { -return ; +return false; } sbd =SYS_BUS_DEVICE (&s->dbdma); memory_region_add_subregion(&s->bar, 0x08000,
@@ -108,14 +108,16 @@ static void macio_common_realize(PCIDevice *d, Error **errp)qdev_prop_set_uint32 (DEVICE (&s->escc),"chnBtype" , escc_serial);qdev_prop_set_uint32 (DEVICE (&s->escc),"chnAtype" , escc_serial);if (!qdev_realize (DEVICE (&s->escc),BUS (&s->macio_bus), errp)) { -return ; +return false; }macio_bar_setup (s);pci_register_bar (d,0 ,PCI_BASE_ADDRESS_SPACE_MEMORY , &s->bar); + +return true; } -static void macio_realize_ide (MacIOState *s,MACIOIDEState *ide, +static bool macio_realize_ide (MacIOState *s,MACIOIDEState *ide,qemu_irq irq0,qemu_irq irq1,int dmaid,Error **errp) {
@@ -128,7 +130,7 @@ static void macio_realize_ide(MacIOState *s, MACIOIDEState *ide, &error_abort);macio_ide_register_dma (ide); -qdev_realize (DEVICE (ide),BUS (&s->macio_bus), errp); +return qdev_realize (DEVICE (ide),BUS (&s->macio_bus), errp); }static void macio_oldworld_realize (PCIDevice *d,Error **errp)
@@ -136,12 +138,9 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp)MacIOState *s =MACIO (d);OldWorldMacIOState *os =OLDWORLD_MACIO (d);DeviceState *pic_dev =DEVICE (&os->pic); -Error *err =NULL ;SysBusDevice *sbd; -macio_common_realize (d, &err); -if (err) { -error_propagate (errp, err); +if (!macio_common_realize (d, errp)) {return ; }
@@ -176,21 +175,17 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp)pmac_format_nvram_partition (&os->nvram, os->nvram.size);/* IDE buses */ -macio_realize_ide (s, &os->ide[0 ], -qdev_get_gpio_in (pic_dev,OLDWORLD_IDE0_IRQ ), -qdev_get_gpio_in (pic_dev,OLDWORLD_IDE0_DMA_IRQ ), -0x16 , &err); -if (err) { -error_propagate (errp, err); +if (!macio_realize_ide (s, &os->ide[0 ], +qdev_get_gpio_in (pic_dev,OLDWORLD_IDE0_IRQ ), +qdev_get_gpio_in (pic_dev,OLDWORLD_IDE0_DMA_IRQ ), +0x16 , errp)) {return ; } -macio_realize_ide (s, &os->ide[1 ], -qdev_get_gpio_in (pic_dev,OLDWORLD_IDE1_IRQ ), -qdev_get_gpio_in (pic_dev,OLDWORLD_IDE1_DMA_IRQ ), -0x1a , &err); -if (err) { -error_propagate (errp, err); +if (!macio_realize_ide (s, &os->ide[1 ], +qdev_get_gpio_in (pic_dev,OLDWORLD_IDE1_IRQ ), +qdev_get_gpio_in (pic_dev,OLDWORLD_IDE1_DMA_IRQ ), +0x1a , errp)) {return ; } }
@@ -266,13 +261,10 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)MacIOState *s =MACIO (d);NewWorldMacIOState *ns =NEWWORLD_MACIO (d);DeviceState *pic_dev =DEVICE (&ns->pic); -Error *err =NULL ;SysBusDevice *sbd;MemoryRegion *timer_memory =NULL ; -macio_common_realize (d, &err); -if (err) { -error_propagate (errp, err); +if (!macio_common_realize (d, errp)) {return ; }
@@ -288,21 +280,17 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)sysbus_connect_irq (sbd,1 ,qdev_get_gpio_in (pic_dev,NEWWORLD_ESCCA_IRQ ));/* IDE buses */ -macio_realize_ide (s, &ns->ide[0 ], -qdev_get_gpio_in (pic_dev,NEWWORLD_IDE0_IRQ ), -qdev_get_gpio_in (pic_dev,NEWWORLD_IDE0_DMA_IRQ ), -0x16 , &err); -if (err) { -error_propagate (errp, err); +if (!macio_realize_ide (s, &ns->ide[0 ], +qdev_get_gpio_in (pic_dev,NEWWORLD_IDE0_IRQ ), +qdev_get_gpio_in (pic_dev,NEWWORLD_IDE0_DMA_IRQ ), +0x16 , errp)) {return ; } -macio_realize_ide (s, &ns->ide[1 ], -qdev_get_gpio_in (pic_dev,NEWWORLD_IDE1_IRQ ), -qdev_get_gpio_in (pic_dev,NEWWORLD_IDE1_DMA_IRQ ), -0x1a , &err); -if (err) { -error_propagate (errp, err); +if (!macio_realize_ide (s, &ns->ide[1 ], +qdev_get_gpio_in (pic_dev,NEWWORLD_IDE1_IRQ ), +qdev_get_gpio_in (pic_dev,NEWWORLD_IDE1_DMA_IRQ ), +0x1a , errp)) {return ; }
Signature · 1 line
2.30.6
Re: [PATCH 1/4] hw/misc/macio: Avoid some QOM casts
In reply to BALATON ZoltanQuoted 8 lines · BALATON Zoltan
At several places we already have the object pointer with the right type so we don't need to cast it back and forth. Avoiding these casts improves readability.
Signed-off-by BALATON Zoltan <[email protected]>--- hw/misc/macio/macio.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
Re: [PATCH 2/4] hw/misc/macio: Rename sysbus_dev to sbd for consistency and brevity
In reply to BALATON ZoltanQuoted 9 lines · BALATON Zoltan
Some functions use
sysbus_devwhile others sbd name for local variable storing a sysbus device pointer. Standardise on the shorter name to be consistent and make the code easier to read as short name is less distracting and needs less line breaks.Signed-off-by BALATON Zoltan <[email protected]>--- hw/misc/macio/macio.c | 78 +++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 43 deletions(-)
Re: [PATCH 3/4] hw/misc/macio: Remove some single use local variables
In reply to BALATON ZoltanQuoted 7 lines · BALATON Zoltan
Drop some local variables that could just be substituted at the single place they were used. This makes the code shorter and simpler.
Signed-off-by BALATON Zoltan <[email protected]>--- hw/misc/macio/macio.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
Re: [PATCH 4/4] hw/misc/macio: Return bool from functions taking errp
In reply to BALATON ZoltanQuoted 8 lines · BALATON Zoltan
Use the convention to return bool from functions which take an error pointer which allows for callers to pass through their error pointer without needing a local.
Signed-off-by BALATON Zoltan <[email protected]>--- hw/misc/macio/macio.c | 62 +++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 37 deletions(-)
Re: [PATCH 1/4] hw/misc/macio: Avoid some QOM casts
In reply to BALATON ZoltanQuoted 42 lines · BALATON Zoltan
At several places we already have the object pointer with the right type so we don't need to cast it back and forth. Avoiding these casts improves readability.
Signed-off-by BALATON Zoltan <[email protected]>--- hw/misc/macio/macio.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)hw/misc/macio/macio.c +5
-5@@ -220,11 +220,11 @@ static void macio_oldworld_init(Object *obj)DeviceState *dev;int i; -object_initialize_child (OBJECT (s),"pic" , &os->pic,TYPE_HEATHROW ); +object_initialize_child (obj,"pic" , &os->pic,TYPE_HEATHROW ); -object_initialize_child (OBJECT (s),"cuda" , &s->cuda,TYPE_CUDA ); +object_initialize_child (obj,"cuda" , &s->cuda,TYPE_CUDA ); -object_initialize_child (OBJECT (s),"nvram" , &os->nvram,TYPE_MACIO_NVRAM ); +object_initialize_child (obj,"nvram" , &os->nvram,TYPE_MACIO_NVRAM ); dev =DEVICE (&os->nvram);qdev_prop_set_uint32 (dev,"size" ,MACIO_NVRAM_SIZE );qdev_prop_set_uint32 (dev,"it_shift" ,4 );@@ -372,9 +372,9 @@ static void macio_newworld_init(Object *obj)NewWorldMacIOState *ns =NEWWORLD_MACIO (obj);int i; -object_initialize_child (OBJECT (s),"pic" , &ns->pic,TYPE_OPENPIC ); +object_initialize_child (obj,"pic" , &ns->pic,TYPE_OPENPIC ); -object_initialize_child (OBJECT (s),"gpio" , &ns->gpio,TYPE_MACIO_GPIO ); +object_initialize_child (obj,"gpio" , &ns->gpio,TYPE_MACIO_GPIO );for (i =0 ; i <2 ; i++) {macio_init_ide (s, &ns->ide[i], i);@@ -390,9 +390,9 @@ static void macio_instance_init(Object *obj) qbus_init(&s->macio_bus, sizeof(s->macio_bus), TYPE_MACIO_BUS,
hw/misc/macio/macio.c static void macio_instance_init(Object *obj) · line 398
Quoted 10 lines
hw/misc/macio/macio.c +2
-2DEVICE(obj), "macio.0"); -object_initialize_child (OBJECT (s),"dbdma" , &s->dbdma,TYPE_MAC_DBDMA ); +object_initialize_child (obj,"dbdma" , &s->dbdma,TYPE_MAC_DBDMA ); -object_initialize_child (OBJECT (s),"escc" , &s->escc,TYPE_ESCC ); +object_initialize_child (obj,"escc" , &s->escc,TYPE_ESCC ); }static const VMStateDescription vmstate_macio_oldworld = {
ATB,
Mark.
Re: [PATCH 2/4] hw/misc/macio: Rename sysbus_dev to sbd for consistency and brevity
In reply to BALATON ZoltanQuoted 172 lines · BALATON Zoltan
Some functions use
sysbus_devwhile others sbd name for local variable storing a sysbus device pointer. Standardise on the shorter name to be consistent and make the code easier to read as short name is less distracting and needs less line breaks.Signed-off-by BALATON Zoltan <[email protected]>--- hw/misc/macio/macio.c | 78 +++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 43 deletions(-)hw/misc/macio/macio.c +32
-39@@ -96,14 +96,14 @@ static void macio_bar_setup(MacIOState *s)static void macio_common_realize (PCIDevice *d,Error **errp) {MacIOState *s =MACIO (d); -SysBusDevice *sysbus_dev; +SysBusDevice *sbd;if (!qdev_realize (DEVICE (&s->dbdma),BUS (&s->macio_bus), errp)) {return ; } - sysbus_dev =SYS_BUS_DEVICE (&s->dbdma); + sbd =SYS_BUS_DEVICE (&s->dbdma);memory_region_add_subregion (&s->bar,0x08000 , -sysbus_mmio_get_region (sysbus_dev,0 )); +sysbus_mmio_get_region (sbd,0 ));qdev_prop_set_uint32 (DEVICE (&s->escc),"disabled" ,0 );qdev_prop_set_uint32 (DEVICE (&s->escc),"frequency" ,ESCC_CLOCK );@@ -122,11 +122,10 @@ static void macio_realize_ide(MacIOState *s, MACIOIDEState *ide, qemu_irq irq0, qemu_irq irq1, int dmaid, Error **errp) { - SysBusDevice *sysbus_dev; + SysBusDevice *sbd = SYS_BUS_DEVICE(ide); - sysbus_dev =SYS_BUS_DEVICE (ide); -sysbus_connect_irq (sysbus_dev,0 , irq0); -sysbus_connect_irq (sysbus_dev,1 , irq1); +sysbus_connect_irq (sbd,0 , irq0); +sysbus_connect_irq (sbd,1 , irq1);qdev_prop_set_uint32 (DEVICE (ide),"channel" , dmaid);object_property_set_link (OBJECT (ide),"dbdma" ,OBJECT (&s->dbdma), &error_abort);@@ -141,7 +140,7 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp)OldWorldMacIOState *os =OLDWORLD_MACIO (d);DeviceState *pic_dev =DEVICE (&os->pic);Error *err =NULL ; -SysBusDevice *sysbus_dev; +SysBusDevice *sbd;macio_common_realize (d, &err);if (err) {@@ -153,33 +152,30 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp)if (!qdev_realize (DEVICE (&os->pic),BUS (&s->macio_bus), errp)) {return ; } - sysbus_dev =SYS_BUS_DEVICE (&os->pic); + sbd =SYS_BUS_DEVICE (&os->pic);memory_region_add_subregion (&s->bar,0x0 , -sysbus_mmio_get_region (sysbus_dev,0 )); +sysbus_mmio_get_region (sbd,0 ));qdev_prop_set_uint64 (DEVICE (&s->cuda),"timebase-frequency" , s->frequency);if (!qdev_realize (DEVICE (&s->cuda),BUS (&s->macio_bus), errp)) {return ; } - sysbus_dev =SYS_BUS_DEVICE (&s->cuda); + sbd =SYS_BUS_DEVICE (&s->cuda);memory_region_add_subregion (&s->bar,0x16000 , -sysbus_mmio_get_region (sysbus_dev,0 )); -sysbus_connect_irq (sysbus_dev,0 ,qdev_get_gpio_in (pic_dev, -OLDWORLD_CUDA_IRQ )); +sysbus_mmio_get_region (sbd,0 )); +sysbus_connect_irq (sbd,0 ,qdev_get_gpio_in (pic_dev,OLDWORLD_CUDA_IRQ )); - sysbus_dev =SYS_BUS_DEVICE (&s->escc); -sysbus_connect_irq (sysbus_dev,0 ,qdev_get_gpio_in (pic_dev, -OLDWORLD_ESCCB_IRQ )); -sysbus_connect_irq (sysbus_dev,1 ,qdev_get_gpio_in (pic_dev, -OLDWORLD_ESCCA_IRQ )); + sbd =SYS_BUS_DEVICE (&s->escc); +sysbus_connect_irq (sbd,0 ,qdev_get_gpio_in (pic_dev,OLDWORLD_ESCCB_IRQ )); +sysbus_connect_irq (sbd,1 ,qdev_get_gpio_in (pic_dev,OLDWORLD_ESCCA_IRQ ));if (!qdev_realize (DEVICE (&os->nvram),BUS (&s->macio_bus), errp)) {return ; } - sysbus_dev =SYS_BUS_DEVICE (&os->nvram); + sbd =SYS_BUS_DEVICE (&os->nvram);memory_region_add_subregion (&s->bar,0x60000 , -sysbus_mmio_get_region (sysbus_dev,0 )); +sysbus_mmio_get_region (sbd,0 ));pmac_format_nvram_partition (&os->nvram, os->nvram.size);/* IDE buses */ @@ -274,7 +270,7 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)NewWorldMacIOState *ns =NEWWORLD_MACIO (d);DeviceState *pic_dev =DEVICE (&ns->pic);Error *err =NULL ; -SysBusDevice *sysbus_dev; +SysBusDevice *sbd;MemoryRegion *timer_memory =NULL ;macio_common_realize (d, &err);@@ -285,16 +281,14 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)/* OpenPIC */ qdev_prop_set_uint32 (pic_dev,"model" ,OPENPIC_MODEL_KEYLARGO ); - sysbus_dev =SYS_BUS_DEVICE (&ns->pic); -sysbus_realize_and_unref (sysbus_dev, &error_fatal); + sbd =SYS_BUS_DEVICE (&ns->pic); +sysbus_realize_and_unref (sbd, &error_fatal);memory_region_add_subregion (&s->bar,0x40000 , -sysbus_mmio_get_region (sysbus_dev,0 )); +sysbus_mmio_get_region (sbd,0 )); - sysbus_dev =SYS_BUS_DEVICE (&s->escc); -sysbus_connect_irq (sysbus_dev,0 ,qdev_get_gpio_in (pic_dev, -NEWWORLD_ESCCB_IRQ )); -sysbus_connect_irq (sysbus_dev,1 ,qdev_get_gpio_in (pic_dev, -NEWWORLD_ESCCA_IRQ )); + sbd =SYS_BUS_DEVICE (&s->escc); +sysbus_connect_irq (sbd,0 ,qdev_get_gpio_in (pic_dev,NEWWORLD_ESCCB_IRQ )); +sysbus_connect_irq (sbd,1 ,qdev_get_gpio_in (pic_dev,NEWWORLD_ESCCA_IRQ ));/* IDE buses */ macio_realize_ide(s, &ns->ide[0],@@ -326,27 +320,26 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)if (!qdev_realize (DEVICE (&ns->gpio),BUS (&s->macio_bus), errp)) {return ; } - sysbus_dev =SYS_BUS_DEVICE (&ns->gpio); -sysbus_connect_irq (sysbus_dev,1 ,qdev_get_gpio_in (pic_dev, + sbd =SYS_BUS_DEVICE (&ns->gpio); +sysbus_connect_irq (sbd,1 ,qdev_get_gpio_in (pic_dev,NEWWORLD_EXTING_GPIO1 )); -sysbus_connect_irq (sysbus_dev,9 ,qdev_get_gpio_in (pic_dev, +sysbus_connect_irq (sbd,9 ,qdev_get_gpio_in (pic_dev,NEWWORLD_EXTING_GPIO9 ));memory_region_add_subregion (&s->bar,0x50 , -sysbus_mmio_get_region (sysbus_dev,0 )); +sysbus_mmio_get_region (sbd,0 ));/* PMU */ object_initialize_child (OBJECT (s),"pmu" , &s->pmu,TYPE_VIA_PMU ); -object_property_set_link (OBJECT (&s->pmu),"gpio" ,OBJECT (sysbus_dev), +object_property_set_link (OBJECT (&s->pmu),"gpio" ,OBJECT (sbd), &error_abort);qdev_prop_set_bit (DEVICE (&s->pmu),"has-adb" , ns->has_adb);if (!qdev_realize (DEVICE (&s->pmu),BUS (&s->macio_bus), errp)) {return ; } - sysbus_dev =SYS_BUS_DEVICE (&s->pmu); -sysbus_connect_irq (sysbus_dev,0 ,qdev_get_gpio_in (pic_dev, -NEWWORLD_PMU_IRQ )); + sbd =SYS_BUS_DEVICE (&s->pmu); +sysbus_connect_irq (sbd,0 ,qdev_get_gpio_in (pic_dev,NEWWORLD_PMU_IRQ ));memory_region_add_subregion (&s->bar,0x16000 , -sysbus_mmio_get_region (sysbus_dev,0 )); +sysbus_mmio_get_region (sbd,0 )); }else {object_unparent (OBJECT (&ns->gpio));@@ -358,11 +351,10 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)if (!qdev_realize (DEVICE (&s->cuda),BUS (&s->macio_bus), errp)) {return ; }
hw/misc/macio/macio.c static void macio_newworld_realize(PCIDevice *d, Error **errp) · line 359
Quoted 10 lines
hw/misc/macio/macio.c +3
-4- sysbus_dev =SYS_BUS_DEVICE (&s->cuda); -sysbus_connect_irq (sysbus_dev,0 ,qdev_get_gpio_in (pic_dev, -NEWWORLD_CUDA_IRQ )); + sbd =SYS_BUS_DEVICE (&s->cuda); +sysbus_connect_irq (sbd,0 ,qdev_get_gpio_in (pic_dev,NEWWORLD_CUDA_IRQ ));memory_region_add_subregion (&s->bar,0x16000 , -sysbus_mmio_get_region (sysbus_dev,0 )); +sysbus_mmio_get_region (sbd,0 )); } }
ATB,
Mark.
Re: [PATCH 3/4] hw/misc/macio: Remove some single use local variables
In reply to BALATON ZoltanQuoted 34 lines · BALATON Zoltan
Drop some local variables that could just be substituted at the single place they were used. This makes the code shorter and simpler.
Signed-off-by BALATON Zoltan <[email protected]>--- hw/misc/macio/macio.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)hw/misc/macio/macio.c +2
-4@@ -53,10 +53,8 @@*/ static void macio_escc_legacy_setup (MacIOState *s) { -ESCCState *escc =ESCC (&s->escc); -SysBusDevice *sbd =SYS_BUS_DEVICE (escc); +SysBusDevice *sbd =SYS_BUS_DEVICE (&s->escc);MemoryRegion *escc_legacy =g_new (MemoryRegion,1 ); -MemoryRegion *bar = &s->bar;int i;static const int maps[] = {0x00 ,0x00 ,/* Command B */ @@ -80,16 +78,15 @@ static void macio_escc_legacy_setup(MacIOState *s)memory_region_add_subregion (escc_legacy, maps[i], port); } -memory_region_add_subregion (bar,0x12000 , escc_legacy); +memory_region_add_subregion (&s->bar,0x12000 , escc_legacy); }static void macio_bar_setup (MacIOState *s) {
hw/misc/macio/macio.c static void macio_escc_legacy_setup(MacIOState *s) · line 91
Quoted 10 lines
hw/misc/macio/macio.c +3
-4-ESCCState *escc =ESCC (&s->escc); -SysBusDevice *sbd =SYS_BUS_DEVICE (escc); -MemoryRegion *bar = &s->bar; +SysBusDevice *sbd =SYS_BUS_DEVICE (&s->escc); +MemoryRegion *bar =sysbus_mmio_get_region (sbd,0 ); -memory_region_add_subregion (bar,0x13000 ,sysbus_mmio_get_region (sbd,0 )); +memory_region_add_subregion (&s->bar,0x13000 , bar);macio_escc_legacy_setup (s); }
ATB,
Mark.
Re: [PATCH 4/4] hw/misc/macio: Return bool from functions taking errp
In reply to BALATON ZoltanQuoted 135 lines · BALATON Zoltan
Use the convention to return bool from functions which take an error pointer which allows for callers to pass through their error pointer without needing a local.
Signed-off-by BALATON Zoltan <[email protected]>--- hw/misc/macio/macio.c | 62 +++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 37 deletions(-)hw/misc/macio/macio.c +21
-33@@ -90,13 +90,13 @@ static void macio_bar_setup(MacIOState *s)macio_escc_legacy_setup (s); } -static void macio_common_realize (PCIDevice *d,Error **errp) +static bool macio_common_realize (PCIDevice *d,Error **errp) {MacIOState *s =MACIO (d);SysBusDevice *sbd;if (!qdev_realize (DEVICE (&s->dbdma),BUS (&s->macio_bus), errp)) { -return ; +return false; } sbd =SYS_BUS_DEVICE (&s->dbdma); memory_region_add_subregion(&s->bar, 0x08000,@@ -108,14 +108,16 @@ static void macio_common_realize(PCIDevice *d, Error **errp)qdev_prop_set_uint32 (DEVICE (&s->escc),"chnBtype" , escc_serial);qdev_prop_set_uint32 (DEVICE (&s->escc),"chnAtype" , escc_serial);if (!qdev_realize (DEVICE (&s->escc),BUS (&s->macio_bus), errp)) { -return ; +return false; }macio_bar_setup (s);pci_register_bar (d,0 ,PCI_BASE_ADDRESS_SPACE_MEMORY , &s->bar); + +return true; } -static void macio_realize_ide (MacIOState *s,MACIOIDEState *ide, +static bool macio_realize_ide (MacIOState *s,MACIOIDEState *ide,qemu_irq irq0,qemu_irq irq1,int dmaid,Error **errp) {@@ -128,7 +130,7 @@ static void macio_realize_ide(MacIOState *s, MACIOIDEState *ide, &error_abort);macio_ide_register_dma (ide); -qdev_realize (DEVICE (ide),BUS (&s->macio_bus), errp); +return qdev_realize (DEVICE (ide),BUS (&s->macio_bus), errp); }static void macio_oldworld_realize (PCIDevice *d,Error **errp)@@ -136,12 +138,9 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp)MacIOState *s =MACIO (d);OldWorldMacIOState *os =OLDWORLD_MACIO (d);DeviceState *pic_dev =DEVICE (&os->pic); -Error *err =NULL ;SysBusDevice *sbd; -macio_common_realize (d, &err); -if (err) { -error_propagate (errp, err); +if (!macio_common_realize (d, errp)) {return ; }@@ -176,21 +175,17 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp)pmac_format_nvram_partition (&os->nvram, os->nvram.size);/* IDE buses */ -macio_realize_ide (s, &os->ide[0 ], -qdev_get_gpio_in (pic_dev,OLDWORLD_IDE0_IRQ ), -qdev_get_gpio_in (pic_dev,OLDWORLD_IDE0_DMA_IRQ ), -0x16 , &err); -if (err) { -error_propagate (errp, err); +if (!macio_realize_ide (s, &os->ide[0 ], +qdev_get_gpio_in (pic_dev,OLDWORLD_IDE0_IRQ ), +qdev_get_gpio_in (pic_dev,OLDWORLD_IDE0_DMA_IRQ ), +0x16 , errp)) {return ; } -macio_realize_ide (s, &os->ide[1 ], -qdev_get_gpio_in (pic_dev,OLDWORLD_IDE1_IRQ ), -qdev_get_gpio_in (pic_dev,OLDWORLD_IDE1_DMA_IRQ ), -0x1a , &err); -if (err) { -error_propagate (errp, err); +if (!macio_realize_ide (s, &os->ide[1 ], +qdev_get_gpio_in (pic_dev,OLDWORLD_IDE1_IRQ ), +qdev_get_gpio_in (pic_dev,OLDWORLD_IDE1_DMA_IRQ ), +0x1a , errp)) {return ; } }@@ -266,13 +261,10 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)MacIOState *s =MACIO (d);NewWorldMacIOState *ns =NEWWORLD_MACIO (d);DeviceState *pic_dev =DEVICE (&ns->pic); -Error *err =NULL ;SysBusDevice *sbd;MemoryRegion *timer_memory =NULL ; -macio_common_realize (d, &err); -if (err) { -error_propagate (errp, err); +if (!macio_common_realize (d, errp)) {return ; }@@ -288,21 +280,17 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp)sysbus_connect_irq (sbd,1 ,qdev_get_gpio_in (pic_dev,NEWWORLD_ESCCA_IRQ ));/* IDE buses */ -macio_realize_ide (s, &ns->ide[0 ], -qdev_get_gpio_in (pic_dev,NEWWORLD_IDE0_IRQ ), -qdev_get_gpio_in (pic_dev,NEWWORLD_IDE0_DMA_IRQ ), -0x16 , &err); -if (err) { -error_propagate (errp, err); +if (!macio_realize_ide (s, &ns->ide[0 ], +qdev_get_gpio_in (pic_dev,NEWWORLD_IDE0_IRQ ), +qdev_get_gpio_in (pic_dev,NEWWORLD_IDE0_DMA_IRQ ), +0x16 , errp)) {return ; } - macio_realize_ide(s, &ns->ide[1], - qdev_get_gpio_in(pic_dev, NEWWORLD_IDE1_IRQ),
hw/misc/macio/macio.c static void macio_newworld_realize(PCIDevice *d, Error **errp) · line 295
Quoted 10 lines
hw/misc/macio/macio.c +4
-4-qdev_get_gpio_in (pic_dev,NEWWORLD_IDE1_DMA_IRQ ), - 0x1a, &err); -if (err) { -error_propagate (errp, err); +if (!macio_realize_ide (s, &ns->ide[1 ], +qdev_get_gpio_in (pic_dev,NEWWORLD_IDE1_IRQ ), +qdev_get_gpio_in (pic_dev,NEWWORLD_IDE1_DMA_IRQ ), +0x1a , errp)) {return ; }
These days you would move macio_common_realize() into TYPE_MACIO, but anyway:
ATB,
Mark.
Quoted 6 lines · BALATON Zoltan
Just some small trivial clean ups that I've found while looking at
hw/misc/macio/macio.cRegards,
BALATON Zoltan
Quoted 8 lines
BALATON Zoltan (4):
hw/misc/macio: Avoid some QOM casts
hw/misc/macio: Renamesysbus_devto sbd for consistency and brevity hw/misc/macio: Remove some single use local variables hw/misc/macio: Return bool from functions taking errphw/misc/macio/macio.c | 167 ++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 95 deletions(-)
Thanks, I've applied these to my qemu-macppc branch.
ATB,
Mark.
Re: [PATCH 4/4] hw/misc/macio: Return bool from functions taking errp
In reply to Mark Cave-AylandQuoted 137 lines · Mark Cave-Ayland
Quoted 136 lines · BALATON Zoltan
Use the convention to return bool from functions which take an error pointer which allows for callers to pass through their error pointer without needing a local.
Signed-off-by BALATON Zoltan <[email protected]>--- hw/misc/macio/macio.c | 62 +++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 37 deletions(-)hw/misc/macio/macio.c +8
-5@@ -90,13 +90,13 @@ static void macio_bar_setup(MacIOState *s)macio_escc_legacy_setup (s); } -static void macio_common_realize(PCIDevice *d, Error **errp) +static bool macio_common_realize(PCIDevice *d, Error **errp) {MacIOState *s =MACIO (d);SysBusDevice *sbd;if (!qdev_realize (DEVICE (&s->dbdma),BUS (&s->macio_bus), errp)) { -return ; +return false; } sbd =SYS_BUS_DEVICE (&s->dbdma); memory_region_add_subregion(&s->bar, 0x08000,@@ -108,14 +108,16 @@ static void macio_common_realize(PCIDevice *d, Error **errp)qdev_prop_set_uint32 (DEVICE (&s->escc),"chnBtype" , escc_serial);qdev_prop_set_uint32 (DEVICE (&s->escc),"chnAtype" , escc_serial);if (!qdev_realize (DEVICE (&s->escc),BUS (&s->macio_bus), errp)) { -return ; +return false; }macio_bar_setup (s);pci_register_bar (d,0 ,PCI_BASE_ADDRESS_SPACE_MEMORY , &s->bar); + +return true; } -static void macio_realize_ide(MacIOState *s, MACIOIDEState *ide, +static bool macio_realize_ide (MacIOState *s,MACIOIDEState *ide,qemu_irq irq0,qemu_irq irq1,int dmaid, Error **errp) {@@ -128,7 +130,7 @@ static void macio_realize_ide(MacIOState *s, MACIOIDEState *ide, &error_abort);macio_ide_register_dma (ide); -qdev_realize (DEVICE (ide),BUS (&s->macio_bus), errp); +return qdev_realize (DEVICE (ide),BUS (&s->macio_bus), errp); }static void macio_oldworld_realize (PCIDevice *d,Error **errp)@@ -136,12 +138,9 @@ static void macio_oldworld_realize(PCIDevice *d, Error **errp)MacIOState *s =MACIO (d);OldWorldMacIOState *os =OLDWORLD_MACIO (d);DeviceState *pic_dev =DEVICE (&os->pic); -Error *err =NULL ;SysBusDevice *sbd; -macio_common_realize (d, &err); -if (err) { -error_propagate (errp, err); +if (!macio_common_realize (d, errp)) {return ; } @@ -176,21 +175,17 @@ static void macio_oldworld_realize(PCIDevice *d,Error **errp)
pmac_format_nvram_partition(&os->nvram, os->nvram.size); /* IDE buses */hw/misc/macio/macio.c +3
-6-macio_realize_ide (s, &os->ide[0 ], -qdev_get_gpio_in (pic_dev,OLDWORLD_IDE0_IRQ ), -qdev_get_gpio_in (pic_dev,OLDWORLD_IDE0_DMA_IRQ ), -0x16 , &err); -if (err) { -error_propagate (errp, err); + if (!macio_realize_ide(s, &os->ide[0], + qdev_get_gpio_in(pic_dev, OLDWORLD_IDE0_IRQ), + qdev_get_gpio_in(pic_dev,
OLDWORLD_IDE0_DMA_IRQ),hw/misc/macio/macio.c +4
-5+ 0x16, errp)) {return ; } - macio_realize_ide(s, &os->ide[1], -qdev_get_gpio_in (pic_dev,OLDWORLD_IDE1_IRQ ), -qdev_get_gpio_in (pic_dev,OLDWORLD_IDE1_DMA_IRQ ), -0x1a , &err); -if (err) { -error_propagate (errp, err); + if (!macio_realize_ide(s, &os->ide[1], + qdev_get_gpio_in(pic_dev, OLDWORLD_IDE1_IRQ), + qdev_get_gpio_in(pic_dev,
OLDWORLD_IDE1_DMA_IRQ),hw/misc/macio/macio.c +2
-3+ 0x1a, errp)) {return ; } }@@ -266,13 +261,10 @@ static void macio_newworld_realize(PCIDevice *d, Error **errp) MacIOState *s = MACIO(d);NewWorldMacIOState *ns =NEWWORLD_MACIO (d);DeviceState *pic_dev =DEVICE (&ns->pic); -Error *err =NULL ;SysBusDevice *sbd;MemoryRegion *timer_memory =NULL ; -macio_common_realize (d, &err); -if (err) { -error_propagate (errp, err); +if (!macio_common_realize (d, errp)) {return ; } @@ -288,21 +280,17 @@ static void macio_newworld_realize(PCIDevice *d,Error **errp)
sysbus_connect_irq(sbd, 1, qdev_get_gpio_in(pic_dev,NEWWORLD_ESCCA_IRQ)); /* IDE buses */hw/misc/macio/macio.c +3
-6-macio_realize_ide (s, &ns->ide[0 ], -qdev_get_gpio_in (pic_dev,NEWWORLD_IDE0_IRQ ), -qdev_get_gpio_in (pic_dev,NEWWORLD_IDE0_DMA_IRQ ), -0x16 , &err); -if (err) { -error_propagate (errp, err); + if (!macio_realize_ide(s, &ns->ide[0], + qdev_get_gpio_in(pic_dev, NEWWORLD_IDE0_IRQ), + qdev_get_gpio_in(pic_dev,
NEWWORLD_IDE0_DMA_IRQ),hw/misc/macio/macio.c +2
-5+ 0x16, errp)) {return ; } - macio_realize_ide(s, &ns->ide[1], -qdev_get_gpio_in (pic_dev,NEWWORLD_IDE1_IRQ ), -qdev_get_gpio_in (pic_dev,NEWWORLD_IDE1_DMA_IRQ ), -0x1a , &err); -if (err) { -error_propagate (errp, err); + if (!macio_realize_ide(s, &ns->ide[1],
Quoted 8 lines
Quoted 6 lines
hw/misc/macio/macio.c +2
-0+qdev_get_gpio_in (pic_dev,NEWWORLD_IDE1_IRQ ), + qdev_get_gpio_in(pic_dev,
NEWWORLD_IDE1_DMA_IRQ),+ 0x1a, errp)) { return; }These days you would move
macio_common_realize()intoTYPE_MACIO, but anyway:
Maybe in further patches later as I think we'll need more macio changes in the future but for now this is enough to simplify it a bit.
Regards,
BALATON Zoltan
Quoted 8 lines
Reviewed-by Mark Cave-Ayland <[email protected]>ATB,
Mark.