Signed-off-by: Fam Zheng <f...@redhat.com> --- hw/ppc/spapr_rng.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c index 80515eb..fcffc65 100644 --- a/hw/ppc/spapr_rng.c +++ b/hw/ppc/spapr_rng.c @@ -34,7 +34,8 @@ struct sPAPRRngState { /*< private >*/ DeviceState ds; - RngBackend *backend; + /* RngBackend pointer to be fill by link property */ + Object *backend; bool use_kvm; }; typedef struct sPAPRRngState sPAPRRngState; @@ -81,7 +82,8 @@ static target_ulong h_random(PowerPCCPU *cpu, sPAPRMachineState *spapr, hrdata.received = 0; while (hrdata.received < 8) { - rng_backend_request_entropy(rngstate->backend, 8 - hrdata.received, + rng_backend_request_entropy(RNG_BACKEND(rngstate->backend), + 8 - hrdata.received, random_recv, &hrdata); qemu_mutex_unlock_iothread(); qemu_sem_wait(&hrdata.sem); @@ -96,17 +98,11 @@ static target_ulong h_random(PowerPCCPU *cpu, sPAPRMachineState *spapr, static void spapr_rng_instance_init(Object *obj) { - sPAPRRngState *rngstate = SPAPR_RNG(obj); - if (object_resolve_path_type("", TYPE_SPAPR_RNG, NULL) != NULL) { error_report("spapr-rng can not be instantiated twice!"); return; } - object_property_add_link(obj, "rng", TYPE_RNG_BACKEND, - (Object **)&rngstate->backend, - object_property_allow_set_link, - OBJ_PROP_LINK_UNREF_ON_RELEASE, NULL); object_property_set_description(obj, "rng", "ID of the random number generator backend", NULL); @@ -163,6 +159,7 @@ int spapr_rng_populate_dt(void *fdt) static Property spapr_rng_properties[] = { DEFINE_PROP_BOOL("use-kvm", sPAPRRngState, use_kvm, false), + DEFINE_PROP_LINK("rng", sPAPRRngState, backend, TYPE_RNG_BACKEND), DEFINE_PROP_END_OF_LIST(), }; -- 2.9.4