diff options
author | Max Reitz <mreitz@redhat.com> | 2013-11-07 20:10:29 +0100 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2013-11-28 10:30:52 +0100 |
commit | b276d2499428795629eee8ee93ba1ea100bb1bc9 (patch) | |
tree | d81a972f092b0d0f35b26a00601382a24eb4dcd1 | |
parent | 5a37b60a61c4c334e3b194758871f41494317d42 (diff) | |
download | qemu-b276d2499428795629eee8ee93ba1ea100bb1bc9.zip qemu-b276d2499428795629eee8ee93ba1ea100bb1bc9.tar.gz qemu-b276d2499428795629eee8ee93ba1ea100bb1bc9.tar.bz2 |
util/error: Save errno from clobbering
There may be calls to error_setg() and especially error_setg_errno()
which blindly (and until now wrongly) assume these functions not to
clobber errno (e.g., they pass errno to error_setg_errno() and return
-errno afterwards). Instead of trying to find and fix all of these
constructs, just make sure error_setg() and error_setg_errno() indeed do
not clobber errno.
Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r-- | util/error.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/util/error.c b/util/error.c index ec0faa6..3ee362a 100644 --- a/util/error.c +++ b/util/error.c @@ -27,6 +27,7 @@ void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...) { Error *err; va_list ap; + int saved_errno = errno; if (errp == NULL) { return; @@ -41,6 +42,8 @@ void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...) err->err_class = err_class; *errp = err; + + errno = saved_errno; } void error_set_errno(Error **errp, int os_errno, ErrorClass err_class, @@ -49,6 +52,7 @@ void error_set_errno(Error **errp, int os_errno, ErrorClass err_class, Error *err; char *msg1; va_list ap; + int saved_errno = errno; if (errp == NULL) { return; @@ -69,6 +73,8 @@ void error_set_errno(Error **errp, int os_errno, ErrorClass err_class, err->err_class = err_class; *errp = err; + + errno = saved_errno; } void error_setg_file_open(Error **errp, int os_errno, const char *filename) |