diff options
author | Daniel P. Berrangé | 2020-07-01 17:30:35 +0200 |
---|---|---|
committer | Daniel P. Berrangé | 2020-09-16 11:33:48 +0200 |
commit | c490af57cb451bf39707f4cc73650e81c5797221 (patch) | |
tree | 69eede466bcc56850e69bc9ba8a721226147b5a1 /util | |
parent | util: add Error object for qemu_open_internal error reporting (diff) | |
download | qemu-c490af57cb451bf39707f4cc73650e81c5797221.tar.gz qemu-c490af57cb451bf39707f4cc73650e81c5797221.tar.xz qemu-c490af57cb451bf39707f4cc73650e81c5797221.zip |
util: introduce qemu_open and qemu_create with error reporting
qemu_open_old() works like open(): set errno and return -1 on failure.
It has even more failure modes, though. Reporting the error clearly
to users is basically impossible for many of them.
Our standard cure for "errno is too coarse" is the Error object.
Introduce two new helper methods:
int qemu_open(const char *name, int flags, Error **errp);
int qemu_create(const char *name, int flags, mode_t mode, Error **errp);
Note that with this design we no longer require or even accept the
O_CREAT flag. Avoiding overloading the two distinct operations
means we can avoid variable arguments which would prevent 'errp' from
being the last argument. It also gives us a guarantee that the 'mode' is
given when creating files, avoiding a latent security bug.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'util')
-rw-r--r-- | util/osdep.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/util/osdep.c b/util/osdep.c index 28aa89adc9..c99f1e7db2 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -341,6 +341,22 @@ qemu_open_internal(const char *name, int flags, mode_t mode, Error **errp) } +int qemu_open(const char *name, int flags, Error **errp) +{ + assert(!(flags & O_CREAT)); + + return qemu_open_internal(name, flags, 0, errp); +} + + +int qemu_create(const char *name, int flags, mode_t mode, Error **errp) +{ + assert(!(flags & O_CREAT)); + + return qemu_open_internal(name, flags | O_CREAT, mode, errp); +} + + int qemu_open_old(const char *name, int flags, ...) { va_list ap; |