OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

rng-random: rename RndRandom to RngRandom 

Usually, Random Number Generator is abbreviated to RNG/rng.
so replacing RndRandom with RngRandom seems more reasonable
and keep consistent with RngBackend.

Signed-off-by: Wei Jiangang <weijg.fnst@cn.fujitsu.com>
Reviewed-by: Pankaj Gupta <pagupta@redhat.com>
Message-Id: <1460684168-5403-1-git-send-email-weijg.fnst@cn.fujitsu.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
This commit is contained in:
Wei Jiangang 2016-04-15 09:36:08 +08:00 committed by Amit Shah
parent 65603e2fc1
commit cde6361534
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backends/rng-random.c
View File

@ -17,7 +17,7 @@
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
struct RndRandom struct RngRandom
{ {
RngBackend parent; RngBackend parent;
@ -34,7 +34,7 @@ struct RndRandom
static void entropy_available(void *opaque) static void entropy_available(void *opaque)
{ {
RndRandom *s = RNG_RANDOM(opaque); RngRandom *s = RNG_RANDOM(opaque);
while (!QSIMPLEQ_EMPTY(&s->parent.requests)) { while (!QSIMPLEQ_EMPTY(&s->parent.requests)) {
RngRequest *req = QSIMPLEQ_FIRST(&s->parent.requests); RngRequest *req = QSIMPLEQ_FIRST(&s->parent.requests);
@ -57,7 +57,7 @@ static void entropy_available(void *opaque)
static void rng_random_request_entropy(RngBackend *b, RngRequest *req) static void rng_random_request_entropy(RngBackend *b, RngRequest *req)
{ {
RndRandom *s = RNG_RANDOM(b); RngRandom *s = RNG_RANDOM(b);
if (QSIMPLEQ_EMPTY(&s->parent.requests)) { if (QSIMPLEQ_EMPTY(&s->parent.requests)) {
/* If there are no pending requests yet, we need to /* If there are no pending requests yet, we need to
@ -68,7 +68,7 @@ static void rng_random_request_entropy(RngBackend *b, RngRequest *req)
static void rng_random_opened(RngBackend *b, Error **errp) static void rng_random_opened(RngBackend *b, Error **errp)
{ {
RndRandom *s = RNG_RANDOM(b); RngRandom *s = RNG_RANDOM(b);
if (s->filename == NULL) { if (s->filename == NULL) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
@ -83,7 +83,7 @@ static void rng_random_opened(RngBackend *b, Error **errp)
static char *rng_random_get_filename(Object *obj, Error **errp) static char *rng_random_get_filename(Object *obj, Error **errp)
{ {
RndRandom *s = RNG_RANDOM(obj); RngRandom *s = RNG_RANDOM(obj);
return g_strdup(s->filename); return g_strdup(s->filename);
} }
@ -92,7 +92,7 @@ static void rng_random_set_filename(Object *obj, const char *filename,
Error **errp) Error **errp)
{ {
RngBackend *b = RNG_BACKEND(obj); RngBackend *b = RNG_BACKEND(obj);
RndRandom *s = RNG_RANDOM(obj); RngRandom *s = RNG_RANDOM(obj);
if (b->opened) { if (b->opened) {
error_setg(errp, QERR_PERMISSION_DENIED); error_setg(errp, QERR_PERMISSION_DENIED);
@ -105,7 +105,7 @@ static void rng_random_set_filename(Object *obj, const char *filename,
static void rng_random_init(Object *obj) static void rng_random_init(Object *obj)
{ {
RndRandom *s = RNG_RANDOM(obj); RngRandom *s = RNG_RANDOM(obj);
object_property_add_str(obj, "filename", object_property_add_str(obj, "filename",
rng_random_get_filename, rng_random_get_filename,
@ -118,7 +118,7 @@ static void rng_random_init(Object *obj)
static void rng_random_finalize(Object *obj) static void rng_random_finalize(Object *obj)
{ {
RndRandom *s = RNG_RANDOM(obj); RngRandom *s = RNG_RANDOM(obj);
if (s->fd != -1) { if (s->fd != -1) {
qemu_set_fd_handler(s->fd, NULL, NULL, NULL); qemu_set_fd_handler(s->fd, NULL, NULL, NULL);
@ -139,7 +139,7 @@ static void rng_random_class_init(ObjectClass *klass, void *data)
static const TypeInfo rng_random_info = { static const TypeInfo rng_random_info = {
.name = TYPE_RNG_RANDOM, .name = TYPE_RNG_RANDOM,
.parent = TYPE_RNG_BACKEND, .parent = TYPE_RNG_BACKEND,
.instance_size = sizeof(RndRandom), .instance_size = sizeof(RngRandom),
.class_init = rng_random_class_init, .class_init = rng_random_class_init,
.instance_init = rng_random_init, .instance_init = rng_random_init,
.instance_finalize = rng_random_finalize, .instance_finalize = rng_random_finalize,

2
include/hw/virtio/virtio-rng.h
View File

@ -26,7 +26,7 @@ struct VirtIORNGConf {
RngBackend *rng; RngBackend *rng;
uint64_t max_bytes; uint64_t max_bytes;
uint32_t period_ms; uint32_t period_ms;
RndRandom *default_backend; RngRandom *default_backend;
}; };
typedef struct VirtIORNG { typedef struct VirtIORNG {

4
include/sysemu/rng-random.h
View File

@ -15,8 +15,8 @@
#include "qom/object.h" #include "qom/object.h"
#define TYPE_RNG_RANDOM "rng-random" #define TYPE_RNG_RANDOM "rng-random"
#define RNG_RANDOM(obj) OBJECT_CHECK(RndRandom, (obj), TYPE_RNG_RANDOM) #define RNG_RANDOM(obj) OBJECT_CHECK(RngRandom, (obj), TYPE_RNG_RANDOM)
typedef struct RndRandom RndRandom; typedef struct RngRandom RngRandom;
#endif #endif