@@ -15,6 +15,7 @@
#include "atmega.h"
#include "boot.h"
#include "qom/object.h"
+#include "hw/qdev-properties.h"
struct ArduinoMachineState {
/*< private >*/
@@ -44,8 +45,7 @@ static void arduino_machine_init(MachineState *machine)
ArduinoMachineState *ams = ARDUINO_MACHINE(machine);
object_initialize_child(OBJECT(machine), "mcu", &ams->mcu, amc->mcu_type);
- object_property_set_uint(OBJECT(&ams->mcu), "xtal-frequency-hz",
- amc->xtal_hz, &error_abort);
+ qdev_prop_set_uint64(DEVICE(&ams->mcu), "xtal-frequency-hz", amc->xtal_hz);
sysbus_realize(SYS_BUS_DEVICE(&ams->mcu), &error_abort);
if (machine->firmware) {
@@ -327,8 +327,8 @@ static void atmega_realize(DeviceState *dev, Error **errp)
devname = g_strdup_printf("timer%zu", i);
object_initialize_child(OBJECT(dev), devname, &s->timer[i],
TYPE_AVR_TIMER16);
- object_property_set_uint(OBJECT(&s->timer[i]), "cpu-frequency-hz",
- s->xtal_freq_hz, &error_abort);
+ qdev_prop_set_uint64(DEVICE(&s->timer[i]), "cpu-frequency-hz",
+ s->xtal_freq_hz);
sbd = SYS_BUS_DEVICE(&s->timer[i]);
sysbus_realize(sbd, &error_abort);
sysbus_mmio_map(sbd, 0, OFFSET_DATA + mc->dev[idx].addr);
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é <philmd@linaro.org> --- hw/avr/arduino.c | 4 ++-- hw/avr/atmega.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)