Skip to contentSkip to conversation

ppc/pegasos2: Improve readability of VIA south bridge creation

PATCH Superseded BALATON Zoltan 2 participants 3 messages Jan 17, 2023 – Jan 18, 2023

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ppc/pegasos2: Improve readability of VIA south bridge creation

Slightly improve readability of creating the south btidge by cnamging type of a local variable to avoid some casts within function arguments which makes some lines shorter and easier to read.
Also remove an unneded line break.

---
 hw/ppc/pegasos2.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
hw/ppc/pegasos2.c +7 -7
index f46d4bf51d..1a13632ba6 100644
@@ -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);
Signature · 1 line
2.30.6
#1 lore raw
Quoted 1 line · BALATON Zoltan

Slightly improve readability of creating the south btidge by cnamging

Still left a typo in "bridge" above...
This is alternative, inspired by Phil's patches, maybe I'd also need to add Inspired-by: tag.

Quoted 3 lines

type of a local variable to avoid some casts within function arguments which makes some lines shorter and easier to read.
Also remove an unneded line break.

and "unneeded" here. I wait what Phil says then correct these if needed.

Regards,
BALATON Zoltan

Quoted 45 lines

---
hw/ppc/pegasos2.c | 14 +++++++-------

1 file changed, 7 insertions(+), 7 deletions(-)
hw/ppc/pegasos2.c +7 -7
index f46d4bf51d..1a13632ba6 100644
@@ -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 lore raw
Quoted 4 lines · BALATON Zoltan
Quoted 1 line · BALATON Zoltan

Slightly improve readability of creating the south btidge by cnamging

Still left a typo in "bridge" above...

Also "naming".

Quoted 1 line

This is alternative, inspired by Phil's patches, maybe I'd also need to add Inspired-by: tag.

Not necessary.

Quoted 5 lines
Quoted 3 lines

type of a local variable to avoid some casts within function arguments which makes some lines shorter and easier to read.
Also remove an unneded line break.

and "unneeded" here. I wait what Phil says then correct these if needed.

Fine by me, so with the typos fixed:

Quoted 4 lines
Quoted 4 lines

---
hw/ppc/pegasos2.c | 14 +++++++-------

1 file changed, 7 insertions(+), 7 deletions(-)