Skip to contentSkip to conversation

Use qemu_open / qemu_close in rng backend

PATCH Applied Stefan Berger 3 participants 3 messages Mar 1, 2013 – Mar 4, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Use qemu_open / qemu_close in rng backend

In the rng backend use qemu_open and qemu_close rather than POSIX open/close.

backends/rng-random.c +2 -2
index 0d11088..acd20af 100644
@@ -74,7 +74,7 @@ static void rng_random_opened(RngBackend *b, Error **errp)
         error_set(errp, QERR_INVALID_PARAMETER_VALUE,
                   "filename", "a valid filename");
     } else {
-        s->fd = open(s->filename, O_RDONLY | O_NONBLOCK);
+        s->fd = qemu_open(s->filename, O_RDONLY | O_NONBLOCK);
 
         if (s->fd == -1) {
             error_set(errp, QERR_OPEN_FILE_FAILED, s->filename);
@@ -130,7 +130,7 @@ static void rng_random_finalize(Object *obj)
     qemu_set_fd_handler(s->fd, NULL, NULL, NULL);
 
     if (s->fd != -1) {
-        close(s->fd);
+        qemu_close(s->fd);
     }
 
     g_free(s->filename);
Reviewed-by on v1 1/1
#1 lore raw

[don't you also need to cc the main qemu list, even for trivial patches?]

Quoted 4 lines · Stefan Berger

In the rng backend use qemu_open and qemu_close rather than POSIX open/close.

Quoted 27 lines
backends/rng-random.c +1 -1
index 0d11088..acd20af 100644
@@ -74,7 +74,7 @@ static void rng_random_opened(RngBackend *b, Error
 **errp)
         error_set(errp, QERR_INVALID_PARAMETER_VALUE,
                   "filename", "a valid filename");
     } else {
-        s->fd = open(s->filename, O_RDONLY | O_NONBLOCK);
+        s->fd = qemu_open(s->filename, O_RDONLY | O_NONBLOCK);
 
         if (s->fd == -1) {
             error_set(errp, QERR_OPEN_FILE_FAILED, s->filename);
backends/rng-random.c +1 -1
@@ -130,7 +130,7 @@ static void rng_random_finalize(Object *obj)
     qemu_set_fd_handler(s->fd, NULL, NULL, NULL);
 
     if (s->fd != -1) {
-        close(s->fd);
+        qemu_close(s->fd);
     }
 
     g_free(s->filename);
Signature · 2 lines
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org