Commit 5f7655f6 authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael S. Tsirkin
Browse files

virtio-rng: Keep the default backend out of VirtIORNGConf 



The default backend is only used within virtio_rng_device_realize().
Replace VirtIORNGConf member default_backend by a local variable.
Adjust its type to reduce conversions.

While there, pass &error_abort instead of NULL when failure would be a
programming error.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
Message-Id: <20190820160615.14616-3-lvivier@redhat.com>
parent 6c4e9d48

hw/virtio/virtio-rng.c

+9 −11
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "hw/virtio/virtio-rng.h"

#include "sysemu/rng.h"

#include "sysemu/runstate.h"

#include "sysemu/rng-random.h"

#include "qom/object_interfaces.h"

#include "trace.h"
@@ -192,27 +193,24 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp) 
    }



    if (vrng->conf.rng == NULL) {

        vrng->conf.default_backend = RNG_RANDOM(object_new(TYPE_RNG_RANDOM));

        Object *default_backend = object_new(TYPE_RNG_RANDOM);



        user_creatable_complete(USER_CREATABLE(vrng->conf.default_backend),

        user_creatable_complete(USER_CREATABLE(default_backend),

                                &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            object_unref(OBJECT(vrng->conf.default_backend));

            object_unref(default_backend);

            return;

        }



        object_property_add_child(OBJECT(dev),

                                  "default-backend",

                                  OBJECT(vrng->conf.default_backend),

                                  NULL);

        object_property_add_child(OBJECT(dev), "default-backend",

                                  default_backend, &error_abort);



        /* The child property took a reference, we can safely drop ours now */

        object_unref(OBJECT(vrng->conf.default_backend));

        object_unref(default_backend);



        object_property_set_link(OBJECT(dev),

                                 OBJECT(vrng->conf.default_backend),

                                 "rng", NULL);

        object_property_set_link(OBJECT(dev), default_backend,

                                 "rng", &error_abort);

    }



    vrng->rng = vrng->conf.rng;

include/hw/virtio/virtio-rng.h

+0 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


#include "hw/virtio/virtio.h"

#include "sysemu/rng.h"

#include "sysemu/rng-random.h"

#include "standard-headers/linux/virtio_rng.h"



#define TYPE_VIRTIO_RNG "virtio-rng-device"
@@ -27,7 +26,6 @@ struct VirtIORNGConf { 
    RngBackend *rng;

    uint64_t max_bytes;

    uint32_t period_ms;

    RngRandom *default_backend;

};



typedef struct VirtIORNG {