]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
backends/rng-random: Get rid of qemu_open_old()
authorZhao Liu <zhao1.liu@intel.com>
Mon, 15 Jul 2024 08:21:55 +0000 (16:21 +0800)
committerMichael Tokarev <mjt@tls.msk.ru>
Wed, 17 Jul 2024 11:04:15 +0000 (14:04 +0300)
For qemu_open_old(), osdep.h said:

> Don't introduce new usage of this function, prefer the following
> qemu_open/qemu_create that take an "Error **errp".

So replace qemu_open_old() with qemu_open(). And considering
rng_random_opened() will lose its obvious error handling case after
removing error_setg_file_open(), add comment to remind here.

Cc: Laurent Vivier <lvivier@redhat.com>
Cc: Amit Shah <amit@kernel.org>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
(mjt: drop superfluous commit as suggested by philmd)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
backends/rng-random.c

index 80eb5be138cec2e5d67b889c6fbe53025f517cdd..489c0917f09021eb6e366537c571fa00f1761f6e 100644 (file)
@@ -75,10 +75,7 @@ static void rng_random_opened(RngBackend *b, Error **errp)
         error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
                    "filename", "a valid filename");
     } else {
-        s->fd = qemu_open_old(s->filename, O_RDONLY | O_NONBLOCK);
-        if (s->fd == -1) {
-            error_setg_file_open(errp, errno, s->filename);
-        }
+        s->fd = qemu_open(s->filename, O_RDONLY | O_NONBLOCK, errp);
     }
 }