@@ -740,10 +740,8 @@ static void mps2tz_common_init(MachineState *machine)
}
/* These clocks don't need migration because they are fixed-frequency */
- mms->sysclk = clock_new(OBJECT(machine), "SYSCLK");
- clock_set_hz(mms->sysclk, mmc->sysclk_frq);
- mms->s32kclk = clock_new(OBJECT(machine), "S32KCLK");
- clock_set_hz(mms->s32kclk, S32KCLK_FRQ);
+ mms->sysclk = machine_create_constant_clock(machine, "SYSCLK", mmc->sysclk_frq);
+ mms->s32kclk = machine_create_constant_clock(machine, "S32KCLK", S32KCLK_FRQ);
object_initialize_child(OBJECT(machine), TYPE_IOTKIT, &mms->iotkit,
mmc->armsse_type);
@@ -143,8 +143,7 @@ static void mps2_common_init(MachineState *machine)
}
/* This clock doesn't need migration because it is fixed-frequency */
- mms->sysclk = clock_new(OBJECT(machine), "SYSCLK");
- clock_set_hz(mms->sysclk, SYSCLK_FRQ);
+ mms->sysclk = machine_create_constant_clock(machine, "SYSCLK", SYSCLK_FRQ);
/* The FPGA images have an odd combination of different RAMs,
* because in hardware they are different implementations and
@@ -372,10 +372,8 @@ static void musca_init(MachineState *machine)
exit(1);
}
- mms->sysclk = clock_new(OBJECT(machine), "SYSCLK");
- clock_set_hz(mms->sysclk, SYSCLK_FRQ);
- mms->s32kclk = clock_new(OBJECT(machine), "S32KCLK");
- clock_set_hz(mms->s32kclk, S32KCLK_FRQ);
+ mms->sysclk = machine_create_constant_clock(machine, "SYSCLK", SYSCLK_FRQ);
+ mms->s32kclk = machine_create_constant_clock(machine, "S32KCLK", S32KCLK_FRQ);
object_initialize_child(OBJECT(machine), "sse-200", &mms->sse,
TYPE_SSE200);
Use the newly added machine_create_constant_clock() helper to create the SYSCLKs. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/arm/mps2-tz.c | 6 ++---- hw/arm/mps2.c | 3 +-- hw/arm/musca.c | 6 ++---- 3 files changed, 5 insertions(+), 10 deletions(-)