[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/7] backends/rng-random: Get rid of qemu_open_old()
From: |
Zhao Liu |
Subject: |
[PATCH 7/7] backends/rng-random: Get rid of qemu_open_old() |
Date: |
Mon, 15 Jul 2024 16:21:55 +0800 |
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>
---
backends/rng-random.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/backends/rng-random.c b/backends/rng-random.c
index 80eb5be138ce..3cdb982533b5 100644
--- a/backends/rng-random.c
+++ b/backends/rng-random.c
@@ -75,10 +75,11 @@ 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);
- }
+ /*
+ * Once the open fails, the error message is integrated into
+ * the *errp object by qemu_open().
+ */
+ s->fd = qemu_open(s->filename, O_RDONLY | O_NONBLOCK, errp);
}
}
--
2.34.1
- Re: [PATCH 3/7] hw/usb/u2f-passthru: Get rid of qemu_open_old(), (continued)