No need to use the low-level QOM API when an object inherits from QDev. Directly use the QDev API to set its properties.
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> --- hw/acpi/cpu_hotplug.c | 7 +++---- hw/acpi/ich9.c | 4 ++-- hw/acpi/piix4.c | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index b8c9081738..5bc5f435f4 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -10,6 +10,7 @@ * See the COPYING file in the top-level directory. */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/acpi/cpu_hotplug.h" #include "qapi/error.h" #include "hw/core/cpu.h" @@ -41,8 +42,7 @@ static void cpu_status_write(void *opaque, hwaddr addr, uint64_t data, */ if (addr == 0 && data == 0) { AcpiCpuHotplug *gpe = opaque; - object_property_set_bool(OBJECT(gpe->parent), "cpu-hotplug-legacy", - false, &error_abort); + qdev_prop_set_bit(gpe->parent, "cpu-hotplug-legacy", false); } } @@ -66,8 +66,7 @@ static void acpi_set_cpu_present_bit(AcpiCpuHotplug *gpe, CPUState *cpu) cpu_id = k->get_arch_id(cpu); if ((cpu_id / 8) >= ACPI_GPE_PROC_LEN) { - object_property_set_bool(OBJECT(gpe->parent), "cpu-hotplug-legacy", - false, &error_abort); + qdev_prop_set_bit(gpe->parent, "cpu-hotplug-legacy", false); return; } diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 6c9a737479..9759119b32 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -30,6 +30,7 @@ #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "qemu/timer.h" +#include "hw/qdev-properties.h" #include "hw/core/cpu.h" #include "sysemu/reset.h" #include "sysemu/runstate.h" @@ -197,8 +198,7 @@ static bool vmstate_test_use_cpuhp(void *opaque) static int vmstate_cpuhp_pre_load(void *opaque) { ICH9LPCPMRegs *s = opaque; - Object *obj = OBJECT(s->gpe.parent); - object_property_set_bool(obj, "cpu-hotplug-legacy", false, &error_abort); + qdev_prop_set_bit(s->gpe.parent, "cpu-hotplug-legacy", false); return 0; } diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 3a61d89f92..9a86d506de 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -206,8 +206,8 @@ static bool vmstate_test_use_cpuhp(void *opaque) static int vmstate_cpuhp_pre_load(void *opaque) { - Object *obj = OBJECT(opaque); - object_property_set_bool(obj, "cpu-hotplug-legacy", false, &error_abort); + PIIX4PMState *s = opaque; + qdev_prop_set_bit(DEVICE(s), "cpu-hotplug-legacy", false); return 0; } -- 2.38.1