#include "qapi/error.h"
#include "qapi/qmp/qerror.h"
#include "qemu/main-loop.h"
+#include "qemu/module.h"
-struct RndRandom
+struct RngRandom
{
RngBackend parent;
static void entropy_available(void *opaque)
{
- RndRandom *s = RNG_RANDOM(opaque);
+ RngRandom *s = RNG_RANDOM(opaque);
while (!QSIMPLEQ_EMPTY(&s->parent.requests)) {
RngRequest *req = QSIMPLEQ_FIRST(&s->parent.requests);
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 there are no pending requests yet, we need to
static void rng_random_opened(RngBackend *b, Error **errp)
{
- RndRandom *s = RNG_RANDOM(b);
+ RngRandom *s = RNG_RANDOM(b);
if (s->filename == NULL) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"filename", "a valid filename");
} else {
- s->fd = qemu_open(s->filename, O_RDONLY | O_NONBLOCK);
+ s->fd = qemu_open_old(s->filename, O_RDONLY | O_NONBLOCK);
if (s->fd == -1) {
error_setg_file_open(errp, errno, s->filename);
}
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);
}
Error **errp)
{
RngBackend *b = RNG_BACKEND(obj);
- RndRandom *s = RNG_RANDOM(obj);
+ RngRandom *s = RNG_RANDOM(obj);
if (b->opened) {
- error_setg(errp, QERR_PERMISSION_DENIED);
+ error_setg(errp, "Property 'filename' can no longer be set");
return;
}
static void rng_random_init(Object *obj)
{
- RndRandom *s = RNG_RANDOM(obj);
+ RngRandom *s = RNG_RANDOM(obj);
- object_property_add_str(obj, "filename",
- rng_random_get_filename,
- rng_random_set_filename,
- NULL);
-
- s->filename = g_strdup("/dev/random");
+ s->filename = g_strdup("/dev/urandom");
s->fd = -1;
}
static void rng_random_finalize(Object *obj)
{
- RndRandom *s = RNG_RANDOM(obj);
+ RngRandom *s = RNG_RANDOM(obj);
if (s->fd != -1) {
qemu_set_fd_handler(s->fd, NULL, NULL, NULL);
rbc->request_entropy = rng_random_request_entropy;
rbc->opened = rng_random_opened;
+ object_class_property_add_str(klass, "filename",
+ rng_random_get_filename,
+ rng_random_set_filename);
+
}
static const TypeInfo rng_random_info = {
.name = TYPE_RNG_RANDOM,
.parent = TYPE_RNG_BACKEND,
- .instance_size = sizeof(RndRandom),
+ .instance_size = sizeof(RngRandom),
.class_init = rng_random_class_init,
.instance_init = rng_random_init,
.instance_finalize = rng_random_finalize,