hw/vfio/ap: drop local_err from vfio_ap_realize

[qemu.git] / backends / rng-random.c

diff --git a/backends/rng-random.c b/backends/rng-random.c
index 0d1108811d41e02ce20049a86c6722eab657b899..a81058139330f3c8e5f85dfa8a6c5cb7aff78ee5 100644 (file)
--- a/backends/rng-random.c
+++ b/backends/rng-random.c
@@ -10,21 +10,20 @@
  * See the COPYING file in the top-level directory.
  */
 
  * See the COPYING file in the top-level directory.
  */
 

-#include "qemu/rng-random.h"
-#include "qemu/rng.h"
+#include "qemu/osdep.h"
+#include "sysemu/rng-random.h"
+#include "sysemu/rng.h"
+#include "qapi/error.h"

 #include "qapi/qmp/qerror.h"
 #include "qemu/main-loop.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/main-loop.h"

+#include "qemu/module.h"

 
 

-struct RndRandom
+struct RngRandom

 {
     RngBackend parent;
 
     int fd;
     char *filename;
 {
     RngBackend parent;
 
     int fd;
     char *filename;

-
-    EntropyReceiveFunc *receive_func;
-    void *opaque;
-    size_t size;

 };
 
 /**
 };
 
 /**


@@ -36,101 +35,95 @@ struct RndRandom
 
 static void entropy_available(void *opaque)
 {
 
 static void entropy_available(void *opaque)
 {

-    RndRandom *s = RNG_RANDOM(opaque);
-    uint8_t buffer[s->size];
-    ssize_t len;
+    RngRandom *s = RNG_RANDOM(opaque);
+
+    while (!QSIMPLEQ_EMPTY(&s->parent.requests)) {
+        RngRequest *req = QSIMPLEQ_FIRST(&s->parent.requests);
+        ssize_t len;
+
+        len = read(s->fd, req->data, req->size);
+        if (len < 0 && errno == EAGAIN) {
+            return;
+        }
+        g_assert(len != -1);

 
 

-    len = read(s->fd, buffer, s->size);
-    g_assert(len != -1);
+        req->receive_entropy(req->opaque, req->data, len);

 
 

-    s->receive_func(s->opaque, buffer, len);
-    s->receive_func = NULL;
+        rng_backend_finalize_request(&s->parent, req);
+    }

 
 

+    /* We've drained all requests, the fd handler can be reset. */

     qemu_set_fd_handler(s->fd, NULL, NULL, NULL);
 }
 
     qemu_set_fd_handler(s->fd, NULL, NULL, NULL);
 }
 

-static void rng_random_request_entropy(RngBackend *b, size_t size,
-                                        EntropyReceiveFunc *receive_entropy,
-                                        void *opaque)
+static void rng_random_request_entropy(RngBackend *b, RngRequest *req)

 {
 {

-    RndRandom *s = RNG_RANDOM(b);
+    RngRandom *s = RNG_RANDOM(b);

 
 

-    if (s->receive_func) {
-        s->receive_func(s->opaque, NULL, 0);
+    if (QSIMPLEQ_EMPTY(&s->parent.requests)) {
+        /* If there are no pending requests yet, we need to
+         * install our fd handler. */
+        qemu_set_fd_handler(s->fd, entropy_available, NULL, s);

     }
     }

-
-    s->receive_func = receive_entropy;
-    s->opaque = opaque;
-    s->size = size;
-
-    qemu_set_fd_handler(s->fd, entropy_available, NULL, s);

 }
 
 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_set(errp, QERR_INVALID_PARAMETER_VALUE,
-                  "filename", "a valid filename");
+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
+                   "filename", "a valid filename");

     } else {
     } else {

-        s->fd = open(s->filename, O_RDONLY | O_NONBLOCK);
-
+        s->fd = qemu_open(s->filename, O_RDONLY | O_NONBLOCK);

         if (s->fd == -1) {
         if (s->fd == -1) {

-            error_set(errp, QERR_OPEN_FILE_FAILED, s->filename);
+            error_setg_file_open(errp, errno, s->filename);

         }
     }
 }
 
 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);

 
 

-    if (s->filename) {
-        return g_strdup(s->filename);
-    }
-
-    return NULL;
+    return g_strdup(s->filename);

 }
 
 static void rng_random_set_filename(Object *obj, const char *filename,
                                  Error **errp)
 {
     RngBackend *b = RNG_BACKEND(obj);
 }
 
 static void rng_random_set_filename(Object *obj, const char *filename,
                                  Error **errp)
 {
     RngBackend *b = RNG_BACKEND(obj);

-    RndRandom *s = RNG_RANDOM(obj);
+    RngRandom *s = RNG_RANDOM(obj);

 
     if (b->opened) {
 
     if (b->opened) {

-        error_set(errp, QERR_PERMISSION_DENIED);
+        error_setg(errp, QERR_PERMISSION_DENIED);

         return;
     }
 
         return;
     }
 

-    if (s->filename) {
-        g_free(s->filename);
-    }
-
+    g_free(s->filename);

     s->filename = g_strdup(filename);
 }
 
 static void rng_random_init(Object *obj)
 {
     s->filename = g_strdup(filename);
 }
 
 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);
 
 
     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)
 {
 }
 
 static void rng_random_finalize(Object *obj)
 {

-    RndRandom *s = RNG_RANDOM(obj);
-
-    qemu_set_fd_handler(s->fd, NULL, NULL, NULL);
+    RngRandom *s = RNG_RANDOM(obj);

 
     if (s->fd != -1) {
 
     if (s->fd != -1) {

-        close(s->fd);
+        qemu_set_fd_handler(s->fd, NULL, NULL, NULL);
+        qemu_close(s->fd);

     }
 
     g_free(s->filename);
     }
 
     g_free(s->filename);


@@ -147,7 +140,7 @@ static void rng_random_class_init(ObjectClass *klass, void *data)
 static const TypeInfo rng_random_info = {
     .name = TYPE_RNG_RANDOM,
     .parent = TYPE_RNG_BACKEND,
 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,
     .class_init = rng_random_class_init,
     .instance_init = rng_random_init,
     .instance_finalize = rng_random_finalize,