Commit fe704809 authored by Shannon Zhao's avatar Shannon Zhao Committed by Michael S. Tsirkin
Browse files

virtio-rng: move qdev properties into virtio-rng.c 



As only one place in virtio-rng.c uses DEFINE_VIRTIO_RNG_PROPERTIES,
there is no need to expose it. Inline it into virtio-rng.c to avoid
wrongly use.

Signed-off-by: default avatarShannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 0c63237a

hw/virtio/virtio-rng.c

+7 −1
Original line number Diff line number Diff line
@@ -219,7 +219,13 @@ static void virtio_rng_device_unrealize(DeviceState *dev, Error **errp) 
}



static Property virtio_rng_properties[] = {

    DEFINE_VIRTIO_RNG_PROPERTIES(VirtIORNG, conf),

    /* Set a default rate limit of 2^47 bytes per minute or roughly 2TB/s.  If

     * you have an entropy source capable of generating more entropy than this

     * and you can pass it through via virtio-rng, then hats off to you.  Until

     * then, this is unlimited for all practical purposes.

     */

    DEFINE_PROP_UINT64("max-bytes", VirtIORNG, conf.max_bytes, INT64_MAX),

    DEFINE_PROP_UINT32("period", VirtIORNG, conf.period_ms, 1 << 16),

    DEFINE_PROP_END_OF_LIST(),

};

include/hw/virtio/virtio-rng.h

+0 −10
Original line number Diff line number Diff line
@@ -46,14 +46,4 @@ typedef struct VirtIORNG { 
    int64_t quota_remaining;

} VirtIORNG;



/* Set a default rate limit of 2^47 bytes per minute or roughly 2TB/s.  If

   you have an entropy source capable of generating more entropy than this

   and you can pass it through via virtio-rng, then hats off to you.  Until

   then, this is unlimited for all practical purposes.

*/

#define DEFINE_VIRTIO_RNG_PROPERTIES(_state, _conf_field)                    \

        DEFINE_PROP_UINT64("max-bytes", _state, _conf_field.max_bytes,       \

                           INT64_MAX),                                       \

        DEFINE_PROP_UINT32("period", _state, _conf_field.period_ms, 1 << 16)



#endif