Slightly improve readability of creating the south bridge by changing
type of a local variable to avoid some casts within function arguments
which makes some lines shorter and easier to read.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
v2: Fixed typos in commit message
hw/ppc/pegasos2.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
index f46d4bf51d..1a13632ba6 100644
--- a/hw/ppc/pegasos2.c
+++ b/hw/ppc/pegasos2.c
@@ -102,7 +102,8 @@ static void pegasos2_init(MachineState *machine)
CPUPPCState *env;
MemoryRegion *rom = g_new(MemoryRegion, 1);
PCIBus *pci_bus;
- PCIDevice *dev, *via;
+ Object *via;
+ PCIDevice *dev;
I2CBus *i2c_bus;
const char *fwname = machine->firmware ?: PROM_FILENAME;
char *filename;
@@ -159,19 +160,18 @@ static void pegasos2_init(MachineState *machine)
pci_bus = mv64361_get_pci_bus(pm->mv, 1);
/* VIA VT8231 South Bridge (multifunction PCI device) */
- via = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(12, 0), true,
- TYPE_VT8231_ISA);
+ via = OBJECT(pci_create_simple_multifunction(pci_bus, PCI_DEVFN(12, 0),
+ true, TYPE_VT8231_ISA));
object_property_add_alias(OBJECT(machine), "rtc-time",
- object_resolve_path_component(OBJECT(via),
- "rtc"),
+ object_resolve_path_component(via, "rtc"),
"date");
qdev_connect_gpio_out(DEVICE(via), 0,
qdev_get_gpio_in_named(pm->mv, "gpp", 31));
- dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide"));
+ dev = PCI_DEVICE(object_resolve_path_component(via, "ide"));
pci_ide_create_devs(dev);
- dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "pm"));
+ dev = PCI_DEVICE(object_resolve_path_component(via, "pm"));
i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c"));
spd_data = spd_data_generate(DDR, machine->ram_size);
smbus_eeprom_init_one(i2c_bus, 0x57, spd_data);
--
2.30.6
Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks, Daniel On 1/18/23 13:45, BALATON Zoltan wrote: > Slightly improve readability of creating the south bridge by changing > type of a local variable to avoid some casts within function arguments > which makes some lines shorter and easier to read. > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > v2: Fixed typos in commit message > > hw/ppc/pegasos2.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c > index f46d4bf51d..1a13632ba6 100644 > --- a/hw/ppc/pegasos2.c > +++ b/hw/ppc/pegasos2.c > @@ -102,7 +102,8 @@ static void pegasos2_init(MachineState *machine) > CPUPPCState *env; > MemoryRegion *rom = g_new(MemoryRegion, 1); > PCIBus *pci_bus; > - PCIDevice *dev, *via; > + Object *via; > + PCIDevice *dev; > I2CBus *i2c_bus; > const char *fwname = machine->firmware ?: PROM_FILENAME; > char *filename; > @@ -159,19 +160,18 @@ static void pegasos2_init(MachineState *machine) > pci_bus = mv64361_get_pci_bus(pm->mv, 1); > > /* VIA VT8231 South Bridge (multifunction PCI device) */ > - via = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(12, 0), true, > - TYPE_VT8231_ISA); > + via = OBJECT(pci_create_simple_multifunction(pci_bus, PCI_DEVFN(12, 0), > + true, TYPE_VT8231_ISA)); > object_property_add_alias(OBJECT(machine), "rtc-time", > - object_resolve_path_component(OBJECT(via), > - "rtc"), > + object_resolve_path_component(via, "rtc"), > "date"); > qdev_connect_gpio_out(DEVICE(via), 0, > qdev_get_gpio_in_named(pm->mv, "gpp", 31)); > > - dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide")); > + dev = PCI_DEVICE(object_resolve_path_component(via, "ide")); > pci_ide_create_devs(dev); > > - dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "pm")); > + dev = PCI_DEVICE(object_resolve_path_component(via, "pm")); > i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c")); > spd_data = spd_data_generate(DDR, machine->ram_size); > smbus_eeprom_init_one(i2c_bus, 0x57, spd_data);
© 2016 - 2024 Red Hat, Inc.