From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmRDQ-0004Cc-Gg for qemu-devel@nongnu.org; Fri, 29 Nov 2013 11:46:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmRDL-0002tt-7p for qemu-devel@nongnu.org; Fri, 29 Nov 2013 11:46:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52125) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmRDK-0002tj-U8 for qemu-devel@nongnu.org; Fri, 29 Nov 2013 11:46:47 -0500 From: Kevin Wolf Date: Fri, 29 Nov 2013 17:45:33 +0100 Message-Id: <1385743555-27888-19-git-send-email-kwolf@redhat.com> In-Reply-To: <1385743555-27888-1-git-send-email-kwolf@redhat.com> References: <1385743555-27888-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 18/41] util/error: Save errno from clobbering List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Max Reitz 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 Signed-off-by: Max Reitz Reviewed-by: Benoit Canet Signed-off-by: Stefan Hajnoczi --- util/error.c | 6 ++++++ 1 file changed, 6 insertions(+) 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) -- 1.8.1.4