From patchwork Sat Mar 2 22:38:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1050738 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Bh8b0y11z9s4V for ; Sun, 3 Mar 2019 09:41:03 +1100 (AEDT) Received: from localhost ([127.0.0.1]:59771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0DJV-0005YQ-4q for incoming@patchwork.ozlabs.org; Sat, 02 Mar 2019 17:41:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0DHJ-0004H5-DE for qemu-devel@nongnu.org; Sat, 02 Mar 2019 17:38:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0DHI-0005cc-KZ for qemu-devel@nongnu.org; Sat, 02 Mar 2019 17:38:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33020) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h0DHI-0005bE-DY; Sat, 02 Mar 2019 17:38:44 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B01703084242; Sat, 2 Mar 2019 22:38:43 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-70.brq.redhat.com [10.40.204.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 31B7A5D9C5; Sat, 2 Mar 2019 22:38:39 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Sat, 2 Mar 2019 23:38:25 +0100 Message-Id: <20190302223825.11192-3-philmd@redhat.com> In-Reply-To: <20190302223825.11192-1-philmd@redhat.com> References: <20190302223825.11192-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Sat, 02 Mar 2019 22:38:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] util/error: Remove unnecessary saved_errno X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-trivial@nongnu.org, Markus Armbruster , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Since 552375088a8, error_set_errno() calls error_setv() which already protect errno for clobbering. Remove the now unnecessary saved_errno. Suggested-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- util/error.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/util/error.c b/util/error.c index 934a78e1b1..0402fa1b9d 100644 --- a/util/error.c +++ b/util/error.c @@ -101,14 +101,11 @@ void error_setg_errno_internal(Error **errp, int os_errno, const char *fmt, ...) { va_list ap; - int saved_errno = errno; va_start(ap, fmt); error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR, fmt, ap, os_errno != 0 ? strerror(os_errno) : NULL); va_end(ap); - - errno = saved_errno; } void error_setg_file_open_internal(Error **errp,