Instead of casting OBJECT(lpc) multiple times,
do it once in the new 'lpc_obj' variable.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/i386/pc_q35.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index a91f414922..621661a738 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -126,6 +126,7 @@ static void pc_q35_init(MachineState *machine)
Object *phb;
PCIBus *host_bus;
PCIDevice *lpc;
+ Object *lpc_obj;
DeviceState *lpc_dev;
BusState *idebus[MAX_SATA_PORTS];
ISADevice *rtc_state;
@@ -238,6 +239,7 @@ static void pc_q35_init(MachineState *machine)
/* create ISA bus */
lpc = pci_new_multifunction(PCI_DEVFN(ICH9_LPC_DEV, ICH9_LPC_FUNC),
TYPE_ICH9_LPC_DEVICE);
+ lpc_obj = OBJECT(lpc);
lpc_dev = DEVICE(lpc);
qdev_prop_set_bit(lpc_dev, "smm-enabled",
x86_machine_is_smm_enabled(x86ms));
@@ -246,7 +248,7 @@ static void pc_q35_init(MachineState *machine)
qdev_connect_gpio_out_named(lpc_dev, ICH9_GPIO_GSI, i, x86ms->gsi[i]);
}
- rtc_state = ISA_DEVICE(object_resolve_path_component(OBJECT(lpc), "rtc"));
+ rtc_state = ISA_DEVICE(object_resolve_path_component(lpc_obj, "rtc"));
object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP,
TYPE_HOTPLUG_HANDLER,
@@ -254,13 +256,13 @@ static void pc_q35_init(MachineState *machine)
object_property_allow_set_link,
OBJ_PROP_LINK_STRONG);
object_property_set_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP,
- OBJECT(lpc), &error_abort);
+ lpc_obj, &error_abort);
- acpi_pcihp = object_property_get_bool(OBJECT(lpc),
+ acpi_pcihp = object_property_get_bool(lpc_obj,
ACPI_PM_PROP_ACPI_PCIHP_BRIDGE,
NULL);
- keep_pci_slot_hpc = object_property_get_bool(OBJECT(lpc),
+ keep_pci_slot_hpc = object_property_get_bool(lpc_obj,
"x-keep-pci-slot-hpc",
NULL);
--
2.41.0