From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657156; cv=none; d=zohomail.com; s=zohoarc; b=VYNgm9jrI0UXxxPqMA6WkVZ893NtC8SaLLXKIy8gkyBWwATdasXpYHPdTEzyjgLxxjANbsphPyWbdrVtvLBzssgZ3+2NuiN4YrY2FPiUekXKlBNZ0Mx0FqP+zPhYfGyyt1x1mkxNty5oC/vdHoir1q50raxMsyTY3Zikg5nr0MQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657156; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=762Vx2LMJUF0HARuDCs9/bQDEvW9w9fDjGoV8Fkl8cI=; b=A4VBXzeUCVsxzgHAXMoi9WO0FAK674AG46cKEw1ZGzC09uHEN8j6EfZugiZ+BkwFyJQFvN2oFg7zp2E5OyFSAZf3+9gZGFNXh5tDhMsCvJYa/LBZv3FF61FkNT3+0mDyXGwcdhQMyjd82HZ/5HrtpuCjhf/+2h5cVHYknbHi4Lk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657156796767.5736920154525; Wed, 18 Dec 2019 00:19:16 -0800 (PST) Received: from localhost ([::1]:50910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUY6-0007pR-Ov for importer@patchew.org; Wed, 18 Dec 2019 03:19:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35295) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWP-0005wE-Gg for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWN-0002P3-K3 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:29 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:40332 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWN-0002NT-GR for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:27 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-331-rXvlsSR2OUW9I-uLqfIKnw-1; Wed, 18 Dec 2019 03:17:23 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01D5D800D50 for ; Wed, 18 Dec 2019 08:17:23 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C7E485C28D for ; Wed, 18 Dec 2019 08:17:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 531A811385EE; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=762Vx2LMJUF0HARuDCs9/bQDEvW9w9fDjGoV8Fkl8cI=; b=W6JFKmBCKKnLVX8o66LbEjodbn5tFtnBCUt15EtIKaL9R0JOtDAmURCkfOxJRFdOSMe6q1 50YyFsdmt6GAFIHA7tQYZ0d146Rpbc5evepM9Bz34bhRcb+qW4KOSvAoOgidEdfDX3N64W a9IwhgN56sSvrqdJ0xpBa4CBu5iUYZY= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 01/35] error: Fix -msg timestamp default Date: Wed, 18 Dec 2019 09:16:47 +0100 Message-Id: <20191218081721.23520-2-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: rXvlsSR2OUW9I-uLqfIKnw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" -msg parameter "timestamp" defaults to "off" if you don't specify msg, and to "on" if you do. Messed up right in commit 5e2ac51917 "add timestamp to error_report()". Mostly harmless, because "timestamp" is the only parameter, so "if you do" is "-msg ''", which nobody does. Change the default to "off" no matter what. While there, rename enable_timestamp_msg to error_with_timestamp, and polish documentation. Signed-off-by: Markus Armbruster Message-Id: <20191010081508.8978-1-armbru@redhat.com> --- include/qemu/error-report.h | 3 ++- util/qemu-error.c | 6 ++++-- vl.c | 2 +- qemu-options.hx | 10 +++++++--- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/include/qemu/error-report.h b/include/qemu/error-report.h index 00d069b20f..87532d8596 100644 --- a/include/qemu/error-report.h +++ b/include/qemu/error-report.h @@ -73,6 +73,7 @@ void error_init(const char *argv0); }) =20 const char *error_get_progname(void); -extern bool enable_timestamp_msg; + +extern bool error_with_timestamp; =20 #endif diff --git a/util/qemu-error.c b/util/qemu-error.c index f373f3b3b0..dac7c7dc50 100644 --- a/util/qemu-error.c +++ b/util/qemu-error.c @@ -24,6 +24,9 @@ typedef enum { REPORT_TYPE_INFO, } report_type; =20 +/* Prepend timestamp to messages */ +bool error_with_timestamp; + int error_printf(const char *fmt, ...) { va_list ap; @@ -191,7 +194,6 @@ static void print_loc(void) } } =20 -bool enable_timestamp_msg; /* * Print a message to current monitor if we have one, else to stderr. * @report_type is the type of message: error, warning or informational. @@ -204,7 +206,7 @@ static void vreport(report_type type, const char *fmt, = va_list ap) GTimeVal tv; gchar *timestr; =20 - if (enable_timestamp_msg && !cur_mon) { + if (error_with_timestamp && !cur_mon) { g_get_current_time(&tv); timestr =3D g_time_val_to_iso8601(&tv); error_printf("%s ", timestr); diff --git a/vl.c b/vl.c index 94508300c3..908a9e1d1e 100644 --- a/vl.c +++ b/vl.c @@ -1139,7 +1139,7 @@ static void realtime_init(void) =20 static void configure_msg(QemuOpts *opts) { - enable_timestamp_msg =3D qemu_opt_get_bool(opts, "timestamp", true); + error_with_timestamp =3D qemu_opt_get_bool(opts, "timestamp", false); } =20 =20 diff --git a/qemu-options.hx b/qemu-options.hx index c63e794b64..b2cb1debe6 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4167,13 +4167,17 @@ DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_= I386) =20 DEF("msg", HAS_ARG, QEMU_OPTION_msg, "-msg timestamp[=3Don|off]\n" - " change the format of messages\n" - " on|off controls leading timestamps (default:on)\n", + " control error message format\n" + " timestamp=3Don enables timestamps (default: off)\n", QEMU_ARCH_ALL) STEXI @item -msg timestamp[=3Don|off] @findex -msg -prepend a timestamp to each log message.(default:on) +Control error message format. +@table @option +@item timestamp=3Don|off +Prefix messages with a timestamp. Default is off. +@end table ETEXI =20 DEF("dump-vmstate", HAS_ARG, QEMU_OPTION_dump_vmstate, --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657319; cv=none; d=zohomail.com; s=zohoarc; b=hL89qhHDVprUogJVPWsUwaAAHXD9Tjbl4TQ573cZPnW92PkzEQDjFdGWUjYPIbDzDRQB1/XTpmPn8KP4VFV9S8vrzo0vSatGlxHz4Lp0qUyouOHy4mO8DvM1EDp/6/HmoaeGBf2n7eTVyl3epAiNKAOjCyQgsE3L6PYFpouIryI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657319; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KZJeOEY4eRF6InDe+J/5KZHJUaDHGpLvvRpZ4QkLj2o=; b=eCvoYrWK4nBIiWrTptnipDz651iQM8A5GWvtB3ejOk++geAetVi15E2Xx5NvsXCPFNbUQ9OPPLjFk9rgVm+Cp2iDwLx5HCY9kbr6PCstpQrqGVkUPt29n76fo8YWyUqn5/MSCNSNCQlrnjfhh0ebI+E8BledFvVBPDj9IhembYI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657319179260.8529797577654; Wed, 18 Dec 2019 00:21:59 -0800 (PST) Received: from localhost ([::1]:50952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUaj-00035A-9l for importer@patchew.org; Wed, 18 Dec 2019 03:21:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35460) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWR-0005wf-G0 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWP-0002RT-Nw for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:31 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21728 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWP-0002PS-Gb for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:29 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-176-090fOCR_M5GJXuvH9cJS-Q-1; Wed, 18 Dec 2019 03:17:23 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 049FB801E6C; Wed, 18 Dec 2019 08:17:23 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C7ED05DA32; Wed, 18 Dec 2019 08:17:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5765011385FD; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KZJeOEY4eRF6InDe+J/5KZHJUaDHGpLvvRpZ4QkLj2o=; b=VgD8SM+CT5qUU7x3ZrRX14wMO9tg1NdxubNxW66xoKoVWQxPm1/uwuPNDmkh3bZeZdF4qc R4Krk/TbZRBzyNDdTGDmPwTiiQV3e7zxxUFs0h0lGrsBbUYIlAVt6tymb8uDwR7fbHGIIP c6RurhdWAUEL78BwFgifAo60hlnNmO8= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 02/35] crypto: Fix certificate file error handling crash bug Date: Wed, 18 Dec 2019 09:16:48 +0100 Message-Id: <20191218081721.23520-3-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 090fOCR_M5GJXuvH9cJS-Q-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" qcrypto_tls_creds_load_cert() passes uninitialized GError *gerr by reference to g_file_get_contents(). When g_file_get_contents() fails, it'll try to set a GError. Unless @gerr is null by dumb luck, this logs a ERROR_OVERWRITTEN_WARNING warning message and leaves @gerr unchanged. qcrypto_tls_creds_load_cert() then dereferences the uninitialized @gerr. Fix by initializing @gerr properly. Fixes: 9a2fd4347c40321f5cbb4ab4220e759fcbf87d03 Cc: "Daniel P. Berrang=C3=A9" Signed-off-by: Markus Armbruster Message-Id: <20191204093625.14836-2-armbru@redhat.com> Acked-by: Daniel P. Berrang=C3=A9 Reviewed-by: Vladimir Sementsov-Ogievskiy --- crypto/tlscredsx509.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index 01fc304e5d..53a4368f49 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -380,7 +380,7 @@ qcrypto_tls_creds_load_cert(QCryptoTLSCredsX509 *creds, gnutls_x509_crt_t cert =3D NULL; g_autofree char *buf =3D NULL; gsize buflen; - GError *gerr; + GError *gerr =3D NULL; int ret =3D -1; int err; =20 --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658674; cv=none; d=zohomail.com; s=zohoarc; b=aU/ncYhu/zWcW699glLPBrDOy8EZdTOJCrd5qnqxubFbUeWoTUpL87e0jyf8WCjlyQMl8ZICrgA2Ow03MMp6d9YRV1HxNDxQohOd7sjR/2BKvtnqWibIygQknGVLK2VuhDsS1ptLY12w7uS7USr3jlhcF3QIkgAy4i4E/DUZLSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658674; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/tVBYCCeRLVyWYxHGrpbDLXgoURGxLO3XIVAA0t0XFA=; b=C4gtjnzIFN44L7Wste4pPhI3oRRIaRaxlE4uZsbMRE4RbsJVrKjJV9FoP6CeFw0Znit1DaSeZC2LuU8okPbQmwxDEItdktjQIMpPndJ0o1DVVfdxIr4YnQvaLpopV6JpLDLRHUXloEuUGkHCW9VmezTEeRAbgylTB1SVWK/F3nI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658674801882.9556293716599; Wed, 18 Dec 2019 00:44:34 -0800 (PST) Received: from localhost ([::1]:51264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUwb-0001oN-Ke for importer@patchew.org; Wed, 18 Dec 2019 03:44:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40515) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUX4-0006ns-Dt for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:18:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUX3-0003gZ-EP for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:18:10 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:25613 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUX3-0003fq-Ax for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:18:09 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-345-FjvizVrEMsG5qtP2URbzKA-1; Wed, 18 Dec 2019 03:17:24 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0903810054E3; Wed, 18 Dec 2019 08:17:23 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CC88468887; Wed, 18 Dec 2019 08:17:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5B1A41138613; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/tVBYCCeRLVyWYxHGrpbDLXgoURGxLO3XIVAA0t0XFA=; b=CRhWS1zpWJ0GAc/ttsNQLhT4nzIrG1qzcioH6QXdEZUhYaNi6JujisqU4s9W1Zcj6+KEhh p8OEsPJjYfMcLfbLPMX+0KrTYvGx+oTZTIX4xc2f/lXfUXz/wkrP/gE/daCPlMDJVasXYr S0VtYPfRo3wkmgf0fxHIYzjJnrchJZ4= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 03/35] crypto: Fix typo in QCryptoTLSSession's comment Date: Wed, 18 Dec 2019 09:16:49 +0100 Message-Id: <20191218081721.23520-4-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: FjvizVrEMsG5qtP2URbzKA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Cc: "Daniel P. Berrang=C3=A9" Signed-off-by: Markus Armbruster Message-Id: <20191204093625.14836-3-armbru@redhat.com> Acked-by: Daniel P. Berrang=C3=A9 Reviewed-by: Vladimir Sementsov-Ogievskiy --- include/crypto/tlssession.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/crypto/tlssession.h b/include/crypto/tlssession.h index e01e1a9dc2..15b9cef086 100644 --- a/include/crypto/tlssession.h +++ b/include/crypto/tlssession.h @@ -56,7 +56,7 @@ * * static int mysock_run_tls(int sockfd, * QCryptoTLSCreds *creds, - * Error *errp) + * Error **errp) * { * QCryptoTLSSession *sess; * --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658281; cv=none; d=zohomail.com; s=zohoarc; b=CA3nmYqe9KYojZzoBrsPuFOIzmLThArpJ6DQwiZ4DGXMwSDbnVcZEH6P2X/8B3HrL2eojDQHW7bjs+PR1l25oCqKRZx+o59bXBfJmjTGf3CzM/xu4F3XJ+Q5zkCWoPO2WjHQbatwXQQcdFSrj8elN5wdkVjrdFzbCBesiCMrYHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658281; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FSFcGrBdiF5asUPbm31sMiaIARtEpeFVG5XBAGSASXs=; b=RVIy4GAJQaI5jBssR6jFE9xTJBqSZrI7eesjaEf/A2yaryZwMur/QM9OaYmss1amFyHWNyRcjAhDG0srxynuVoGjlL3ZaieXc9vXUFoDqutFc6MfeT3LOxRNR2VLEngqtKB7NJ6NIcDM6A4wNqNK/+7pozpgnN9amLvdQR0vdEA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658281719178.95828978015948; Wed, 18 Dec 2019 00:38:01 -0800 (PST) Received: from localhost ([::1]:51170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUqG-0008HX-76 for importer@patchew.org; Wed, 18 Dec 2019 03:38:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35973) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWZ-00065z-Bj for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWW-0002Z0-L1 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:38 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:50159 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWU-0002UW-Rx for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:35 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-345-Q-HPLf8gOl2mrwIaRV37Tg-1; Wed, 18 Dec 2019 03:17:24 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0A92D1005502; Wed, 18 Dec 2019 08:17:23 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CF7037C839; Wed, 18 Dec 2019 08:17:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 608551138617; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FSFcGrBdiF5asUPbm31sMiaIARtEpeFVG5XBAGSASXs=; b=cmkeWKx6+wua/5y4TKXsJHGcF+VYbpvl0eUE8NPMfby5RhYS/wsE1fETNmjXuTtRVprVM5 Mojc+6yZh2v4IbfBmFHUqzMbe1dZL5/A3c9nmS/SGk8ZjaAUez9kmtagQK1JS+Mf+4bL44 c8i58nLs0nXClGDY+TUie1vIX1WdnVg= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 04/35] io: Fix Error usage in a comment Date: Wed, 18 Dec 2019 09:16:50 +0100 Message-Id: <20191218081721.23520-5-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: Q-HPLf8gOl2mrwIaRV37Tg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Cc: "Daniel P. Berrang=C3=A9" Signed-off-by: Markus Armbruster Message-Id: <20191204093625.14836-4-armbru@redhat.com> Acked-by: Daniel P. Berrang=C3=A9 Reviewed-by: Vladimir Sementsov-Ogievskiy --- include/io/task.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/io/task.h b/include/io/task.h index 5cb9faf9f2..1abbfb8b65 100644 --- a/include/io/task.h +++ b/include/io/task.h @@ -119,7 +119,7 @@ typedef void (*QIOTaskWorker)(QIOTask *task, * gboolean myobject_operation_timer(gpointer opaque) * { * QIOTask *task =3D QIO_TASK(opaque); - * Error *err;* + * Error *err =3D NULL; * * ...check something important... * if (err) { --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657470; cv=none; d=zohomail.com; s=zohoarc; b=SewEEzZU8EJymOyyRVrr9dpO5fYTthdO2gf/gM5KckOJKcqq+bWEhEOgH4mqaW0RpCiBZZKRpFwfZ+kmJ0a7eM5lpZjZLxE3cij4g6+vA13pliCxgAMtDYeEsqpF0xuCI8Oxw16wC1+OsiHX88UrP5kFcRu+iMDsdmnaJP/LZR8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657470; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SMmGA4SL0fTH3yWHfTIz2dVZZmLMWLG/6f3jbvKKD/Y=; b=HMpj11bDNJ9MKSfCj3VWTH2fXWtIM3jJMuAcfT4w5W+mCWip7DLt+hMdUpN6qvs+8hKkDLqIzb8iAxQyt53gGaMmaBM9Zb730iWC8/JQ17ppv4V5w68nxodDQyvwPuv7p3AOM61epoXp/Rkgit3Y8r73wQLtYfvq+9O0ZVBZn5M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657470186286.39030706391486; Wed, 18 Dec 2019 00:24:30 -0800 (PST) Received: from localhost ([::1]:50978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUdA-0006i4-9e for importer@patchew.org; Wed, 18 Dec 2019 03:24:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35563) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWT-0005yO-2U for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWQ-0002S7-Rr for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:32 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:42317) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWP-0002Q5-Mn for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:29 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-3-taWfKSiFN7u0Wo_J7kJwBQ-1; Wed, 18 Dec 2019 03:17:28 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01144107ACC9; Wed, 18 Dec 2019 08:17:27 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F97F1000325; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6261E11385A7; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SMmGA4SL0fTH3yWHfTIz2dVZZmLMWLG/6f3jbvKKD/Y=; b=LyCgwuZk16vV/DEWWAfTPNi39D/nY9PCFHQA5LznOAIUhYBoRzsTs0LqdPGERrLuG5xc7U Hyhc28LtxN+d4NY0PS44hlInXs5NhsPProJHSAx7Ifgl/oNbTU6Qn+q1kiuFq1/u3PquAr MKaTs1NJoEH+Gx/yfTNUQf1wCzyvdGA= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 05/35] tests: Clean up initialization of Error *err variables Date: Wed, 18 Dec 2019 09:16:51 +0100 Message-Id: <20191218081721.23520-6-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: taWfKSiFN7u0Wo_J7kJwBQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Vladimir Sementsov-Ogievskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Declaring a local Error *err without initializer looks suspicious. Fuse the declaration with the initialization to avoid that. Signed-off-by: Markus Armbruster Message-Id: <20191204093625.14836-5-armbru@redhat.com> Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Vladimir Sementsov-Ogievskiy --- tests/test-qobject-output-visitor.c | 8 ++++---- tests/test-string-output-visitor.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-outpu= t-visitor.c index 3e993e5ba8..d7761ebf84 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -145,10 +145,10 @@ static void test_visitor_out_enum_errors(TestOutputVi= sitorData *data, const void *unused) { EnumOne i, bad_values[] =3D { ENUM_ONE__MAX, -1 }; - Error *err; =20 for (i =3D 0; i < ARRAY_SIZE(bad_values) ; i++) { - err =3D NULL; + Error *err =3D NULL; + visit_type_EnumOne(data->ov, "unused", &bad_values[i], &err); error_free_or_abort(&err); visitor_reset(data); @@ -240,11 +240,11 @@ static void test_visitor_out_struct_errors(TestOutput= VisitorData *data, EnumOne bad_values[] =3D { ENUM_ONE__MAX, -1 }; UserDefOne u =3D {0}; UserDefOne *pu =3D &u; - Error *err; int i; =20 for (i =3D 0; i < ARRAY_SIZE(bad_values) ; i++) { - err =3D NULL; + Error *err =3D NULL; + u.has_enum1 =3D true; u.enum1 =3D bad_values[i]; visit_type_UserDefOne(data->ov, "unused", &pu, &err); diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-= visitor.c index 02766c0f65..1be1540767 100644 --- a/tests/test-string-output-visitor.c +++ b/tests/test-string-output-visitor.c @@ -207,10 +207,10 @@ static void test_visitor_out_enum_errors(TestOutputVi= sitorData *data, const void *unused) { EnumOne i, bad_values[] =3D { ENUM_ONE__MAX, -1 }; - Error *err; =20 for (i =3D 0; i < ARRAY_SIZE(bad_values) ; i++) { - err =3D NULL; + Error *err =3D NULL; + visit_type_EnumOne(data->ov, "unused", &bad_values[i], &err); error_free_or_abort(&err); } --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657158; cv=none; d=zohomail.com; s=zohoarc; b=RBxuhU5scKPSd6CZnuit1hSYWCMrUqdG2hfb3RR7zCjvUEvg5pPuMbpsVvM/P3AcMLPD2VUj2UxkM714MzbBWtvJdhyw3WDyCjkgIX6VPksGJ+RPoUobo55N+7FCCw5UYPD+ePoJ6D5sFfsIoCsM1mget0vD3ZSPNa9xVZow4kk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657158; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6HKGEEN/2k71Y/eOrbi6sjc52VczmaHxNAwUf3PdFXI=; b=KrIsc1HCrEOicbFu01dgr05dVv+PPV114omcVgqe6d7Qq1SjtTE7t1D0HncdJZ8g0Pg2UB79umLg78BRnGaJvbqrGYJ33TSK4glNKJbDrLq5B2m7l9+xfky3YUhQ4tl9eBBIo6k90qkmwdBiTMcfO4LKSnL6DU9uBoTRiE5ElLk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157665715813167.8230943387124; Wed, 18 Dec 2019 00:19:18 -0800 (PST) Received: from localhost ([::1]:50916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUY8-0007vU-KW for importer@patchew.org; Wed, 18 Dec 2019 03:19:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35475) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWR-0005wh-Gw for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWP-0002R2-Mf for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:30 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:54678 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWP-0002Pn-F0 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:29 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-272-iXIBjZg1PW2iasf4z4LzaQ-1; Wed, 18 Dec 2019 03:17:27 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DA2D81854330 for ; Wed, 18 Dec 2019 08:17:26 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3FBD726DC7; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 65A4211385CB; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6HKGEEN/2k71Y/eOrbi6sjc52VczmaHxNAwUf3PdFXI=; b=Q5oIfKLhD1hzNzCQuAwD6eyHI+s6UdR6yGag9Q7aE0xghuSmHKDEcPIi6dYX32IFHqCfXy BvMS8EOfdLsfX8f6hiza2CiZ/Hj1C7y1q3enLNbmwUIy5Vt6TVDwV2JiINxN/NTgsGZOkE OH1IZhlKCZdRJXkeZVuf2oLfK0IvkSE= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 06/35] exec: Fix file_ram_alloc() error API violations Date: Wed, 18 Dec 2019 09:16:52 +0100 Message-Id: <20191218081721.23520-7-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: iXIBjZg1PW2iasf4z4LzaQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" When os_mem_prealloc() fails, file_ram_alloc() calls qemu_ram_munmap() and returns null. Except it doesn't when its @errp argument is null, because it checks for failure with (errp && *errp). Introduced in commit 056b68af77 "fix qemu exit on memory hotplug when allocation fails at prealloc time". No caller actually passes null. Fix anyway: splice in a local Error *err, and error_propagate(). Cc: Igor Mammedov Signed-off-by: Markus Armbruster Reviewed-by: Igor Mammedov Message-Id: <20191204093625.14836-6-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- exec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index a34c348184..6bd4aa1d87 100644 --- a/exec.c +++ b/exec.c @@ -1843,6 +1843,7 @@ static void *file_ram_alloc(RAMBlock *block, bool truncate, Error **errp) { + Error *err =3D NULL; MachineState *ms =3D MACHINE(qdev_get_machine()); void *area; =20 @@ -1900,8 +1901,9 @@ static void *file_ram_alloc(RAMBlock *block, } =20 if (mem_prealloc) { - os_mem_prealloc(fd, area, memory, ms->smp.cpus, errp); - if (errp && *errp) { + os_mem_prealloc(fd, area, memory, ms->smp.cpus, &err); + if (err) { + error_propagate(errp, err); qemu_ram_munmap(fd, area, memory); return NULL; } --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657159; cv=none; d=zohomail.com; s=zohoarc; b=kGD9S+GB5noV7kl6qS8c1iOueaCvmgGuv5FOL2PR/IqNWsF+RPtHHZHP2tACZwLOvqEJe6br5Vag9iCYcIsOi7d47kmUoIZrseRIiycTssw1yROeOVrK8m4i0Mx5ujH6vcg3zh88Ebv5SYxha6Osmt7Z2c1/2g79dW/e5G4dDl0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657159; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QVnaCBinN0VE5AFdXTdiBTMzWvyDhGUr6yaVglp9a9g=; b=awwWkjl5hEYngtkZDcyS9SeNhVKvAHxVBqHsNVPWsWLo5LQj/3HDtV02YLfPOzyjkjX223STiiTzoYE0njr1vygaPhSMhRlj1NKe3XPuqP0Vlx1Fa1OKGAO34+1cAGNMyB5//S5UPn3goF2oPDUdrUF0uTBwcQm1ZXfS7ACq2KY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657159240640.1895697534479; Wed, 18 Dec 2019 00:19:19 -0800 (PST) Received: from localhost ([::1]:50914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUY9-0007uR-MD for importer@patchew.org; Wed, 18 Dec 2019 03:19:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35468) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWR-0005wg-GQ for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWP-0002RL-Ok for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:31 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:20734 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWP-0002Pl-FN for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:29 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-39-LFoEcHSEMp6eohWNjqWZhg-1; Wed, 18 Dec 2019 03:17:27 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id E206F800D48 for ; Wed, 18 Dec 2019 08:17:26 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 40A9D5D9E5; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 68E6211385D4; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QVnaCBinN0VE5AFdXTdiBTMzWvyDhGUr6yaVglp9a9g=; b=EknfO7cD6ZdmimJNkCyUj8N54LZJaWOGXHPEdGfPBUIApO08UVwlhD3NL2BBTboE+sG1b3 mSfrQ9TLVVuO50l6v0iFFHVEg14V/+Xb9dn/9QioS6ikT5y+ORegc6sTmlausAKM8Qc0lc Tq3um/mClnbScBh1QW8Bzw51v+AX5DQ= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 07/35] hw/acpi: Fix legacy CPU plug error API violations Date: Wed, 18 Dec 2019 09:16:53 +0100 Message-Id: <20191218081721.23520-8-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: LFoEcHSEMp6eohWNjqWZhg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" legacy_acpi_cpu_plug_cb() dereferences @errp when acpi_set_cpu_present_bit() fails. That's wrong; see the big comment in error.h. Introduced in commit cc43364de7 "acpi/cpu-hotplug: introduce helper function to keep bit setting in one place". No caller actually passes null, and acpi_set_cpu_present_bit() can't actually fail. Fix anyway: drop acpi_set_cpu_present_bit()'s @errp parameter. Cc: "Michael S. Tsirkin" Cc: Igor Mammedov Signed-off-by: Markus Armbruster Reviewed-by: Igor Mammedov Message-Id: <20191204093625.14836-7-armbru@redhat.com> Reviewed-by: Michael S. Tsirkin --- hw/acpi/cpu_hotplug.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index 3ac2045a95..9c3bcc84de 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -55,8 +55,7 @@ static const MemoryRegionOps AcpiCpuHotplug_ops =3D { }, }; =20 -static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu, - Error **errp) +static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu) { CPUClass *k =3D CPU_GET_CLASS(cpu); int64_t cpu_id; @@ -74,10 +73,7 @@ static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, = CPUState *cpu, void legacy_acpi_cpu_plug_cb(HotplugHandler *hotplug_dev, AcpiCpuHotplug *g, DeviceState *dev, Error **= errp) { - acpi_set_cpu_present_bit(g, CPU(dev), errp); - if (*errp !=3D NULL) { - return; - } + acpi_set_cpu_present_bit(g, CPU(dev)); acpi_send_event(DEVICE(hotplug_dev), ACPI_CPU_HOTPLUG_STATUS); } =20 @@ -92,7 +88,7 @@ void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, O= bject *owner, gpe_cpu->device =3D owner; =20 CPU_FOREACH(cpu) { - acpi_set_cpu_present_bit(gpe_cpu, cpu, &error_abort); + acpi_set_cpu_present_bit(gpe_cpu, cpu); } } =20 --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658638; cv=none; d=zohomail.com; s=zohoarc; b=BwZitBsN60nKwcTXSFaZlNYIHMSJcELP24/saJF2bdCm4G4uBlCvWMnzBSphkyT1aqrFlInV1KT0952SXtwisGzlZ+2H4XWqmlzoe+bvV84hvyQQo22yD+1TVb55m3+FylwgJHwpCuMyJH/z2xSpgE8zqwzxFEKO1SXkX1lzK8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658638; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KaXK1sLPfIPPUrPRoQaoOCLoMDQhgCjGoky0wIOIPBk=; b=fMvKAq9DyVGE2hhtlNlmnQBLXTgQ/32p1jdpsexYpqYxKGq5S4i//slH7J9KAhLlY8W5Ltgq6X6yiYEuk0YoDIqsBUAZZpxXpkAYV67NjxD2A4akFI2XwOMh+XPI12ykoiOl7HJNXccawc0+Vv6NCBBKZWwvpk1J4kzJ/7O6Fto= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658638059377.18297513524465; Wed, 18 Dec 2019 00:43:58 -0800 (PST) Received: from localhost ([::1]:51260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUw0-0000of-Jq for importer@patchew.org; Wed, 18 Dec 2019 03:43:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40664) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUX5-0006pX-Ev for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:18:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUX4-0003jY-AE for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:18:11 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:58249 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUX4-0003id-6N for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:18:10 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-83-jLMXwiqzMOmn1RXIFS-f8g-1; Wed, 18 Dec 2019 03:17:28 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4B1BE800D53; Wed, 18 Dec 2019 08:17:27 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 42FA260C18; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6C38011385D5; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KaXK1sLPfIPPUrPRoQaoOCLoMDQhgCjGoky0wIOIPBk=; b=LaOGcDSIBr66gYWhni2jyPy3g+S5vLzO+B/Z6cjMRY3piZSfoI9iUBvNwwT+fRFUT595Wl Q8CWcvadw+tJ9L/NIjeB/YyljIAiz/Nsjr8G9s8M4ghQzqAhmlxPLUx1g7NPVPNJk2SSTO l0BIow32K4IhrG++2RjC1VyfShVTpFI= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 08/35] hw/core: Fix fit_load_fdt() error API violations Date: Wed, 18 Dec 2019 09:16:54 +0100 Message-Id: <20191218081721.23520-9-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: jLMXwiqzMOmn1RXIFS-f8g-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" fit_load_fdt() passes @errp to fit_image_addr(), then recovers from ENOENT failures. Passing @errp is wrong, because it works only as long as @errp is neither @error_fatal nor @error_abort. Error recovery dereferences @errp. That's also wrong; see the big comment in error.h. Error recovery can leave *errp pointing to a freed Error object. Wrong, it must be null on success. Messed up in commit 3eb99edb48 "loader-fit: Wean off error_printf()". No caller actually passes such values, or uses *errp on success. Fix anyway: splice in a local Error *err, and error_propagate(). Signed-off-by: Markus Armbruster Message-Id: <20191204093625.14836-8-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Vladimir Sementsov-Ogievskiy --- hw/core/loader-fit.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c index 953b16bc82..c465921b8f 100644 --- a/hw/core/loader-fit.c +++ b/hw/core/loader-fit.c @@ -178,11 +178,12 @@ static int fit_load_fdt(const struct fit_loader *ldr,= const void *itb, int cfg, void *opaque, const void *match_data, hwaddr kernel_end, Error **errp) { + Error *err =3D NULL; const char *name; const void *data; const void *load_data; hwaddr load_addr; - int img_off, err; + int img_off; size_t sz; int ret; =20 @@ -197,13 +198,13 @@ static int fit_load_fdt(const struct fit_loader *ldr,= const void *itb, return -EINVAL; } =20 - err =3D fit_image_addr(itb, img_off, "load", &load_addr, errp); - if (err =3D=3D -ENOENT) { + ret =3D fit_image_addr(itb, img_off, "load", &load_addr, &err); + if (ret =3D=3D -ENOENT) { load_addr =3D ROUND_UP(kernel_end, 64 * KiB) + (10 * MiB); - error_free(*errp); - } else if (err) { - error_prepend(errp, "unable to read FDT load address from FIT: "); - ret =3D err; + error_free(err); + } else if (ret) { + error_propagate_prepend(errp, err, + "unable to read FDT load address from FIT:= "); goto out; } =20 --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658413; cv=none; d=zohomail.com; s=zohoarc; b=KBzGN/EFsrfD9Wo/LKuCxYbbgEVV+DxK0nLIbVY/RzdthhMl93WJh8xd6fliOUXnOnjs327auXDSbKAXYL86QmpdiT8shOQAtRjUH+3DwnCsNCW0WA2MpHo+eJVp0izGlY3x6dcAA3gKVzMYElyTQH+idahMiDXXGfQxGW0Q85s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658413; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WJkfHcaxEpYm5hhWlCXM/SGv2lErq8lQvcIGyEnWk0o=; b=H6Uj5xveRHnR9nVHNFdyxK6yixhfXnZ7fHChEfKY4O9owrKASHRDZe5SokD634GEitnIkvoZgAO6sivQuKp/weKaTiil+w+ZeG3TvX/QMjEM8qEHxikx1o5VccWo4IEKJZp052cHVoIAc9Xlz9XvM8EMG9Vkv7MLzl9/P9D3AHg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658413833803.5348640181022; Wed, 18 Dec 2019 00:40:13 -0800 (PST) Received: from localhost ([::1]:51190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUsO-0003aM-IJ for importer@patchew.org; Wed, 18 Dec 2019 03:40:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48180) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUbq-0005GL-SL for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:23:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUbn-0003so-25 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:23:06 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22304 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUbm-0003qk-Sv for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:23:02 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-427-z9CALGMjPMKswouCZ8xO_g-1; Wed, 18 Dec 2019 03:17:26 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AFCB5185432F; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7E98D1001281; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6FC8811384AA; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WJkfHcaxEpYm5hhWlCXM/SGv2lErq8lQvcIGyEnWk0o=; b=MnR4Jk1gKHfsXdEIhZ95mdYmJ5Kb8xU6yUWX8Kl7U2eVl/rfpasQm76ACS3kPL6LMrnPZ0 nRX8V1U5+zNUJC/CEH5s3Psr7dnc9Y3+MPPGvveL96rfXUgKW9+HPLbxEeX7C1TrGotPfN iPpa/B8UiYoW+cEqoWCUtkWqa7XHCfg= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 09/35] hw/ipmi: Fix realize() error API violations Date: Wed, 18 Dec 2019 09:16:55 +0100 Message-Id: <20191218081721.23520-10-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: z9CALGMjPMKswouCZ8xO_g-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" isa_ipmi_bt_realize(), ipmi_isa_realize(), pci_ipmi_bt_realize(), and pci_ipmi_kcs_realize() dereference @errp when IPMIInterfaceClass method init() fails. That's wrong; see the big comment in error.h. Introduced in commit 0719029c47 "ipmi: Add an ISA KCS low-level interface", then imitated in commit a9b74079cb "ipmi: Add a BT low-level interface" and commit 12f983c6aa "ipmi: Add PCI IPMI interfaces". No caller actually passes null. Fix anyway: splice in a local Error *err, and error_propagate(). Cc: Corey Minyard Signed-off-by: Markus Armbruster Message-Id: <20191204093625.14836-9-armbru@redhat.com> --- hw/ipmi/isa_ipmi_bt.c | 7 +++++-- hw/ipmi/isa_ipmi_kcs.c | 7 +++++-- hw/ipmi/pci_ipmi_bt.c | 6 ++++-- hw/ipmi/pci_ipmi_kcs.c | 6 ++++-- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index 9a87ffd3f0..9fba5ed383 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -70,6 +70,7 @@ static void isa_ipmi_bt_lower_irq(IPMIBT *ib) =20 static void isa_ipmi_bt_realize(DeviceState *dev, Error **errp) { + Error *err =3D NULL; ISADevice *isadev =3D ISA_DEVICE(dev); ISAIPMIBTDevice *iib =3D ISA_IPMI_BT(dev); IPMIInterface *ii =3D IPMI_INTERFACE(dev); @@ -85,9 +86,11 @@ static void isa_ipmi_bt_realize(DeviceState *dev, Error = **errp) iib->bt.bmc->intf =3D ii; iib->bt.opaque =3D iib; =20 - iic->init(ii, 0, errp); - if (*errp) + iic->init(ii, 0, &err); + if (err) { + error_propagate(errp, err); return; + } =20 if (iib->isairq > 0) { isa_init_irq(isadev, &iib->irq, iib->isairq); diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index ca3ea36a3f..cc6bd817f2 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.c @@ -69,6 +69,7 @@ static void isa_ipmi_kcs_lower_irq(IPMIKCS *ik) =20 static void ipmi_isa_realize(DeviceState *dev, Error **errp) { + Error *err =3D NULL; ISADevice *isadev =3D ISA_DEVICE(dev); ISAIPMIKCSDevice *iik =3D ISA_IPMI_KCS(dev); IPMIInterface *ii =3D IPMI_INTERFACE(dev); @@ -84,9 +85,11 @@ static void ipmi_isa_realize(DeviceState *dev, Error **e= rrp) iik->kcs.bmc->intf =3D ii; iik->kcs.opaque =3D iik; =20 - iic->init(ii, 0, errp); - if (*errp) + iic->init(ii, 0, &err); + if (err) { + error_propagate(errp, err); return; + } =20 if (iik->isairq > 0) { isa_init_irq(isadev, &iik->irq, iik->isairq); diff --git a/hw/ipmi/pci_ipmi_bt.c b/hw/ipmi/pci_ipmi_bt.c index 6ed925a665..ba9cf016b5 100644 --- a/hw/ipmi/pci_ipmi_bt.c +++ b/hw/ipmi/pci_ipmi_bt.c @@ -54,6 +54,7 @@ static void pci_ipmi_lower_irq(IPMIBT *ik) =20 static void pci_ipmi_bt_realize(PCIDevice *pd, Error **errp) { + Error *err =3D NULL; PCIIPMIBTDevice *pik =3D PCI_IPMI_BT(pd); IPMIInterface *ii =3D IPMI_INTERFACE(pd); IPMIInterfaceClass *iic =3D IPMI_INTERFACE_GET_CLASS(ii); @@ -74,8 +75,9 @@ static void pci_ipmi_bt_realize(PCIDevice *pd, Error **er= rp) pik->bt.raise_irq =3D pci_ipmi_raise_irq; pik->bt.lower_irq =3D pci_ipmi_lower_irq; =20 - iic->init(ii, 8, errp); - if (*errp) { + iic->init(ii, 8, &err); + if (err) { + error_propagate(errp, err); return; } pci_register_bar(pd, 0, PCI_BASE_ADDRESS_SPACE_IO, &pik->bt.io); diff --git a/hw/ipmi/pci_ipmi_kcs.c b/hw/ipmi/pci_ipmi_kcs.c index eeba63baa4..99f46152f4 100644 --- a/hw/ipmi/pci_ipmi_kcs.c +++ b/hw/ipmi/pci_ipmi_kcs.c @@ -54,6 +54,7 @@ static void pci_ipmi_lower_irq(IPMIKCS *ik) =20 static void pci_ipmi_kcs_realize(PCIDevice *pd, Error **errp) { + Error *err =3D NULL; PCIIPMIKCSDevice *pik =3D PCI_IPMI_KCS(pd); IPMIInterface *ii =3D IPMI_INTERFACE(pd); IPMIInterfaceClass *iic =3D IPMI_INTERFACE_GET_CLASS(ii); @@ -74,8 +75,9 @@ static void pci_ipmi_kcs_realize(PCIDevice *pd, Error **e= rrp) pik->kcs.raise_irq =3D pci_ipmi_raise_irq; pik->kcs.lower_irq =3D pci_ipmi_lower_irq; =20 - iic->init(ii, 8, errp); - if (*errp) { + iic->init(ii, 8, &err); + if (err) { + error_propagate(errp, err); return; } pci_register_bar(pd, 0, PCI_BASE_ADDRESS_SPACE_IO, &pik->kcs.io); --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657476; cv=none; d=zohomail.com; s=zohoarc; b=K1WYtZdbCeQw/4ueOCGSZl035Zs6HvwZbiyGHBDbVqEEbJmUHgipOMAor7LScSgL8LaotK3S0I7nLLQzSXm7hz45cQG5rleq5yyzUDJyGX66SJCix7xk/QUlSzwA5VtCWvNeGz9Rglbcn6avTqvQulDzQOoXpcsue9YrfAGLm/8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657476; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tG58nF4sXqRdxJ0EBOKqq4NTFPvei9v1v/+uaiuykRE=; b=OnCbp8YdM9tc2Qiltweaqa2CKjTdyoykzItCI9ZV3VEJSm6Fa5ZMPhFvYnaTrqIkKoadrqeLt+5Ir/tMgsMLYrwqLLA1QhUyVX3GGJJIh3xYppYwu47Gj5b/lTI+cwQ2R7JfErgy6U/guPd1K44klZX/AxRGtEbICrZ6PlPlVC8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657476481508.4266180171546; Wed, 18 Dec 2019 00:24:36 -0800 (PST) Received: from localhost ([::1]:50984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUdG-0006sK-Mt for importer@patchew.org; Wed, 18 Dec 2019 03:24:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35705) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWV-0005zt-8b for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWS-0002U3-GS for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:34 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:40223 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWR-0002Rg-GF for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:31 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-278-ImDVafSKN_SosXfHp6xR7w-1; Wed, 18 Dec 2019 03:17:28 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 12ADB1005512; Wed, 18 Dec 2019 08:17:27 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4BCD67D909; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 773AB11384D2; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tG58nF4sXqRdxJ0EBOKqq4NTFPvei9v1v/+uaiuykRE=; b=fPB+9eSpCETSTtFV2347agYt6M1JOpXUSvkl6iLI07excl5q8KSsafO6BV/jgZi4cy7+t0 KGHks93UA5Rsh61R+BpbwuoWMoJW6EX4RjzILGokd9RcUjDLOQTq5fDnMrs3n66xTtxZI8 z6S79zyBqfBNQJMV4QKombD27TLVuj0= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 10/35] qga: Fix guest-get-fsinfo error API violations Date: Wed, 18 Dec 2019 09:16:56 +0100 Message-Id: <20191218081721.23520-11-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: ImDVafSKN_SosXfHp6xR7w-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" build_guest_fsinfo_for_virtual_device() dereferences @errp when build_guest_fsinfo_for_device() fails. That's wrong; see the big comment in error.h. Introduced in commit 46d4c5723e "qga: Add guest-get-fsinfo command". No caller actually passes null. Fix anyway: splice in a local Error *err, and error_propagate(). Cc: Michael Roth Signed-off-by: Markus Armbruster Message-Id: <20191204093625.14836-10-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Vladimir Sementsov-Ogievskiy --- qga/commands-posix.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 0be301a4ea..10d818c3b2 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1060,6 +1060,7 @@ static void build_guest_fsinfo_for_virtual_device(cha= r const *syspath, GuestFilesystemInfo *fs, Error **errp) { + Error *err =3D NULL; DIR *dir; char *dirpath; struct dirent *entry; @@ -1089,10 +1090,11 @@ static void build_guest_fsinfo_for_virtual_device(c= har const *syspath, =20 g_debug(" slave device '%s'", entry->d_name); path =3D g_strdup_printf("%s/slaves/%s", syspath, entry->d_nam= e); - build_guest_fsinfo_for_device(path, fs, errp); + build_guest_fsinfo_for_device(path, fs, &err); g_free(path); =20 - if (*errp) { + if (err) { + error_propagate(errp, err); break; } } --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657470; cv=none; d=zohomail.com; s=zohoarc; b=R4XNYe5XfNca6U6C0ADWZM4ey2w3PzP+qHCScUwrQ5vGc4zhb6sSQ2CMgxPMKVa2z0tUXJDIj+RY4ll4WM+GOiSoJRbc9PkG0rKsrf0pu0zVn3HGflU7SthH31aVym4pnNSonJGyN/DzoaEyI1RU6j4RLcY6aLWlup21H94ZX/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657470; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7hO1UqZ0b1j8GIVSL9nVspdQXE4+Gtfy7HuRA1Jix1s=; b=XSJk+xAYXRFKULVwCEJ5t85mfFvBLb3TAJ/aZF78viNZD2ooO4dTEfeTzQBwY3i63uy2lycUxdFm2sqGiz5szWoNrq4fAEQPC9Q2yEYP8yX1a4GSRCR7sZk/UKLTSqQNzca9w8aWxx4Y7jNbRn91pUmRGrRKuKuJqrO6PPZAQ6M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157665747054574.70543967544472; Wed, 18 Dec 2019 00:24:30 -0800 (PST) Received: from localhost ([::1]:50982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUdA-0006in-Ou for importer@patchew.org; Wed, 18 Dec 2019 03:24:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35683) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWU-0005zL-Ta for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWT-0002V6-9u for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:34 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:57163 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWS-0002S2-Kd for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:32 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-421-BYfbTMKmMIyWbK3t4RbXPQ-1; Wed, 18 Dec 2019 03:17:27 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D242DDB21 for ; Wed, 18 Dec 2019 08:17:26 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C6A65C545; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7BA1D11384D8; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7hO1UqZ0b1j8GIVSL9nVspdQXE4+Gtfy7HuRA1Jix1s=; b=ExV/UGWOPB++3MZ86Fu17MHFV34azC8uHmqn5HkOrhetfwZKqXPI78lEGBXsYGmU1S81Fm hH4EhYTYF8eTSfQyJu/5h2DDCXD26sKakfEizJfGhu+ag4OXG+yn/nZm7pTehEC3rRKFRD Hv2sKNu7HO6ROSkB5XFjg/PwHWCtEMQ= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 11/35] memory-device: Fix memory pre-plug error API violations Date: Wed, 18 Dec 2019 09:16:57 +0100 Message-Id: <20191218081721.23520-12-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: BYfbTMKmMIyWbK3t4RbXPQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" memory_device_get_free_addr() dereferences @errp when memory_device_check_addable() fails. That's wrong; see the big comment in error.h. Introduced in commit 1b6d6af21b "pc-dimm: factor out capacity and slot checks into MemoryDevice". No caller actually passes null. Fix anyway: splice in a local Error *err, and error_propagate(). Cc: David Hildenbrand Signed-off-by: Markus Armbruster Reviewed-by: David Hildenbrand Message-Id: <20191204093625.14836-11-armbru@redhat.com> --- hw/mem/memory-device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index aef148c1d7..4bc9cf0917 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -99,6 +99,7 @@ static uint64_t memory_device_get_free_addr(MachineState = *ms, uint64_t align, uint64_t size, Error **errp) { + Error *err =3D NULL; GSList *list =3D NULL, *item; Range as, new =3D range_empty; =20 @@ -123,8 +124,9 @@ static uint64_t memory_device_get_free_addr(MachineStat= e *ms, return 0; } =20 - memory_device_check_addable(ms, size, errp); - if (*errp) { + memory_device_check_addable(ms, size, &err); + if (err) { + error_propagate(errp, err); return 0; } =20 --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658158; cv=none; d=zohomail.com; s=zohoarc; b=F32BHOsr5iVAQTc7K4AGhMdhVCGRkkNADFSeWzhcl6aEEtbO0QMsJfkNe2FqcPpSYjLGh5hpcQEXIXJKtXqggzElJgpxyanRZ3rk2pI8ubOyXa4C92jY/WHGhn46t3zVS+DIikO67xLj4tpEa3CPAwxtl5GYFNSqU+Im1c3CUB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658158; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n/OmQfNuIfCdF7J9e+osTcpQv9FggwcAnVFk1+xrsXc=; b=i4gGLQeWKHIirfVpo4VCc9TzRrtohxQtjEjako571PuXySvEUHZRrX47S3l4dPuOmOlSNOOH0l6z1fmWjT2zCm3UFNq1IUsWkBOFr3QhMRiMJZIBKfC7m4mfCRdcwxTewOTgI64bGXQBUSG6C7qNM086pm7i8O0Z7h616+thzAk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658158874724.5672783625188; Wed, 18 Dec 2019 00:35:58 -0800 (PST) Received: from localhost ([::1]:51132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUoH-0004er-9W for importer@patchew.org; Wed, 18 Dec 2019 03:35:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41182) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUX9-0006tv-Hb for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:18:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUX7-0003ol-2U for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:18:15 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:31495 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUX6-0003lY-V5 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:18:13 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-47-S0c8Z5AAO1W_Zk1agbc9YA-1; Wed, 18 Dec 2019 03:17:28 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 33F0A107ACCA for ; Wed, 18 Dec 2019 08:17:27 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 53C8F68882; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7FCDA11384DA; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n/OmQfNuIfCdF7J9e+osTcpQv9FggwcAnVFk1+xrsXc=; b=bFZ/D6wUfOIPwJ++J4V85W/6oxlYT3SJoBSMD4pzVk5eqVeXJxr1E4iw/+QGZAbz+w/9pL +L87g2sNgogSHIU56PvDc54tB/CddRhx2yTpSRMVX1uCtE2zAurRkHz9CL4jZENJTpY5tW 0GQW+xI1ylC9Cdv4ixDMKpaB5/az9DY= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 12/35] error: Clean up unusual names of Error * variables Date: Wed, 18 Dec 2019 09:16:58 +0100 Message-Id: <20191218081721.23520-13-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: S0c8Z5AAO1W_Zk1agbc9YA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Local Error * variables are conventionally named @err or @local_err, and Error ** parameters @errp. Naming local variables like parameters is confusing. Clean that up. Naming parameters like local variables is also confusing. Left for another day. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191204093625.14836-17-armbru@redhat.com> --- hw/intc/s390_flic_kvm.c | 10 +++++----- hw/ppc/spapr_pci.c | 16 ++++++++-------- hw/ppc/spapr_pci_nvlink2.c | 10 +++++----- tests/test-blockjob.c | 16 ++++++++-------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c index c9ee80eaae..30d50c2369 100644 --- a/hw/intc/s390_flic_kvm.c +++ b/hw/intc/s390_flic_kvm.c @@ -582,10 +582,10 @@ static void kvm_s390_flic_realize(DeviceState *dev, E= rror **errp) struct kvm_create_device cd =3D {0}; struct kvm_device_attr test_attr =3D {0}; int ret; - Error *errp_local =3D NULL; + Error *err =3D NULL; =20 - KVM_S390_FLIC_GET_CLASS(dev)->parent_realize(dev, &errp_local); - if (errp_local) { + KVM_S390_FLIC_GET_CLASS(dev)->parent_realize(dev, &err); + if (err) { goto fail; } flic_state->fd =3D -1; @@ -593,7 +593,7 @@ static void kvm_s390_flic_realize(DeviceState *dev, Err= or **errp) cd.type =3D KVM_DEV_TYPE_FLIC; ret =3D kvm_vm_ioctl(kvm_state, KVM_CREATE_DEVICE, &cd); if (ret < 0) { - error_setg_errno(&errp_local, errno, "Creating the KVM device fail= ed"); + error_setg_errno(&err, errno, "Creating the KVM device failed"); trace_flic_create_device(errno); goto fail; } @@ -605,7 +605,7 @@ static void kvm_s390_flic_realize(DeviceState *dev, Err= or **errp) KVM_HAS_DEVICE_ATTR, test_attr= ); return; fail: - error_propagate(errp, errp_local); + error_propagate(errp, err); } =20 static void kvm_s390_flic_reset(DeviceState *dev) diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index f6fbcf99ed..723373de73 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -2042,13 +2042,13 @@ void spapr_phb_dma_reset(SpaprPhbState *sphb) static void spapr_phb_reset(DeviceState *qdev) { SpaprPhbState *sphb =3D SPAPR_PCI_HOST_BRIDGE(qdev); - Error *errp =3D NULL; + Error *err =3D NULL; =20 spapr_phb_dma_reset(sphb); spapr_phb_nvgpu_free(sphb); - spapr_phb_nvgpu_setup(sphb, &errp); - if (errp) { - error_report_err(errp); + spapr_phb_nvgpu_setup(sphb, &err); + if (err) { + error_report_err(err); } =20 /* Reset the IOMMU state */ @@ -2326,7 +2326,7 @@ int spapr_dt_phb(SpaprMachineState *spapr, SpaprPhbSt= ate *phb, cpu_to_be32(phb->numa_node)}; SpaprTceTable *tcet; SpaprDrc *drc; - Error *errp =3D NULL; + Error *err =3D NULL; =20 /* Start populating the FDT */ _FDT(bus_off =3D fdt_add_subnode(fdt, 0, phb->dtbusname)); @@ -2408,9 +2408,9 @@ int spapr_dt_phb(SpaprMachineState *spapr, SpaprPhbSt= ate *phb, return ret; } =20 - spapr_phb_nvgpu_populate_dt(phb, fdt, bus_off, &errp); - if (errp) { - error_report_err(errp); + spapr_phb_nvgpu_populate_dt(phb, fdt, bus_off, &err); + if (err) { + error_report_err(err); } spapr_phb_nvgpu_ram_populate_dt(phb, fdt); =20 diff --git a/hw/ppc/spapr_pci_nvlink2.c b/hw/ppc/spapr_pci_nvlink2.c index 4aa89ede23..8332d5694e 100644 --- a/hw/ppc/spapr_pci_nvlink2.c +++ b/hw/ppc/spapr_pci_nvlink2.c @@ -57,7 +57,7 @@ struct SpaprPhbPciNvGpuConfig { uint64_t nv2_atsd_current; int num; /* number of non empty (i.e. tgt!=3D0) entries in slots[] */ SpaprPhbPciNvGpuSlot slots[NVGPU_MAX_NUM]; - Error *errp; + Error *err; }; =20 static SpaprPhbPciNvGpuSlot * @@ -153,7 +153,7 @@ static void spapr_phb_pci_collect_nvgpu(PCIBus *bus, PC= IDevice *pdev, spapr_pci_collect_nvnpu(nvgpus, pdev, tgt, MEMORY_REGION(mr_np= u), &local_err); } - error_propagate(&nvgpus->errp, local_err); + error_propagate(&nvgpus->err, local_err); } if ((pci_default_read_config(pdev, PCI_HEADER_TYPE, 1) !=3D PCI_HEADER_TYPE_BRIDGE)) { @@ -187,9 +187,9 @@ void spapr_phb_nvgpu_setup(SpaprPhbState *sphb, Error *= *errp) pci_for_each_device(bus, pci_bus_num(bus), spapr_phb_pci_collect_nvgpu, sphb->nvgpus); =20 - if (sphb->nvgpus->errp) { - error_propagate(errp, sphb->nvgpus->errp); - sphb->nvgpus->errp =3D NULL; + if (sphb->nvgpus->err) { + error_propagate(errp, sphb->nvgpus->err); + sphb->nvgpus->err =3D NULL; goto cleanup_exit; } =20 diff --git a/tests/test-blockjob.c b/tests/test-blockjob.c index 7844c9ffcb..e670a20617 100644 --- a/tests/test-blockjob.c +++ b/tests/test-blockjob.c @@ -34,13 +34,13 @@ static BlockJob *mk_job(BlockBackend *blk, const char *= id, int flags) { BlockJob *job; - Error *errp =3D NULL; + Error *err =3D NULL; =20 job =3D block_job_create(id, drv, NULL, blk_bs(blk), 0, BLK_PERM_ALL, 0, flags, block_job_cb, - NULL, &errp); + NULL, &err); if (should_succeed) { - g_assert_null(errp); + g_assert_null(err); g_assert_nonnull(job); if (id) { g_assert_cmpstr(job->job.id, =3D=3D, id); @@ -48,9 +48,9 @@ static BlockJob *mk_job(BlockBackend *blk, const char *id, g_assert_cmpstr(job->job.id, =3D=3D, blk_name(blk)); } } else { - g_assert_nonnull(errp); + g_assert_nonnull(err); g_assert_null(job); - error_free(errp); + error_free(err); } =20 return job; @@ -80,9 +80,9 @@ static BlockBackend *create_blk(const char *name) bdrv_unref(bs); =20 if (name) { - Error *errp =3D NULL; - monitor_add_blk(blk, name, &errp); - g_assert_null(errp); + Error *err =3D NULL; + monitor_add_blk(blk, name, &err); + g_assert_null(err); } =20 return blk; --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657970; cv=none; d=zohomail.com; s=zohoarc; b=fGZHJpQMh7H6Tltv2R4mhxWxe8sOeI8D7Boqcq3ImvBV0YqOxpOOi37MOIqhKrOnMays+RPoryHXtBo/o/ZXfduh+Z2FS6gcC3HXec8UhvA6XHyzQRMgQn7SMpoBNvts6Uxj69g/d53gvLfB0hOdoOsKpVmj9QbW6AGyTyRztAM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657970; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Q1CnObZCuv/cFSZsXlRHdOzpAh988JMecv6ABbyxGUk=; b=d/fGhrLEpsZWcqtT8gFoKDgL3wP5Y5wjM/Wy3GSwxBfY0DyEWHazEx6Voy0dxixnwSiD/p/+s2cd+ojnr2+IOZX5zI3kAXgETX1c7y7Jj9oDgzcAGtxQpIZ0zQGdk/sArZ1D1+yb/oYYmfRttcNltMdX5/MOrM2njMZGM+pUKMA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657970846906.0247872412125; Wed, 18 Dec 2019 00:32:50 -0800 (PST) Received: from localhost ([::1]:51100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUlE-0001RA-Uc for importer@patchew.org; Wed, 18 Dec 2019 03:32:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35789) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWW-00061l-Ke for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWT-0002Vo-FB for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:34 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:30725 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWS-0002Qh-RL for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:33 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-397-iFchBCkyNdWFWXCuaBhyKA-1; Wed, 18 Dec 2019 03:17:26 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 90A591005514; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5D05360C81; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 83EF21138406; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q1CnObZCuv/cFSZsXlRHdOzpAh988JMecv6ABbyxGUk=; b=P161O7sjbfXBSsW6qI4h52ftLlf4L+gbOVj/I1SD92QXUME51728UCJCbCkzQRb6Bn/esf 6NnD+boy83tM1OtGpxsXWkgeXKpHadCRJ9kFBZvjE/1mwBqrEpv0Cy3XsGnvBjZiuYStW7 4fa4HM7ZvCT2NPzq60J0SNHuqRpK4Iw= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 13/35] hw/intc/s390: Simplify error handling in kvm_s390_flic_realize() Date: Wed, 18 Dec 2019 09:16:59 +0100 Message-Id: <20191218081721.23520-14-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: iFchBCkyNdWFWXCuaBhyKA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Halil Pasic , Christian Borntraeger , Cornelia Huck Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Cc: Halil Pasic Cc: Cornelia Huck Cc: Christian Borntraeger Signed-off-by: Markus Armbruster Reviewed-by: Cornelia Huck Acked-by: Halil Pasic Message-Id: <20191204093625.14836-18-armbru@redhat.com> --- hw/intc/s390_flic_kvm.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c index 30d50c2369..dddd33ea61 100644 --- a/hw/intc/s390_flic_kvm.c +++ b/hw/intc/s390_flic_kvm.c @@ -586,16 +586,17 @@ static void kvm_s390_flic_realize(DeviceState *dev, E= rror **errp) =20 KVM_S390_FLIC_GET_CLASS(dev)->parent_realize(dev, &err); if (err) { - goto fail; + error_propagate(errp, err); + return; } flic_state->fd =3D -1; =20 cd.type =3D KVM_DEV_TYPE_FLIC; ret =3D kvm_vm_ioctl(kvm_state, KVM_CREATE_DEVICE, &cd); if (ret < 0) { - error_setg_errno(&err, errno, "Creating the KVM device failed"); + error_setg_errno(errp, errno, "Creating the KVM device failed"); trace_flic_create_device(errno); - goto fail; + return; } flic_state->fd =3D cd.fd; =20 @@ -603,9 +604,6 @@ static void kvm_s390_flic_realize(DeviceState *dev, Err= or **errp) test_attr.group =3D KVM_DEV_FLIC_CLEAR_IO_IRQ; flic_state->clear_io_supported =3D !ioctl(flic_state->fd, KVM_HAS_DEVICE_ATTR, test_attr= ); - return; -fail: - error_propagate(errp, err); } =20 static void kvm_s390_flic_reset(DeviceState *dev) --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657317; cv=none; d=zohomail.com; s=zohoarc; b=NbMO78t4GpnpLmtgX1HSMdd+86U2HTbl6eOu/ylTDPlzCZvrxzUY+3I34SQbiKHWcOKrEv1345JYdZu2vUko1zfqhR0Or8MN/S5EwNxvHuPCsIuvKBDyfaY4RoptEOqhC3ejwnftn/roKyXKli7z//dIiGR3DNPKOfpJqjWqknI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657317; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=23E/OC8snQbEJjzGV1pFoMjr5LDaw3419ldI3L1JH1s=; b=edhTOxFd3W7k+kQ6fq/f83Vl9GlzkrD0ud9NRxA1VhqtF+mEmwMYYnrJzLS7lc1KdNgVkqqCGKLMlyUnDsr4h9+aeBPAFsioS+Rs0v04HbyJWEZS0N0USBTtnqCaMOCBbw8bDkgqfz6WjXMpkzCNekvd0bGlfvhByFmQGMXqOiE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657317590740.5438976638962; Wed, 18 Dec 2019 00:21:57 -0800 (PST) Received: from localhost ([::1]:50948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUai-00032O-0R for importer@patchew.org; Wed, 18 Dec 2019 03:21:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35451) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWR-0005we-FW for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWP-0002Ql-JB for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:30 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:28946 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWP-0002PH-E4 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:29 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-230-_M0RbL4kOiuJ_4YtsOppAw-1; Wed, 18 Dec 2019 03:17:25 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EE78801E7E for ; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 606415C548; Wed, 18 Dec 2019 08:17:24 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8805B1138407; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=23E/OC8snQbEJjzGV1pFoMjr5LDaw3419ldI3L1JH1s=; b=WL2wfisfLHJ92Loj/dM6gE1qbynJ/n8fqGFA+2lRUBCMgDd5Hqdu//GwnzFK/+qTXmzM/U /Kh1Ge7t+bNemNT7Nrz1TTcTEHMQvycA+YYoODxM7vq1lzLJXyg1rLSEXADR/TPWy2vG9R +9rcVo0QQyHd0xRNz9zQk41R4Bj66pc= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 14/35] tests-blockjob: Use error_free_or_abort() Date: Wed, 18 Dec 2019 09:17:00 +0100 Message-Id: <20191218081721.23520-15-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: _M0RbL4kOiuJ_4YtsOppAw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20191204093625.14836-19-armbru@redhat.com> --- tests/test-blockjob.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/test-blockjob.c b/tests/test-blockjob.c index e670a20617..4eeb184caf 100644 --- a/tests/test-blockjob.c +++ b/tests/test-blockjob.c @@ -48,9 +48,8 @@ static BlockJob *mk_job(BlockBackend *blk, const char *id, g_assert_cmpstr(job->job.id, =3D=3D, blk_name(blk)); } } else { - g_assert_nonnull(err); + error_free_or_abort(&err); g_assert_null(job); - error_free(err); } =20 return job; --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658459; cv=none; d=zohomail.com; s=zohoarc; b=A4qxAnq2VOoEEEzAGBymm3Ra5YxDh+jYtxgFgukHqoB7/9y+3nf7SoAEYWag0jA+nUsMb95pbGWXlGJYVzutWht+lh4O+j2+zzxo22EM7lkH7wdczpKdSSOfuN6zEZ9ZS3UybTmAssoRMY9cqYo5kQKiKfwAs6c7PSstatQPykI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658459; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hyIy4BntFzipe+4nd+JmLMonvAUYfdAc7REZjExBXTE=; b=bXXNuOAoVZjstaRwSnqbZRb6EVimQJJ/2jhcMhBXzl4VNPXLQ3siZ0gtbnP6Pw5OmIPwteCFKzEpXnNQLaFYNnT1ZS6gjEsln2S5w+TT6lbmuf9hDYLEejy6AljupzbWyRxglYfBlqzPbUMnPMenVmO96HWOYFPO3zeV4Dc7bns= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658459112249.19940524936158; Wed, 18 Dec 2019 00:40:59 -0800 (PST) Received: from localhost ([::1]:51206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUt7-0004OE-Mm for importer@patchew.org; Wed, 18 Dec 2019 03:40:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35963) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWZ-00065m-AQ for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWV-0002Xz-9B for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:37 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:57283 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWU-0002Si-Ff for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:34 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-72-V1JQd9kmNvuTVO8TyCq4ow-1; Wed, 18 Dec 2019 03:17:29 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5E3C0801E6D; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C6D1E620D6; Wed, 18 Dec 2019 08:17:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8C2971138408; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hyIy4BntFzipe+4nd+JmLMonvAUYfdAc7REZjExBXTE=; b=c/4UWRAwgFMskPcu/TkdiF2ET0oISp2Mc+OWYC8G4qwEUBqHz/ulhKA9jHMh/Mw7LXreNx AUTjmXbrYbVeQEjgFyPPAfAWoWhLMhF9+Jcb8js9oD3wXlbb7TZMJ8EtBLBOg+eZGE9GP3 X9Zd6UeFxdv3gLwgnUBz/sQ+qasGSBw= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 15/35] net/net: Clean up variable shadowing in net_client_init() Date: Wed, 18 Dec 2019 09:17:01 +0100 Message-Id: <20191218081721.23520-16-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: V1JQd9kmNvuTVO8TyCq4ow-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Vladimir Sementsov-Ogievskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Variable int err in inner scope shadows Error *err in outer scope. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191205174635.18758-3-vsementsov@virtuozzo.com> Signed-off-by: Markus Armbruster --- net/net.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/net/net.c b/net/net.c index 84aa6d8d00..9e93c3f8a1 100644 --- a/net/net.c +++ b/net/net.c @@ -1126,16 +1126,13 @@ static int net_client_init(QemuOpts *opts, bool is_= netdev, Error **errp) =20 prefix_addr =3D substrings[0]; =20 - if (substrings[1]) { - /* User-specified prefix length. */ - int err; - - err =3D qemu_strtoul(substrings[1], NULL, 10, &prefix_len); - if (err) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, - "ipv6-prefixlen", "a number"); - goto out; - } + /* Handle user-specified prefix length. */ + if (substrings[1] && + qemu_strtoul(substrings[1], NULL, 10, &prefix_len)) + { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, + "ipv6-prefixlen", "a number"); + goto out; } =20 qemu_opt_set(opts, "ipv6-prefix", prefix_addr, &error_abort); --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657767; cv=none; d=zohomail.com; s=zohoarc; b=lwwB+VjqUGr+VB2uIZnDENNuJR8J/NKtsrHCGx/mJ7+lvTNvF5hFmSAT1JKoNKMom88vt3JdP3ZxtBJeUfnqVjurzHxozfHYdeNRn1zgSdpLVdB88MiFHJMQXaBnRjKKfcH8UJb8W+7hVoJJdY2jFqKfEpBHcVCComJt/GIZM9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657767; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kwVgQiqUas/9oZI843AIMDOvEyABlfBpXV+9isyvvAE=; b=kTzUaj7k1WyXrWJk8w9l5m5AyLjNiPgg2hkb3TcsAk0i/GqqChY/SYsNVP699zoDWLO+PnjwjxnJkLEyLMEv4Qa0veu0o+PypSc5FEBI9c7xYWpZJ0psueKrQFgz9PGCg7OnFxfQiORkrFhVnMcxf0oPWRxxBLT9ZcAzX5ehIMA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657767509359.7247783634267; Wed, 18 Dec 2019 00:29:27 -0800 (PST) Received: from localhost ([::1]:51044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUhx-0005G2-Ua for importer@patchew.org; Wed, 18 Dec 2019 03:29:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35838) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWX-00061v-2M for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWU-0002WT-Hp for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:40986 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWT-0002Rj-9t for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:33 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-8-mlMcEDwwMy-m1LzNcVaO8g-1; Wed, 18 Dec 2019 03:17:28 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F32131854331; Wed, 18 Dec 2019 08:17:27 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C79E160C84; Wed, 18 Dec 2019 08:17:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 90A881136420; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kwVgQiqUas/9oZI843AIMDOvEyABlfBpXV+9isyvvAE=; b=CRzwO3KlYQ9UPxitFNjZy2/DKfsAHmf7pSwiar0ryrwXeTVs8wpFnykoQeVa+SG3oD1SSc lBOBkRj9Kk4iBVXPnylCx/EKxT9XSkSh65a33eG7UJlP5M3Oxxv1c61PzxhIIpNC1JtYBo sdnb38PyO7VYzRQJ3fDNw+UaE6jEtD8= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 16/35] error: make Error **errp const where it is appropriate Date: Wed, 18 Dec 2019 09:17:02 +0100 Message-Id: <20191218081721.23520-17-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: mlMcEDwwMy-m1LzNcVaO8g-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Mostly, Error ** is for returning error from the function, so the callee sets it. However these three functions get already filled errp parameter. They don't change the pointer itself, only change the internal state of referenced Error object. So we can make it Error *const * errp, to stress the behavior. It will also help coccinelle script (in future) to distinguish such cases from common errp usage. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20191205174635.18758-4-vsementsov@virtuozzo.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster [Commit message typo fixed] Signed-off-by: Markus Armbruster --- include/qapi/error.h | 6 +++--- util/error.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/qapi/error.h b/include/qapi/error.h index 3f95141a01..ad5b6e896d 100644 --- a/include/qapi/error.h +++ b/include/qapi/error.h @@ -233,13 +233,13 @@ void error_propagate_prepend(Error **dst_errp, Error = *local_err, * Prepend some text to @errp's human-readable error message. * The text is made by formatting @fmt, @ap like vprintf(). */ -void error_vprepend(Error **errp, const char *fmt, va_list ap); +void error_vprepend(Error *const *errp, const char *fmt, va_list ap); =20 /* * Prepend some text to @errp's human-readable error message. * The text is made by formatting @fmt, ... like printf(). */ -void error_prepend(Error **errp, const char *fmt, ...) +void error_prepend(Error *const *errp, const char *fmt, ...) GCC_FMT_ATTR(2, 3); =20 /* @@ -256,7 +256,7 @@ void error_prepend(Error **errp, const char *fmt, ...) * May be called multiple times. The resulting hint should end with a * newline. */ -void error_append_hint(Error **errp, const char *fmt, ...) +void error_append_hint(Error *const *errp, const char *fmt, ...) GCC_FMT_ATTR(2, 3); =20 /* diff --git a/util/error.c b/util/error.c index d4532ce318..b6c89d1412 100644 --- a/util/error.c +++ b/util/error.c @@ -121,7 +121,7 @@ void error_setg_file_open_internal(Error **errp, "Could not open '%s'", filename); } =20 -void error_vprepend(Error **errp, const char *fmt, va_list ap) +void error_vprepend(Error *const *errp, const char *fmt, va_list ap) { GString *newmsg; =20 @@ -136,7 +136,7 @@ void error_vprepend(Error **errp, const char *fmt, va_l= ist ap) (*errp)->msg =3D g_string_free(newmsg, 0); } =20 -void error_prepend(Error **errp, const char *fmt, ...) +void error_prepend(Error *const *errp, const char *fmt, ...) { va_list ap; =20 @@ -145,7 +145,7 @@ void error_prepend(Error **errp, const char *fmt, ...) va_end(ap); } =20 -void error_append_hint(Error **errp, const char *fmt, ...) +void error_append_hint(Error *const *errp, const char *fmt, ...) { va_list ap; int saved_errno =3D errno; --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658286; cv=none; d=zohomail.com; s=zohoarc; b=NbqAgDxtQOhwktvAXQbVs4Hj/GgJHH21Ct+trA5c4nhOKqtLTEFFM3cUcXJ7zdABvyR03c/yuLlHl7QDyzVTs0etbCJBkO+miSvZcrl3MWPnXWmoepxKgmI4kVb5nWnCVwCDPI3g/HI+jjfqR3QS2JG1+yVwtsqjqFIHRUf9M+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658286; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Zz1BdIBykpy+A3TslHFCNCV/ACFmhDH4nK9Dd2kpEbQ=; b=Wihlj0/LMsScwwgnXK+dxi5go3wcmKnkMnFqW9bQVcTkaUtFeBqnssf71OagYr4eAHXLRkN+Bhs1wk09xZ5nG/TWViA/ZwSm24fJaHIkposfiw4S1dRIQSZBRl8ZmsAzFzdle18cXwd+vMAbxSqMIPKcnIqeJcoYJXR0rLDhBQ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658286173350.38912541079856; Wed, 18 Dec 2019 00:38:06 -0800 (PST) Received: from localhost ([::1]:51172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUqK-0008Na-PS for importer@patchew.org; Wed, 18 Dec 2019 03:38:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41203) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUX9-0006uG-NF for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:18:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUX6-0003oA-Sq for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:18:15 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:60743 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUX6-0003nI-N8 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:18:12 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-420-56xj9a4dP0G5GB2XROTNcQ-1; Wed, 18 Dec 2019 03:17:30 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0635C1800D42; Wed, 18 Dec 2019 08:17:30 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CAA5F5DA32; Wed, 18 Dec 2019 08:17:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 954521136421; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Zz1BdIBykpy+A3TslHFCNCV/ACFmhDH4nK9Dd2kpEbQ=; b=GK1yu2MoJFD81Jysy5T/GiXqgVuvzP+34BcgYD3326OIQ9664Z58aQ9t1eskOWRlEUc/XP rd4K7sI8dywTGhsfFvlI3TBKi8UlP6tZsw8bBwm4uAD2SFYKtTCj0FgodUsPG1wyha8BaS KWJyXZE+3kPuvJG4OveFv8qS+7QuJhI= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 17/35] hmp: drop Error pointer indirection in hmp_handle_error Date: Wed, 18 Dec 2019 09:17:03 +0100 Message-Id: <20191218081721.23520-18-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 56xj9a4dP0G5GB2XROTNcQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy We don't need Error **, as all callers pass local Error object, which isn't used after the call. Use Error * instead. Signed-off-by: Vladimir Sementsov-Ogievskiy Acked-by: Dr. David Alan Gilbert Reviewed-by: Markus Armbruster Message-Id: <20191205174635.18758-5-vsementsov@virtuozzo.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Markus Armbruster --- include/monitor/hmp.h | 2 +- dump/dump-hmp-cmds.c | 4 +- hw/core/machine-hmp-cmds.c | 6 +- monitor/hmp-cmds.c | 155 ++++++++++++++++++------------------- qdev-monitor.c | 4 +- qom/qom-hmp-cmds.c | 4 +- 6 files changed, 87 insertions(+), 88 deletions(-) diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index a0e9511440..3d329853b2 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -16,7 +16,7 @@ =20 #include "qemu/readline.h" =20 -void hmp_handle_error(Monitor *mon, Error **errp); +void hmp_handle_error(Monitor *mon, Error *err); =20 void hmp_info_name(Monitor *mon, const QDict *qdict); void hmp_info_version(Monitor *mon, const QDict *qdict); diff --git a/dump/dump-hmp-cmds.c b/dump/dump-hmp-cmds.c index 3dbf44372c..e5053b04cd 100644 --- a/dump/dump-hmp-cmds.c +++ b/dump/dump-hmp-cmds.c @@ -32,7 +32,7 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdi= ct) =20 if (zlib + lzo + snappy + win_dmp > 1) { error_setg(&err, "only one of '-z|-l|-s|-w' can be set"); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } =20 @@ -66,7 +66,7 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdi= ct) =20 qmp_dump_guest_memory(paging, prot, true, detach, has_begin, begin, has_length, length, true, dump_format, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); g_free(prot); } =20 diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c index cd970cc4c5..b76f7223af 100644 --- a/hw/core/machine-hmp-cmds.c +++ b/hw/core/machine-hmp-cmds.c @@ -55,7 +55,7 @@ void hmp_cpu_add(Monitor *mon, const QDict *qdict) =20 cpuid =3D qdict_get_int(qdict, "id"); qmp_cpu_add(cpuid, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) @@ -66,7 +66,7 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdi= ct) CpuInstanceProperties *c; =20 if (err !=3D NULL) { - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } =20 @@ -135,7 +135,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) monitor_printf(mon, "\n"); =20 qapi_free_MemdevList(memdev_list); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_info_numa(Monitor *mon, const QDict *qdict) diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index b2551c16d1..c5dea307b6 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -60,11 +60,10 @@ #include #endif =20 -void hmp_handle_error(Monitor *mon, Error **errp) +void hmp_handle_error(Monitor *mon, Error *err) { - assert(errp); - if (*errp) { - error_reportf_err(*errp, "Error: "); + if (err) { + error_reportf_err(err, "Error: "); } } =20 @@ -734,7 +733,7 @@ void hmp_info_vnc(Monitor *mon, const QDict *qdict) =20 info2l =3D qmp_query_vnc_servers(&err); if (err) { - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } if (!info2l) { @@ -850,7 +849,7 @@ void hmp_info_balloon(Monitor *mon, const QDict *qdict) =20 info =3D qmp_query_balloon(&err); if (err) { - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } =20 @@ -1172,7 +1171,7 @@ void hmp_sync_profile(Monitor *mon, const QDict *qdic= t) Error *err =3D NULL; =20 error_setg(&err, QERR_INVALID_PARAMETER, op); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } } =20 @@ -1191,7 +1190,7 @@ void hmp_exit_preconfig(Monitor *mon, const QDict *qd= ict) Error *err =3D NULL; =20 qmp_x_exit_preconfig(&err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_cpu(Monitor *mon, const QDict *qdict) @@ -1220,7 +1219,7 @@ void hmp_memsave(Monitor *mon, const QDict *qdict) } =20 qmp_memsave(addr, size, filename, true, cpu_index, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_pmemsave(Monitor *mon, const QDict *qdict) @@ -1231,7 +1230,7 @@ void hmp_pmemsave(Monitor *mon, const QDict *qdict) Error *err =3D NULL; =20 qmp_pmemsave(addr, size, filename, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_ringbuf_write(Monitor *mon, const QDict *qdict) @@ -1242,7 +1241,7 @@ void hmp_ringbuf_write(Monitor *mon, const QDict *qdi= ct) =20 qmp_ringbuf_write(chardev, data, false, 0, &err); =20 - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_ringbuf_read(Monitor *mon, const QDict *qdict) @@ -1255,7 +1254,7 @@ void hmp_ringbuf_read(Monitor *mon, const QDict *qdic= t) =20 data =3D qmp_ringbuf_read(chardev, size, false, 0, &err); if (err) { - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } =20 @@ -1280,7 +1279,7 @@ void hmp_cont(Monitor *mon, const QDict *qdict) Error *err =3D NULL; =20 qmp_cont(&err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_system_wakeup(Monitor *mon, const QDict *qdict) @@ -1288,7 +1287,7 @@ void hmp_system_wakeup(Monitor *mon, const QDict *qdi= ct) Error *err =3D NULL; =20 qmp_system_wakeup(&err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_nmi(Monitor *mon, const QDict *qdict) @@ -1296,7 +1295,7 @@ void hmp_nmi(Monitor *mon, const QDict *qdict) Error *err =3D NULL; =20 qmp_inject_nmi(&err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_set_link(Monitor *mon, const QDict *qdict) @@ -1306,7 +1305,7 @@ void hmp_set_link(Monitor *mon, const QDict *qdict) Error *err =3D NULL; =20 qmp_set_link(name, up, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_block_passwd(Monitor *mon, const QDict *qdict) @@ -1316,7 +1315,7 @@ void hmp_block_passwd(Monitor *mon, const QDict *qdic= t) Error *err =3D NULL; =20 qmp_block_passwd(true, device, false, NULL, password, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_balloon(Monitor *mon, const QDict *qdict) @@ -1325,7 +1324,7 @@ void hmp_balloon(Monitor *mon, const QDict *qdict) Error *err =3D NULL; =20 qmp_balloon(value, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_block_resize(Monitor *mon, const QDict *qdict) @@ -1335,7 +1334,7 @@ void hmp_block_resize(Monitor *mon, const QDict *qdic= t) Error *err =3D NULL; =20 qmp_block_resize(true, device, false, NULL, size, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_drive_mirror(Monitor *mon, const QDict *qdict) @@ -1358,11 +1357,11 @@ void hmp_drive_mirror(Monitor *mon, const QDict *qd= ict) =20 if (!filename) { error_setg(&err, QERR_MISSING_PARAMETER, "target"); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } qmp_drive_mirror(&mirror, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_drive_backup(Monitor *mon, const QDict *qdict) @@ -1388,12 +1387,12 @@ void hmp_drive_backup(Monitor *mon, const QDict *qd= ict) =20 if (!filename) { error_setg(&err, QERR_MISSING_PARAMETER, "target"); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } =20 qmp_drive_backup(&backup, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict) @@ -1409,7 +1408,7 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *q= dict) /* In the future, if 'snapshot-file' is not specified, the snapshot will be taken internally. Today it's actually required. */ error_setg(&err, QERR_MISSING_PARAMETER, "snapshot-file"); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } =20 @@ -1418,7 +1417,7 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *q= dict) filename, false, NULL, !!format, format, true, mode, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_snapshot_blkdev_internal(Monitor *mon, const QDict *qdict) @@ -1428,7 +1427,7 @@ void hmp_snapshot_blkdev_internal(Monitor *mon, const= QDict *qdict) Error *err =3D NULL; =20 qmp_blockdev_snapshot_internal_sync(device, name, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_snapshot_delete_blkdev_internal(Monitor *mon, const QDict *qdict) @@ -1440,7 +1439,7 @@ void hmp_snapshot_delete_blkdev_internal(Monitor *mon= , const QDict *qdict) =20 qmp_blockdev_snapshot_delete_internal_sync(device, !!id, id, true, name, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_loadvm(Monitor *mon, const QDict *qdict) @@ -1454,7 +1453,7 @@ void hmp_loadvm(Monitor *mon, const QDict *qdict) if (load_snapshot(name, &err) =3D=3D 0 && saved_vm_running) { vm_start(); } - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_savevm(Monitor *mon, const QDict *qdict) @@ -1462,7 +1461,7 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) Error *err =3D NULL; =20 save_snapshot(qdict_get_try_str(qdict, "name"), &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_delvm(Monitor *mon, const QDict *qdict) @@ -1476,7 +1475,7 @@ void hmp_delvm(Monitor *mon, const QDict *qdict) "deleting snapshot on device '%s': ", bdrv_get_device_name(bs)); } - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_info_snapshots(Monitor *mon, const QDict *qdict) @@ -1652,7 +1651,7 @@ void hmp_migrate_continue(Monitor *mon, const QDict *= qdict) qmp_migrate_continue(val, &err); } =20 - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_migrate_incoming(Monitor *mon, const QDict *qdict) @@ -1662,7 +1661,7 @@ void hmp_migrate_incoming(Monitor *mon, const QDict *= qdict) =20 qmp_migrate_incoming(uri, &err); =20 - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_migrate_recover(Monitor *mon, const QDict *qdict) @@ -1672,7 +1671,7 @@ void hmp_migrate_recover(Monitor *mon, const QDict *q= dict) =20 qmp_migrate_recover(uri, &err); =20 - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_migrate_pause(Monitor *mon, const QDict *qdict) @@ -1681,7 +1680,7 @@ void hmp_migrate_pause(Monitor *mon, const QDict *qdi= ct) =20 qmp_migrate_pause(&err); =20 - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 /* Kept for backwards compatibility */ @@ -1697,7 +1696,7 @@ void hmp_migrate_set_cache_size(Monitor *mon, const Q= Dict *qdict) Error *err =3D NULL; =20 qmp_migrate_set_cache_size(value, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 /* Kept for backwards compatibility */ @@ -1728,7 +1727,7 @@ void hmp_migrate_set_capability(Monitor *mon, const Q= Dict *qdict) =20 end: qapi_free_MigrationCapabilityStatusList(caps); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) @@ -1869,7 +1868,7 @@ void hmp_migrate_set_parameter(Monitor *mon, const QD= ict *qdict) cleanup: qapi_free_MigrateSetParameters(p); visit_free(v); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_client_migrate_info(Monitor *mon, const QDict *qdict) @@ -1886,14 +1885,14 @@ void hmp_client_migrate_info(Monitor *mon, const QD= ict *qdict) qmp_client_migrate_info(protocol, hostname, has_port, port, has_tls_port, tls_port, !!cert_subject, cert_subject, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_migrate_start_postcopy(Monitor *mon, const QDict *qdict) { Error *err =3D NULL; qmp_migrate_start_postcopy(&err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_x_colo_lost_heartbeat(Monitor *mon, const QDict *qdict) @@ -1901,7 +1900,7 @@ void hmp_x_colo_lost_heartbeat(Monitor *mon, const QD= ict *qdict) Error *err =3D NULL; =20 qmp_x_colo_lost_heartbeat(&err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_set_password(Monitor *mon, const QDict *qdict) @@ -1912,7 +1911,7 @@ void hmp_set_password(Monitor *mon, const QDict *qdic= t) Error *err =3D NULL; =20 qmp_set_password(protocol, password, !!connected, connected, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_expire_password(Monitor *mon, const QDict *qdict) @@ -1922,7 +1921,7 @@ void hmp_expire_password(Monitor *mon, const QDict *q= dict) Error *err =3D NULL; =20 qmp_expire_password(protocol, whenstr, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_eject(Monitor *mon, const QDict *qdict) @@ -1932,7 +1931,7 @@ void hmp_eject(Monitor *mon, const QDict *qdict) Error *err =3D NULL; =20 qmp_eject(true, device, false, NULL, true, force, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 #ifdef CONFIG_VNC @@ -1978,7 +1977,7 @@ void hmp_change(Monitor *mon, const QDict *qdict) read_only, BLOCKDEV_CHANGE_READ_ONLY_MODE_RETAIN, &er= r); if (err) { - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } } @@ -1988,7 +1987,7 @@ void hmp_change(Monitor *mon, const QDict *qdict) &err); } =20 - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict) @@ -2016,7 +2015,7 @@ void hmp_block_set_io_throttle(Monitor *mon, const QD= ict *qdict) } =20 qmp_block_set_io_throttle(&throttle, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_block_stream(Monitor *mon, const QDict *qdict) @@ -2031,7 +2030,7 @@ void hmp_block_stream(Monitor *mon, const QDict *qdic= t) BLOCKDEV_ON_ERROR_REPORT, false, false, false, false, &error); =20 - hmp_handle_error(mon, &error); + hmp_handle_error(mon, error); } =20 void hmp_block_job_set_speed(Monitor *mon, const QDict *qdict) @@ -2042,7 +2041,7 @@ void hmp_block_job_set_speed(Monitor *mon, const QDic= t *qdict) =20 qmp_block_job_set_speed(device, value, &error); =20 - hmp_handle_error(mon, &error); + hmp_handle_error(mon, error); } =20 void hmp_block_job_cancel(Monitor *mon, const QDict *qdict) @@ -2053,7 +2052,7 @@ void hmp_block_job_cancel(Monitor *mon, const QDict *= qdict) =20 qmp_block_job_cancel(device, true, force, &error); =20 - hmp_handle_error(mon, &error); + hmp_handle_error(mon, error); } =20 void hmp_block_job_pause(Monitor *mon, const QDict *qdict) @@ -2063,7 +2062,7 @@ void hmp_block_job_pause(Monitor *mon, const QDict *q= dict) =20 qmp_block_job_pause(device, &error); =20 - hmp_handle_error(mon, &error); + hmp_handle_error(mon, error); } =20 void hmp_block_job_resume(Monitor *mon, const QDict *qdict) @@ -2073,7 +2072,7 @@ void hmp_block_job_resume(Monitor *mon, const QDict *= qdict) =20 qmp_block_job_resume(device, &error); =20 - hmp_handle_error(mon, &error); + hmp_handle_error(mon, error); } =20 void hmp_block_job_complete(Monitor *mon, const QDict *qdict) @@ -2083,7 +2082,7 @@ void hmp_block_job_complete(Monitor *mon, const QDict= *qdict) =20 qmp_block_job_complete(device, &error); =20 - hmp_handle_error(mon, &error); + hmp_handle_error(mon, error); } =20 typedef struct HMPMigrationStatus @@ -2143,7 +2142,7 @@ void hmp_migrate(Monitor *mon, const QDict *qdict) qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, true, resume, &err); if (err) { - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } =20 @@ -2181,7 +2180,7 @@ void hmp_netdev_add(Monitor *mon, const QDict *qdict) } =20 out: - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_netdev_del(Monitor *mon, const QDict *qdict) @@ -2190,7 +2189,7 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict) Error *err =3D NULL; =20 qmp_netdev_del(id, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_object_add(Monitor *mon, const QDict *qdict) @@ -2201,7 +2200,7 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) =20 opts =3D qemu_opts_from_qdict(qemu_find_opts("object"), qdict, &err); if (err) { - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } =20 @@ -2209,7 +2208,7 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) qemu_opts_del(opts); =20 if (err) { - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } if (obj) { object_unref(obj); @@ -2222,7 +2221,7 @@ void hmp_getfd(Monitor *mon, const QDict *qdict) Error *err =3D NULL; =20 qmp_getfd(fdname, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_closefd(Monitor *mon, const QDict *qdict) @@ -2231,7 +2230,7 @@ void hmp_closefd(Monitor *mon, const QDict *qdict) Error *err =3D NULL; =20 qmp_closefd(fdname, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_sendkey(Monitor *mon, const QDict *qdict) @@ -2290,7 +2289,7 @@ void hmp_sendkey(Monitor *mon, const QDict *qdict) } =20 qmp_send_key(head, has_hold_time, hold_time, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); =20 out: qapi_free_KeyValueList(head); @@ -2309,7 +2308,7 @@ void hmp_screendump(Monitor *mon, const QDict *qdict) Error *err =3D NULL; =20 qmp_screendump(filename, id !=3D NULL, id, id !=3D NULL, head, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_nbd_server_start(Monitor *mon, const QDict *qdict) @@ -2364,7 +2363,7 @@ void hmp_nbd_server_start(Monitor *mon, const QDict *= qdict) qapi_free_BlockInfoList(block_list); =20 exit: - hmp_handle_error(mon, &local_err); + hmp_handle_error(mon, local_err); } =20 void hmp_nbd_server_add(Monitor *mon, const QDict *qdict) @@ -2376,7 +2375,7 @@ void hmp_nbd_server_add(Monitor *mon, const QDict *qd= ict) =20 qmp_nbd_server_add(device, !!name, name, true, writable, false, NULL, &local_err); - hmp_handle_error(mon, &local_err); + hmp_handle_error(mon, local_err); } =20 void hmp_nbd_server_remove(Monitor *mon, const QDict *qdict) @@ -2387,7 +2386,7 @@ void hmp_nbd_server_remove(Monitor *mon, const QDict = *qdict) =20 /* Rely on NBD_SERVER_REMOVE_MODE_SAFE being the default */ qmp_nbd_server_remove(name, force, NBD_SERVER_REMOVE_MODE_HARD, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict) @@ -2395,7 +2394,7 @@ void hmp_nbd_server_stop(Monitor *mon, const QDict *q= dict) Error *err =3D NULL; =20 qmp_nbd_server_stop(&err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_chardev_add(Monitor *mon, const QDict *qdict) @@ -2411,7 +2410,7 @@ void hmp_chardev_add(Monitor *mon, const QDict *qdict) qemu_chr_new_from_opts(opts, NULL, &err); qemu_opts_del(opts); } - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_chardev_change(Monitor *mon, const QDict *qdict) @@ -2445,7 +2444,7 @@ end: qapi_free_ChardevReturn(ret); qapi_free_ChardevBackend(backend); qemu_opts_del(opts); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_chardev_remove(Monitor *mon, const QDict *qdict) @@ -2453,7 +2452,7 @@ void hmp_chardev_remove(Monitor *mon, const QDict *qd= ict) Error *local_err =3D NULL; =20 qmp_chardev_remove(qdict_get_str(qdict, "id"), &local_err); - hmp_handle_error(mon, &local_err); + hmp_handle_error(mon, local_err); } =20 void hmp_chardev_send_break(Monitor *mon, const QDict *qdict) @@ -2461,7 +2460,7 @@ void hmp_chardev_send_break(Monitor *mon, const QDict= *qdict) Error *local_err =3D NULL; =20 qmp_chardev_send_break(qdict_get_str(qdict, "id"), &local_err); - hmp_handle_error(mon, &local_err); + hmp_handle_error(mon, local_err); } =20 void hmp_qemu_io(Monitor *mon, const QDict *qdict) @@ -2517,7 +2516,7 @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict) =20 fail: blk_unref(local_blk); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_object_del(Monitor *mon, const QDict *qdict) @@ -2526,7 +2525,7 @@ void hmp_object_del(Monitor *mon, const QDict *qdict) Error *err =3D NULL; =20 user_creatable_del(id, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) @@ -2576,7 +2575,7 @@ void hmp_info_memory_devices(Monitor *mon, const QDic= t *qdict) } =20 qapi_free_MemoryDeviceInfoList(info_list); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_info_iothreads(Monitor *mon, const QDict *qdict) @@ -2605,7 +2604,7 @@ void hmp_rocker(Monitor *mon, const QDict *qdict) =20 rocker =3D qmp_query_rocker(name, &err); if (err !=3D NULL) { - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } =20 @@ -2624,7 +2623,7 @@ void hmp_rocker_ports(Monitor *mon, const QDict *qdic= t) =20 list =3D qmp_query_rocker_ports(name, &err); if (err !=3D NULL) { - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } =20 @@ -2653,7 +2652,7 @@ void hmp_rocker_of_dpa_flows(Monitor *mon, const QDic= t *qdict) =20 list =3D qmp_query_rocker_of_dpa_flows(name, tbl_id !=3D -1, tbl_id, &= err); if (err !=3D NULL) { - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } =20 @@ -2804,7 +2803,7 @@ void hmp_rocker_of_dpa_groups(Monitor *mon, const QDi= ct *qdict) =20 list =3D qmp_query_rocker_of_dpa_groups(name, type !=3D 9, type, &err); if (err !=3D NULL) { - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); return; } =20 @@ -2911,7 +2910,7 @@ void hmp_info_vm_generation_id(Monitor *mon, const QD= ict *qdict) if (info) { monitor_printf(mon, "%s\n", info->guid); } - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); qapi_free_GuidInfo(info); } =20 @@ -2930,5 +2929,5 @@ void hmp_info_memory_size_summary(Monitor *mon, const= QDict *qdict) =20 qapi_free_MemoryInfo(info); } - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } diff --git a/qdev-monitor.c b/qdev-monitor.c index e6b112eb0a..29ed73e56a 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -890,7 +890,7 @@ void hmp_device_add(Monitor *mon, const QDict *qdict) Error *err =3D NULL; =20 qmp_device_add((QDict *)qdict, NULL, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_device_del(Monitor *mon, const QDict *qdict) @@ -899,7 +899,7 @@ void hmp_device_del(Monitor *mon, const QDict *qdict) Error *err =3D NULL; =20 qmp_device_del(id, &err); - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 BlockBackend *blk_by_qdev_id(const char *id, Error **errp) diff --git a/qom/qom-hmp-cmds.c b/qom/qom-hmp-cmds.c index a268e01eb4..cd08233a4c 100644 --- a/qom/qom-hmp-cmds.c +++ b/qom/qom-hmp-cmds.c @@ -37,7 +37,7 @@ void hmp_qom_list(Monitor *mon, const QDict *qdict) } qapi_free_ObjectPropertyInfoList(start); } - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 void hmp_qom_set(Monitor *mon, const QDict *qdict) @@ -59,7 +59,7 @@ void hmp_qom_set(Monitor *mon, const QDict *qdict) } object_property_parse(obj, value, property, &err); } - hmp_handle_error(mon, &err); + hmp_handle_error(mon, err); } =20 typedef struct QOMCompositionState { --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657319; cv=none; d=zohomail.com; s=zohoarc; b=TPpyO3aZIiiliLv0C5yMQXc78fPyYSU/7VgbYye1UJHqNaUhuN/4Da8+tAkytRyo2jkcAmkgWx0jMpyaA++a8x9F2ALyRmTDuLY4rRQoCX3i7ldzb0EZNwNRy7xyTMGxQxJc2WkoUJAmzYDEj7u88WTSrOBhkjO/bJ+bQdeSLqY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657319; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qFYCZKR/a0tM8e6dHaEcw7hFOz0p6BlQSbWjBry2PJw=; b=jPKQsCmrRaCZCycE4CqnbU+/EhBhDCibd7fcVpqeFTxgtsDKhFsN07u5Asimmc6z+JVarKOX29TGPU5uuBjqECA+2btate02GquhLGuMX5ZORMok8X7/Ka6iFRtQEma78laXeEEx5Bmh28IM7m5SmhZ/ZV2/tUKQqjhtfLsnuVs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657319794500.831363570578; Wed, 18 Dec 2019 00:21:59 -0800 (PST) Received: from localhost ([::1]:50950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUak-00034n-31 for importer@patchew.org; Wed, 18 Dec 2019 03:21:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35590) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWT-0005yh-Ae for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWR-0002TA-Fd for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:32 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:22262 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWQ-0002Qf-Rw for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:31 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-47-NXx13aaIMgKEGeY8cnz_YQ-1; Wed, 18 Dec 2019 03:17:28 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 03D44DB22; Wed, 18 Dec 2019 08:17:27 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CE5F31001281; Wed, 18 Dec 2019 08:17:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 997201136422; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qFYCZKR/a0tM8e6dHaEcw7hFOz0p6BlQSbWjBry2PJw=; b=FcS0nMhCpyACsyJ5h4nROQgWepO7+uBkcweNQkcnA7wil4zUeCQvUIf4ABcxGvYhO67wki +Y+7/9F1ReFukNAJJZVrb/+/eIt+PzBhL5ZK6ORH0ikOwTVPwfzM5ZNaT8+NY9EtwJy093 roiVOOajOGHqJxDVD41uW6DCT9BLTPY= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 18/35] vnc: drop Error pointer indirection in vnc_client_io_error Date: Wed, 18 Dec 2019 09:17:04 +0100 Message-Id: <20191218081721.23520-19-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: NXx13aaIMgKEGeY8cnz_YQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy We don't need Error **, as all callers pass local Error object, which isn't used after the call, or NULL. Use Error * instead. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Markus Armbruster Message-Id: <20191205174635.18758-6-vsementsov@virtuozzo.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Markus Armbruster --- ui/vnc.h | 2 +- ui/vnc.c | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/ui/vnc.h b/ui/vnc.h index fea79c2fc9..4e2637ce6c 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -547,7 +547,7 @@ uint32_t read_u32(uint8_t *data, size_t offset); =20 /* Protocol stage functions */ void vnc_client_error(VncState *vs); -size_t vnc_client_io_error(VncState *vs, ssize_t ret, Error **errp); +size_t vnc_client_io_error(VncState *vs, ssize_t ret, Error *err); =20 void start_client_init(VncState *vs); void start_auth_vnc(VncState *vs); diff --git a/ui/vnc.c b/ui/vnc.c index 87b8045afe..4100d6e404 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1312,7 +1312,7 @@ void vnc_disconnect_finish(VncState *vs) g_free(vs); } =20 -size_t vnc_client_io_error(VncState *vs, ssize_t ret, Error **errp) +size_t vnc_client_io_error(VncState *vs, ssize_t ret, Error *err) { if (ret <=3D 0) { if (ret =3D=3D 0) { @@ -1320,15 +1320,11 @@ size_t vnc_client_io_error(VncState *vs, ssize_t re= t, Error **errp) vnc_disconnect_start(vs); } else if (ret !=3D QIO_CHANNEL_ERR_BLOCK) { trace_vnc_client_io_error(vs, vs->ioc, - errp ? error_get_pretty(*errp) : - "Unknown"); + err ? error_get_pretty(err) : "Unkno= wn"); vnc_disconnect_start(vs); } =20 - if (errp) { - error_free(*errp); - *errp =3D NULL; - } + error_free(err); return 0; } return ret; @@ -1361,10 +1357,9 @@ size_t vnc_client_write_buf(VncState *vs, const uint= 8_t *data, size_t datalen) { Error *err =3D NULL; ssize_t ret; - ret =3D qio_channel_write( - vs->ioc, (const char *)data, datalen, &err); + ret =3D qio_channel_write(vs->ioc, (const char *)data, datalen, &err); VNC_DEBUG("Wrote wire %p %zd -> %ld\n", data, datalen, ret); - return vnc_client_io_error(vs, ret, &err); + return vnc_client_io_error(vs, ret, err); } =20 =20 @@ -1488,10 +1483,9 @@ size_t vnc_client_read_buf(VncState *vs, uint8_t *da= ta, size_t datalen) { ssize_t ret; Error *err =3D NULL; - ret =3D qio_channel_read( - vs->ioc, (char *)data, datalen, &err); + ret =3D qio_channel_read(vs->ioc, (char *)data, datalen, &err); VNC_DEBUG("Read wire %p %zd -> %ld\n", data, datalen, ret); - return vnc_client_io_error(vs, ret, &err); + return vnc_client_io_error(vs, ret, err); } =20 =20 --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657616; cv=none; d=zohomail.com; s=zohoarc; b=dIbuj6Of/zljP+MC8e6g1bsNWk54+xKn0OUe2GAAAehlHTl99xknjFCPc41a3jiQ66ebB/4EwpT/lk3n1tYwT5j+dQslBS0T1R84tec2HyNO/Q89zvp6VtheDQZvP3uaxzyuWbpUEixjna6AOaTBjMTYiRj3NepCNyRGk40xYTI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657616; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qOHQCVeENLcAhPhpCRlU0/QTK4zJGsVHmFYfM/orI7Q=; b=ixFjuwx5eOsSr7+nmIOWm7c1z0TAvLeEFU1V7t4DH8W+cUyOG2e32rY+RVOlS+yTqsoc0RReCeSISJ4FlfuYBAumRlFpuPXg4apJZsuF9bMPxkAtWhJu43T+pYW60TR41VfYpFowP3QShyACBVmHszPpSqEQRVdDrQSQID0UvaQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657616594116.6703574352889; Wed, 18 Dec 2019 00:26:56 -0800 (PST) Received: from localhost ([::1]:51018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUfX-0001ni-5A for importer@patchew.org; Wed, 18 Dec 2019 03:26:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35787) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWW-00061k-Jv for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWT-0002VJ-AL for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:34 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:33516 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWS-0002Rq-Qq for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:33 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-425-zQCHouzsNsex91pVCtqOEg-1; Wed, 18 Dec 2019 03:17:27 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22E60107ACC4; Wed, 18 Dec 2019 08:17:26 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E931C5DA70; Wed, 18 Dec 2019 08:17:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9D9781136423; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qOHQCVeENLcAhPhpCRlU0/QTK4zJGsVHmFYfM/orI7Q=; b=YtXg8Gd4kneepA5a4WMZ8jkDESJkzHiFpv8zICwmRftWEPuGCNfbMuQCEY0IxOXwTEAssR cjsyvpEFig2YAI8MtNsO98BD3Un0qeviS8nZtG+ZQvXiGMlwLlDHx6MhiRT16uyjh4qHBI r4LWTILbDUi70YPOVXArY3zcgI6nngw= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 19/35] qdev-monitor: make Error **errp const where it is appropriate Date: Wed, 18 Dec 2019 09:17:05 +0100 Message-Id: <20191218081721.23520-20-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: zQCHouzsNsex91pVCtqOEg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Mostly, Error ** is for returning error from the function, so the callee sets it. However qbus_list_bus and qbus_list_dev get already filled errp parameter. They don't change the pointer itself, only change the internal state of referenced Error object. So we can make it Error *const * errp, to stress the behavior. It will also help coccinelle script (in future) to distinguish such cases from common errp usage. While there, rename the functions to qbus_error_append_bus_list_hint(), qbus_error_append_dev_list_hint(). Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20191205174635.18758-7-vsementsov@virtuozzo.com> Reviewed-by: Markus Armbruster [Commit message replaced] Signed-off-by: Markus Armbruster --- qdev-monitor.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index 29ed73e56a..3465a1e2d0 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -328,7 +328,8 @@ static Object *qdev_get_peripheral_anon(void) return dev; } =20 -static void qbus_list_bus(DeviceState *dev, Error **errp) +static void qbus_error_append_bus_list_hint(DeviceState *dev, + Error *const *errp) { BusState *child; const char *sep =3D " "; @@ -342,7 +343,8 @@ static void qbus_list_bus(DeviceState *dev, Error **err= p) error_append_hint(errp, "\n"); } =20 -static void qbus_list_dev(BusState *bus, Error **errp) +static void qbus_error_append_dev_list_hint(BusState *bus, + Error *const *errp) { BusChild *kid; const char *sep =3D " "; @@ -500,7 +502,7 @@ static BusState *qbus_find(const char *path, Error **er= rp) if (!dev) { error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, "Device '%s' not found", elem); - qbus_list_dev(bus, errp); + qbus_error_append_dev_list_hint(bus, errp); return NULL; } =20 @@ -518,7 +520,7 @@ static BusState *qbus_find(const char *path, Error **er= rp) if (dev->num_child_bus) { error_setg(errp, "Device '%s' has multiple child buses", elem); - qbus_list_bus(dev, errp); + qbus_error_append_bus_list_hint(dev, errp); } else { error_setg(errp, "Device '%s' has no child bus", elem); } @@ -534,7 +536,7 @@ static BusState *qbus_find(const char *path, Error **er= rp) bus =3D qbus_find_bus(dev, elem); if (!bus) { error_setg(errp, "Bus '%s' not found", elem); - qbus_list_bus(dev, errp); + qbus_error_append_bus_list_hint(dev, errp); return NULL; } } --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657325; cv=none; d=zohomail.com; s=zohoarc; b=PVjWGKHMOSyHXCoQu6p9YPKKCV2q0Zccal5tHm4NGPTLLmnHObGBkMrqBEattz6MmGZKpwwypmR9HP0D+JCwOKlTMlAeL2C4emAdu3qn8t5trXU2EOnqDC31on/FEH/brD5yeaRl278xY839oys8No1vdiinmtZKkvzvItETPQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657325; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DCkgMdCs9M+FW3SBiXFe1dVrNAoaL+kwT+9vvcyqXwM=; b=HvP8mW/FGsf4VdpLBGoLkABuAP3KDRscaGNNWL1BPo4sDPbIuBi80ideQjuXAu47qgCaFdEKiSzww5XJSC+fEprVOTzn7JNu3cLOD3JCHYbUB00GD7s0P5ua0BApoOFpu3fBTRCYvCSHa9JhHx0ZKjniLBLtZYBeoLemF0Du5bQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657325905481.5668069540113; Wed, 18 Dec 2019 00:22:05 -0800 (PST) Received: from localhost ([::1]:50954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUaq-0003FX-94 for importer@patchew.org; Wed, 18 Dec 2019 03:22:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35450) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWR-0005wc-FR for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWP-0002RE-Mw for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:30 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:24892 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWP-0002PX-GT for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:29 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-286-o8fbVnnZPTiBE0uS2M4A7w-1; Wed, 18 Dec 2019 03:17:27 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3145D801E6C for ; Wed, 18 Dec 2019 08:17:26 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 029666888A for ; Wed, 18 Dec 2019 08:17:26 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A1BEA1136424; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DCkgMdCs9M+FW3SBiXFe1dVrNAoaL+kwT+9vvcyqXwM=; b=RNNTJ6K/8YgwclRnU2CM9ZnEANVDuhiH8g3sZVYHvmKu+mhDZJzkSMjPCx5xFoKjR7xWcX 7Nd3+Mt3QYFNU0/aYLGXcu4sNjxXTvScENefPaaRcsri/yK3I5rztkbIwSU08Q7qTZS7uK B5XTEEOwKLdSXGx/Ym1NiV9NqQzv/4g= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 20/35] Revert "ppc: well form kvmppc_hint_smt_possible error hint helper" Date: Wed, 18 Dec 2019 09:17:06 +0100 Message-Id: <20191218081721.23520-21-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: o8fbVnnZPTiBE0uS2M4A7w-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This reverts commit cdcca22aabafc0496894ce05c80097684832c7d9. Commit cdcca22aaba is a superseded version of the next commit that crept in by accident. Revert it, so the final version applies. Signed-off-by: Markus Armbruster --- target/ppc/kvm_ppc.h | 4 ++-- hw/ppc/spapr.c | 2 +- target/ppc/kvm.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index 47b08a4030..98bd7d5da6 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -28,7 +28,7 @@ void kvmppc_set_papr(PowerPCCPU *cpu); int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr); void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy); int kvmppc_smt_threads(void); -void kvmppc_error_append_smt_possible_hint(Error **errp_in); +void kvmppc_hint_smt_possible(Error **errp); int kvmppc_set_smt_threads(int smt); int kvmppc_clear_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits); int kvmppc_or_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits); @@ -164,7 +164,7 @@ static inline int kvmppc_smt_threads(void) return 1; } =20 -static inline void kvmppc_error_append_smt_possible_hint(Error **errp_in) +static inline void kvmppc_hint_smt_possible(Error **errp) { return; } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f11422fc41..32e1cc1d3f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2486,7 +2486,7 @@ static void spapr_set_vsmt_mode(SpaprMachineState *sp= apr, Error **errp) " requires the use of VSMT mode %d.\= n", smp_threads, kvm_smt, spapr->vsmt); } - kvmppc_error_append_smt_possible_hint(&local_err); + kvmppc_hint_smt_possible(&local_err); goto out; } } diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 7406d18945..c77f9848ec 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2076,7 +2076,7 @@ int kvmppc_set_smt_threads(int smt) return ret; } =20 -void kvmppc_error_append_smt_possible_hint(Error **errp_in) +void kvmppc_hint_smt_possible(Error **errp) { int i; GString *g; @@ -2091,10 +2091,10 @@ void kvmppc_error_append_smt_possible_hint(Error **= errp_in) } } s =3D g_string_free(g, false); - error_append_hint(errp_in, "%s.\n", s); + error_append_hint(errp, "%s.\n", s); g_free(s); } else { - error_append_hint(errp_in, + error_append_hint(errp, "This KVM seems to be too old to support VSMT.\n= "); } } --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657471; cv=none; d=zohomail.com; s=zohoarc; b=h3wJQgbdL23Mzv7qhiGX/N4gwi2MHTqGbe4+VEI++Irq67Gs+o780khSGWfj6SYp7vM1qhmmW5cQfaALK2c8h87PW+DpJyDTu4Yq7V+KvYlaIQw0AHCxK7Eoqvus7BPpoBZE7DuFFsdkpof4QSG4qZhQgw3VVUAbLE3NILtLwZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657471; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v0SlECmXnvCElCK6FazpIgRP6dlIDLSzgAxt04ZN/9E=; b=NRt1jiPONhEgaVFZtzI8BPdIjl1nCxMrKSqcQg8eNJNbRWxiscUOi6/a4yz+7xB0vA763U7fnxumxY24LoHMnP3Z4HUROJzslsBBSoGDkHkSTxFYiVFHT2wKHw7203kFhmlenJg4AXq0l1gBCMT3ALsq/4WhRi5w2NwVlUglA0E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657471732520.7628519562282; Wed, 18 Dec 2019 00:24:31 -0800 (PST) Received: from localhost ([::1]:50980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUdB-0006ib-Uq for importer@patchew.org; Wed, 18 Dec 2019 03:24:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35684) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWU-0005zN-T9 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWS-0002U4-G2 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:34 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:31772 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWR-0002Rr-G7 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:31 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-8-ixLtcdSfMMSWmyPcJmZogw-1; Wed, 18 Dec 2019 03:17:29 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E062D801E6C; Wed, 18 Dec 2019 08:17:27 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ACCA35C28D; Wed, 18 Dec 2019 08:17:27 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A5EE21136425; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v0SlECmXnvCElCK6FazpIgRP6dlIDLSzgAxt04ZN/9E=; b=AwN33eVNsWWb+TCb3yqRERP+AK8/vQcS0imyDQzcD9Fj3Kh2jYh++Ms6vamTNn0GppS/iu KHWRFIi2lRG0X3iZaDMeXNrC+OLH97yjHLVFMUUSbh84vWUTc5RdU6FuuXkbN58fDXf7RT DJxwTa6LOyIj97QLWmlEN7mSA3Sd3UU= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 21/35] ppc: make Error **errp const where it is appropriate Date: Wed, 18 Dec 2019 09:17:07 +0100 Message-Id: <20191218081721.23520-22-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: ixLtcdSfMMSWmyPcJmZogw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , Greg Kurz , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Mostly, Error ** is for returning error from the function, so the callee sets it. However kvmppc_hint_smt_possible gets already filled errp parameter. It doesn't change the pointer itself, only change the internal state of referenced Error object. So we can make it Error *const * errp, to stress the behavior. It will also help coccinelle script (in future) to distinguish such cases from common errp usage. While there, rename the function to kvmppc_error_append_smt_possible_hint(). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Greg Kurz Message-Id: <20191205174635.18758-8-vsementsov@virtuozzo.com> Acked-by: David Gibson Reviewed-by: Markus Armbruster [Commit message replaced] Signed-off-by: Markus Armbruster --- target/ppc/kvm_ppc.h | 4 ++-- hw/ppc/spapr.c | 2 +- target/ppc/kvm.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index 98bd7d5da6..f22daabf51 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -28,7 +28,7 @@ void kvmppc_set_papr(PowerPCCPU *cpu); int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr); void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy); int kvmppc_smt_threads(void); -void kvmppc_hint_smt_possible(Error **errp); +void kvmppc_error_append_smt_possible_hint(Error *const *errp); int kvmppc_set_smt_threads(int smt); int kvmppc_clear_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits); int kvmppc_or_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits); @@ -164,7 +164,7 @@ static inline int kvmppc_smt_threads(void) return 1; } =20 -static inline void kvmppc_hint_smt_possible(Error **errp) +static inline void kvmppc_error_append_smt_possible_hint(Error *const *err= p) { return; } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 32e1cc1d3f..f11422fc41 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2486,7 +2486,7 @@ static void spapr_set_vsmt_mode(SpaprMachineState *sp= apr, Error **errp) " requires the use of VSMT mode %d.\= n", smp_threads, kvm_smt, spapr->vsmt); } - kvmppc_hint_smt_possible(&local_err); + kvmppc_error_append_smt_possible_hint(&local_err); goto out; } } diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index c77f9848ec..27ea3ce535 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2076,7 +2076,7 @@ int kvmppc_set_smt_threads(int smt) return ret; } =20 -void kvmppc_hint_smt_possible(Error **errp) +void kvmppc_error_append_smt_possible_hint(Error *const *errp) { int i; GString *g; --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657771; cv=none; d=zohomail.com; s=zohoarc; b=nPlE7nZktTAozp7yXVyKrdjNThgqtSpWMIMPIzkZveCaTFPZU8jSKSo1hCNxNcrxF+cD/qZVfKSdZ9kjZymVwFSjxDy9Eca8rawkGTr0H8zZnB0lSfHzVcw5+hWKBGjT8gy/o1LgfxxEPh28YuuQrYU8kA973bS/tThHCvErT7M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657771; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lE2ASXi1Xmz2/vAd9C/cYNmssgI7GdbEFzurPjciP4E=; b=VkMVN1ITFnAty3pd0+PIF1GzxL0IcqEmCdq7zZ241EJj+siwUno6sjOhiPDv4ht1CdanSc22rJq/jZ+ZZwA3HmhoQtYTn7+5WFwmAVc5cKAoMHwjvnNag/ICOlbGjxdpQ+heichenwXcrqGWiBQKMv6NryY8jwoXYrnRIj2g06g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657771733217.05979237422412; Wed, 18 Dec 2019 00:29:31 -0800 (PST) Received: from localhost ([::1]:51048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUi2-0005Kt-4c for importer@patchew.org; Wed, 18 Dec 2019 03:29:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35836) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWX-00061q-1i for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWV-0002Xl-80 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:31572 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWT-0002Tg-E3 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:34 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-354-kG3TeBskM7WZkI9UkkYGJw-1; Wed, 18 Dec 2019 03:17:28 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 90A03801E77; Wed, 18 Dec 2019 08:17:27 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 609761001281; Wed, 18 Dec 2019 08:17:27 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AA13E1136426; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lE2ASXi1Xmz2/vAd9C/cYNmssgI7GdbEFzurPjciP4E=; b=KJ0drI4fXKPUeqFYowuVJgjh23blpblYekvLxsbNg9nIDz5KDupAjWn32iyK1WNHkLBp3/ Yf1XGslcb4WDMlGnyc7S57FCd0wD8QJYP1g89UrHVzBzdKZl2EBnVastuCzd0IxcHHoa81 k6dZm2XN/hKuXm/l0AyVSdkrvVTCfsU= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 22/35] 9pfs: make Error **errp const where it is appropriate Date: Wed, 18 Dec 2019 09:17:08 +0100 Message-Id: <20191218081721.23520-23-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: kG3TeBskM7WZkI9UkkYGJw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Mostly, Error ** is for returning error from the function, so the callee sets it. However error_append_security_model_hint and error_append_socket_sockfd_hint get already filled errp parameter. They don't change the pointer itself, only change the internal state of referenced Error object. So we can make it Error *const * errp, to stress the behavior. It will also help coccinelle script (in future) to distinguish such cases from common errp usage. Signed-off-by: Vladimir Sementsov-Ogievskiy Acked-by: Greg Kurz Message-Id: <20191205174635.18758-9-vsementsov@virtuozzo.com> Reviewed-by: Markus Armbruster [Commit message replaced] Signed-off-by: Markus Armbruster --- hw/9pfs/9p-local.c | 2 +- hw/9pfs/9p-proxy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index 4708c0bd89..ca641390fb 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -1473,7 +1473,7 @@ static void local_cleanup(FsContext *ctx) g_free(data); } =20 -static void error_append_security_model_hint(Error **errp) +static void error_append_security_model_hint(Error *const *errp) { error_append_hint(errp, "Valid options are: security_model=3D" "[passthrough|mapped-xattr|mapped-file|none]\n"); diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c index 97ab9c58a5..8136e1342d 100644 --- a/hw/9pfs/9p-proxy.c +++ b/hw/9pfs/9p-proxy.c @@ -1114,7 +1114,7 @@ static int connect_namedsocket(const char *path, Erro= r **errp) return sockfd; } =20 -static void error_append_socket_sockfd_hint(Error **errp) +static void error_append_socket_sockfd_hint(Error *const *errp) { error_append_hint(errp, "Either specify socket=3D/some/path where /som= e/path" " points to a listening AF_UNIX socket or sock_fd=3D= fd" --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657972; cv=none; d=zohomail.com; s=zohoarc; b=KUUa6A/CtxA6utdZGVO7enOZI1D0TOu1MUp+PXhRZnpyylB0iP4VSj5OtRSulGJBjxG0LTa1pr+KHME5atBnBLN6gusQl+IbuSmY5DhOOSe0OwSjMeyTTMpUgYe7VEzDaqnhSJeKA4sK9pPI+3GiGk3y2YmssS4IYUZp2ORAolU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657972; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=C93fgCuYkcySyFZzbNYaKAJAO/+ByfBxZR60vnYOo/s=; b=Ll7Uhysv4g+smaiEzUEnyQ17DrLKAmb/aJUf6CS4797FJzajeztO9o9BsqblL/tlLd2u37cp9YkswN4WcaC67qhwJVoiHxrBKnZ7cxGAqAzVbiQLIz3KZUyLVpj1/MDfqJWYlT+cRnl7iMg5e4CGJhZNwjUFl7hChf5c6YJroWM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657972429576.3903858658974; Wed, 18 Dec 2019 00:32:52 -0800 (PST) Received: from localhost ([::1]:51098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUlG-0001QH-N5 for importer@patchew.org; Wed, 18 Dec 2019 03:32:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35853) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWX-000621-2F for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWU-0002WE-ES for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:40684 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWT-0002U7-24 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:33 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-293-NWwVYIJ3Mt-OlFxdTGo2Qw-1; Wed, 18 Dec 2019 03:17:31 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 20AE4185432C; Wed, 18 Dec 2019 08:17:30 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 67F167D8FA; Wed, 18 Dec 2019 08:17:27 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AE3FD1136427; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C93fgCuYkcySyFZzbNYaKAJAO/+ByfBxZR60vnYOo/s=; b=POWD+u6ZkM3OF1QQSHOhiPi7OP6H2M3hdvQKyMW3TP12wPvkZT6oprhaH5mu6o3qnfkgtc NJ9C/MddOpeliJqa54tL0rFaobBFjpQVNHeC4r8USF3T+L2iiPRpSjkBfmNWIaepOYTNDw gVsw7+rRlV2yveyw5wdMBxoN1OPzSZI= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 23/35] hw/core/qdev: cleanup Error ** variables Date: Wed, 18 Dec 2019 09:17:09 +0100 Message-Id: <20191218081721.23520-24-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: NWwVYIJ3Mt-OlFxdTGo2Qw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Vladimir Sementsov-Ogievskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Rename Error ** parameter in check_only_migratable to common errp. In device_set_realized: - Move "if (local_err !=3D NULL)" closer to error setters. - Drop 'Error **local_errp': it doesn't save any LoCs, but it's very unusual. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Markus Armbruster Message-Id: <20191205174635.18758-10-vsementsov@virtuozzo.com> Signed-off-by: Markus Armbruster --- hw/core/qdev.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index cf1ba28fe3..82d3ee590a 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -820,12 +820,12 @@ static bool device_get_realized(Object *obj, Error **= errp) return dev->realized; } =20 -static bool check_only_migratable(Object *obj, Error **err) +static bool check_only_migratable(Object *obj, Error **errp) { DeviceClass *dc =3D DEVICE_GET_CLASS(obj); =20 if (!vmstate_check_only_migratable(dc->vmsd)) { - error_setg(err, "Device %s is not migratable, but " + error_setg(errp, "Device %s is not migratable, but " "--only-migratable was specified", object_get_typename(obj)); return false; @@ -874,10 +874,9 @@ static void device_set_realized(Object *obj, bool valu= e, Error **errp) =20 if (dc->realize) { dc->realize(dev, &local_err); - } - - if (local_err !=3D NULL) { - goto fail; + if (local_err !=3D NULL) { + goto fail; + } } =20 DEVICE_LISTENER_CALL(realize, Forward, dev); @@ -918,27 +917,26 @@ static void device_set_realized(Object *obj, bool val= ue, Error **errp) } =20 } else if (!value && dev->realized) { - Error **local_errp =3D NULL; + /* We want local_err to track only the first error */ QLIST_FOREACH(bus, &dev->child_bus, sibling) { - local_errp =3D local_err ? NULL : &local_err; object_property_set_bool(OBJECT(bus), false, "realized", - local_errp); + local_err ? NULL : &local_err); } if (qdev_get_vmsd(dev)) { vmstate_unregister(dev, qdev_get_vmsd(dev), dev); } if (dc->unrealize) { - local_errp =3D local_err ? NULL : &local_err; - dc->unrealize(dev, local_errp); + dc->unrealize(dev, local_err ? NULL : &local_err); } dev->pending_deleted_event =3D true; DEVICE_LISTENER_CALL(unrealize, Reverse, dev); - } =20 - if (local_err !=3D NULL) { - goto fail; + if (local_err !=3D NULL) { + goto fail; + } } =20 + assert(local_err =3D=3D NULL); dev->realized =3D value; return; =20 @@ -976,7 +974,7 @@ static bool device_get_hotpluggable(Object *obj, Error = **errp) qbus_is_hotpluggable(dev->parent_bus)); } =20 -static bool device_get_hotplugged(Object *obj, Error **err) +static bool device_get_hotplugged(Object *obj, Error **errp) { DeviceState *dev =3D DEVICE(obj); =20 --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658330; cv=none; d=zohomail.com; s=zohoarc; b=jH/DiLrB9onuxnHmKQ1XKCDnuigyMVAAPbtSD3MgI6eHmqjn1Cg9dHptlLblL+VOW2T6/eSMZR70HkRa+GriTeCaoR9iwxa59jjuXa9kI2IlLr1ccTOseITId30U9iL0r5SCB8um+kYkAp79ija8F4zw7aKNRHTIIxxzH5Wd4eQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658330; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=c6f6Jd/iz7emJKypVVi34B7fHSfFbx40tceL+5zU5Ms=; b=UHUB7BcS+Tcj2J/oDnBLe0X2X9AbnW5QZxc464zD22+vL3KjC1mus7gzLj5SsbVcic9HVLFvqjBAjJzVuPvav7LzU4Pl3IyDXlR+ZllhzHEhs6a1AD9xZ7HB3KZyeqi79PD3p38bbR44B/gck2R5Mm/kVO9j5Rb5ffJ/Q5RNPMQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658330845498.70862259024034; Wed, 18 Dec 2019 00:38:50 -0800 (PST) Received: from localhost ([::1]:51174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUr3-0000tc-E0 for importer@patchew.org; Wed, 18 Dec 2019 03:38:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35813) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWW-00061m-MX for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWU-0002WO-I3 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:53967 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWT-0002Tb-7n for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:33 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-8-5cuFJoTgNeOCn8K52GapuA-1; Wed, 18 Dec 2019 03:17:28 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9C0FD800D55; Wed, 18 Dec 2019 08:17:27 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6D09A1000325; Wed, 18 Dec 2019 08:17:27 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B254A1136428; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c6f6Jd/iz7emJKypVVi34B7fHSfFbx40tceL+5zU5Ms=; b=AZ6CyatDxz8YtEL8sA2rhzHgwQWRGkP12jxZsXZE8U7c9sZoit2UnV8k92gFw9J6iOqg/G JPT9g+j0zuUWzFFciFKcHDt22vwAcuCZ1jgfZplmx1A5eSZuTaT/t4ynTkgru28+L+3oFi 3EY8dpW96utoKvTwOKoFwWIJd3Xwpuk= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 24/35] block/snapshot: rename Error ** parameter to more common errp Date: Wed, 18 Dec 2019 09:17:10 +0100 Message-Id: <20191218081721.23520-25-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: 5cuFJoTgNeOCn8K52GapuA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake Message-Id: <20191205174635.18758-11-vsementsov@virtuozzo.com> Signed-off-by: Markus Armbruster --- include/block/snapshot.h | 2 +- block/snapshot.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/block/snapshot.h b/include/block/snapshot.h index b5d5084a12..2bfcd57578 100644 --- a/include/block/snapshot.h +++ b/include/block/snapshot.h @@ -78,7 +78,7 @@ int bdrv_snapshot_load_tmp_by_id_or_name(BlockDriverState= *bs, =20 bool bdrv_all_can_snapshot(BlockDriverState **first_bad_bs); int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bs= d_bs, - Error **err); + Error **errp); int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_= bs, Error **errp); int bdrv_all_find_snapshot(const char *name, BlockDriverState **first_bad_= bs); diff --git a/block/snapshot.c b/block/snapshot.c index 8081616ae9..bd9fb01817 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -426,7 +426,7 @@ fail: } =20 int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_ba= d_bs, - Error **err) + Error **errp) { int ret =3D 0; BlockDriverState *bs; @@ -441,7 +441,7 @@ int bdrv_all_delete_snapshot(const char *name, BlockDri= verState **first_bad_bs, bdrv_snapshot_find(bs, snapshot, name) >=3D 0) { ret =3D bdrv_snapshot_delete(bs, snapshot->id_str, - snapshot->name, err); + snapshot->name, errp); } aio_context_release(ctx); if (ret < 0) { --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658042; cv=none; d=zohomail.com; s=zohoarc; b=d4BLT08CfvFOPHAKb2vCWuW5A1CzLEX6rhoPYekPWs/9EH+xUCuO4ZxrX75EzmSNYmlMRlhQux6LXHnlWTQWW7ewozBrvzOlfPdiLqyds3gsgNG1Es2AJt80IpDG0elBLQ8Jx59huUc3LiiceJGP6aAL8F+4G/PUanVGJdYHdEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658042; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n9Nd35jhdm8gVascpo1WYQoMoWHudRbAkRHhYSsuGv0=; b=isX1aeE/0gng8zHTz3gfi4jdJCiahRyJNYtv6F2gfjlCNedxH77yI5fg8jWn50OyPBX4M3FP/DBltL9dfI4FkVaAjGUHaeJzedT/kWWHO5uKt/JX9lmqYky1ACnFGw1vZ2bIXP6K4bDla1pBELxqJhRGNkxjQ9idkGwLDclJXJE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658042591648.1257333708611; Wed, 18 Dec 2019 00:34:02 -0800 (PST) Received: from localhost ([::1]:51112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUmO-0002eV-R0 for importer@patchew.org; Wed, 18 Dec 2019 03:34:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35814) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWW-00061n-NO for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWU-0002Wb-Ft for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:36838 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWT-0002SK-A1 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:33 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-332-fT-j6d3xN6KbKesn-xXBkg-1; Wed, 18 Dec 2019 03:17:29 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 49436DB25; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 19A451000325; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B68EF1136429; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n9Nd35jhdm8gVascpo1WYQoMoWHudRbAkRHhYSsuGv0=; b=dEY7T77dUOpo91OXiv7aLK8nfHJ9YG7WyFy/Whx9s80EmGFk2MiM6oUhV34tR51LkxtsyF Sq8cvy82cuNqgUTjh0M5T/aoLV8HRwz/o75IR736VCCiJKvmKeEa3ftCYHLbpkFpUKvJNy jSdswzp+C54XM0zTXJe7GGwlXXH/49s= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 25/35] hw/i386/amd_iommu: rename Error ** parameter to more common errp Date: Wed, 18 Dec 2019 09:17:11 +0100 Message-Id: <20191218081721.23520-26-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: fT-j6d3xN6KbKesn-xXBkg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20191205174635.18758-12-vsementsov@virtuozzo.com> Signed-off-by: Markus Armbruster --- hw/i386/amd_iommu.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index d55dbf07fc..b1175e52c7 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1533,7 +1533,7 @@ static void amdvi_reset(DeviceState *dev) amdvi_init(s); } =20 -static void amdvi_realize(DeviceState *dev, Error **err) +static void amdvi_realize(DeviceState *dev, Error **errp) { int ret =3D 0; AMDVIState *s =3D AMD_IOMMU_DEVICE(dev); @@ -1549,21 +1549,21 @@ static void amdvi_realize(DeviceState *dev, Error *= *err) /* This device should take care of IOMMU PCI properties */ x86_iommu->type =3D TYPE_AMD; qdev_set_parent_bus(DEVICE(&s->pci), &bus->qbus); - object_property_set_bool(OBJECT(&s->pci), true, "realized", err); + object_property_set_bool(OBJECT(&s->pci), true, "realized", errp); ret =3D pci_add_capability(&s->pci.dev, AMDVI_CAPAB_ID_SEC, 0, - AMDVI_CAPAB_SIZE, err); + AMDVI_CAPAB_SIZE, errp); if (ret < 0) { return; } s->capab_offset =3D ret; =20 ret =3D pci_add_capability(&s->pci.dev, PCI_CAP_ID_MSI, 0, - AMDVI_CAPAB_REG_SIZE, err); + AMDVI_CAPAB_REG_SIZE, errp); if (ret < 0) { return; } ret =3D pci_add_capability(&s->pci.dev, PCI_CAP_ID_HT, 0, - AMDVI_CAPAB_REG_SIZE, err); + AMDVI_CAPAB_REG_SIZE, errp); if (ret < 0) { return; } @@ -1578,8 +1578,8 @@ static void amdvi_realize(DeviceState *dev, Error **e= rr) sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->mmio); sysbus_mmio_map(SYS_BUS_DEVICE(s), 0, AMDVI_BASE_ADDR); pci_setup_iommu(bus, amdvi_host_dma_iommu, s); - s->devid =3D object_property_get_int(OBJECT(&s->pci), "addr", err); - msi_init(&s->pci.dev, 0, 1, true, false, err); + s->devid =3D object_property_get_int(OBJECT(&s->pci), "addr", errp); + msi_init(&s->pci.dev, 0, 1, true, false, errp); amdvi_init(s); } =20 --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658159; cv=none; d=zohomail.com; s=zohoarc; b=LwvrUKNPk8GKSegsyAtfss8UF5PyWtQTwgr+9pX+4/uPlVJkuFbJRwv7UfI4PRaXnsMQVAMw3Oy6irX8f0Qz++9ngOCO+n47wNJ7YTEJpQOx7wGQsC23Ab//4ltSDyVVGY/5cP5MTklUaM7BFSSvrHsosbciMWOpubu+WSs+Poc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658159; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eb/1E4SQ+zuRjF2JbD755tOvo1a7Jww6246JnRA8vRw=; b=UNT4a1EFCDX2QMLdh7c/S4O9fOks5OT2ZGWVBcCslMnfZEeybGtAlsnDjh3JLYl2DXOFQNBDKXr6BtaZa3Dz74DYqwTpoa0HZXSj66FOmae2pzxAPaVciNs5ti78iMfJQLanyQmDEC6+NFPNVr2VIcG3DbM7JaLBb+Vv17OLUo0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658159016292.54222938642454; Wed, 18 Dec 2019 00:35:59 -0800 (PST) Received: from localhost ([::1]:51134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUoH-0004fJ-Cm for importer@patchew.org; Wed, 18 Dec 2019 03:35:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35840) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWX-00061x-3Y for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWU-0002XB-Rm for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:32015 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWT-0002Us-F6 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:34 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-23-Xp6_Y0TWMFyrw5gh27XpVQ-1; Wed, 18 Dec 2019 03:17:29 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4FF2BDB2A; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B2AD26DD7; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BAB5B113642A; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eb/1E4SQ+zuRjF2JbD755tOvo1a7Jww6246JnRA8vRw=; b=i88lRVvBO3Kr0JSURvnXeaMPkyBuBp6BowUS+9+pYmfk99M2XNOvLbBCzq66EZW1Lzjh2D PG/Pyov45rGFvpxDrC9AtxNDz+jzmgXRMnuKB1WjAGfxPAv0/Zr7H1gCPi165YN6BQJkgy NRJUCpNjFc0DsY31UfI6qLwn1oO0cYg= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 26/35] qga: rename Error ** parameter to more common errp Date: Wed, 18 Dec 2019 09:17:12 +0100 Message-Id: <20191218081721.23520-27-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: Xp6_Y0TWMFyrw5gh27XpVQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20191205174635.18758-13-vsementsov@virtuozzo.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qga/commands-posix.c | 2 +- qga/commands-win32.c | 2 +- qga/commands.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 10d818c3b2..93474ff770 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -2794,7 +2794,7 @@ static double ga_get_login_time(struct utmpx *user_in= fo) return seconds + useconds; } =20 -GuestUserList *qmp_guest_get_users(Error **err) +GuestUserList *qmp_guest_get_users(Error **errp) { GHashTable *cache =3D NULL; GuestUserList *head =3D NULL, *cur_item =3D NULL; diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 55ba5b263a..2461fd19bf 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -1946,7 +1946,7 @@ typedef struct _GA_WTSINFOA { =20 } GA_WTSINFOA; =20 -GuestUserList *qmp_guest_get_users(Error **err) +GuestUserList *qmp_guest_get_users(Error **errp) { #define QGA_NANOSECONDS 10000000 =20 diff --git a/qga/commands.c b/qga/commands.c index 0c7d1385c2..43c323cead 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -143,7 +143,7 @@ static GuestExecInfo *guest_exec_info_find(int64_t pid_= numeric) return NULL; } =20 -GuestExecStatus *qmp_guest_exec_status(int64_t pid, Error **err) +GuestExecStatus *qmp_guest_exec_status(int64_t pid, Error **errp) { GuestExecInfo *gei; GuestExecStatus *ges; @@ -152,7 +152,7 @@ GuestExecStatus *qmp_guest_exec_status(int64_t pid, Err= or **err) =20 gei =3D guest_exec_info_find(pid); if (gei =3D=3D NULL) { - error_setg(err, QERR_INVALID_PARAMETER, "pid"); + error_setg(errp, QERR_INVALID_PARAMETER, "pid"); return NULL; } =20 @@ -385,7 +385,7 @@ GuestExec *qmp_guest_exec(const char *path, bool has_env, strList *env, bool has_input_data, const char *input_data, bool has_capture_output, bool capture_output, - Error **err) + Error **errp) { GPid pid; GuestExec *ge =3D NULL; @@ -405,7 +405,7 @@ GuestExec *qmp_guest_exec(const char *path, arglist.next =3D has_arg ? arg : NULL; =20 if (has_input_data) { - input =3D qbase64_decode(input_data, -1, &ninput, err); + input =3D qbase64_decode(input_data, -1, &ninput, errp); if (!input) { return NULL; } @@ -424,7 +424,7 @@ GuestExec *qmp_guest_exec(const char *path, guest_exec_task_setup, NULL, &pid, has_input_data ? &in_fd : N= ULL, has_output ? &out_fd : NULL, has_output ? &err_fd : NULL, &ger= r); if (!ret) { - error_setg(err, QERR_QGA_COMMAND_FAILED, gerr->message); + error_setg(errp, QERR_QGA_COMMAND_FAILED, gerr->message); g_error_free(gerr); goto done; } @@ -499,7 +499,7 @@ int ga_parse_whence(GuestFileWhence *whence, Error **er= rp) return -1; } =20 -GuestHostName *qmp_guest_get_host_name(Error **err) +GuestHostName *qmp_guest_get_host_name(Error **errp) { GuestHostName *result =3D NULL; gchar const *hostname =3D g_get_host_name(); --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657615; cv=none; d=zohomail.com; s=zohoarc; b=LRmdjNzuSsyjmxg2GYCqehlr+Cslr7uanXJcKfXMPOomeAy6KvvZWXUIl81u4I5TGWfctpvM2N8MCZxwx44ZXoaAg0i1jznZ8xIii0Q/4psSU14aae/XTjSUXCWaN0lCBWIAhKwmZ9iUxW3ic0BZZy70CCL5Ext9xf1hvjMiEfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657615; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DOX0W++XheYbWovQdyx7jBTjYUart7a6NK1qrHLKgJw=; b=kz6+VoLSTabAv5ha4SNTn8uqOEkJ0F2tWmwYbukq6lMPSe8Zv7kW6OrO2pz7Pi4p2MfD030oeenuZFjjtNGVoHqR6soJpftDwDaB4VBOceKNpZZ6vGjFTBZOw2NKTfyJvmMiVFX3fc94CaGAEU5SFTcv3PrtSZ7LTAoSs8V5niU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657615448844.296641599609; Wed, 18 Dec 2019 00:26:55 -0800 (PST) Received: from localhost ([::1]:51016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUfV-0001n4-S0 for importer@patchew.org; Wed, 18 Dec 2019 03:26:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35815) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWW-00061o-N6 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWU-0002XU-Ss for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:48871 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWT-0002Td-AB for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:33 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-310-7h-tuwlNOXym9lhvwVJCvA-1; Wed, 18 Dec 2019 03:17:30 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id AA388800D55; Wed, 18 Dec 2019 08:17:29 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1FE5D5D9E5; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BED75113642B; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DOX0W++XheYbWovQdyx7jBTjYUart7a6NK1qrHLKgJw=; b=DCPYZbbH/97erwpCDbZMGWKOHiC9ATrGydPNenR8Ky4GgEsvRzXq9+9vUvINHCewKIXVsS /lK5F7dAd2X8AJcjz3wyLKV93fYrUL2QMg59gann8bFeOTHuMTjECh35hVePbdyNU7/+EB kIF9coGDjZ6ZiLbxvhSmaTFsMQ/DxjU= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 27/35] monitor/qmp-cmds: rename Error ** parameter to more common errp Date: Wed, 18 Dec 2019 09:17:13 +0100 Message-Id: <20191218081721.23520-28-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 7h-tuwlNOXym9lhvwVJCvA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20191205174635.18758-14-vsementsov@virtuozzo.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Markus Armbruster --- monitor/qmp-cmds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 0880341a2d..c6faa3eaf0 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -109,7 +109,7 @@ void qmp_system_reset(Error **errp) qemu_system_reset_request(SHUTDOWN_CAUSE_HOST_QMP_SYSTEM_RESET); } =20 -void qmp_system_powerdown(Error **erp) +void qmp_system_powerdown(Error **errp) { qemu_system_powerdown_request(); } --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658536; cv=none; d=zohomail.com; s=zohoarc; b=V9OVYgiNDF27Ro8dUH3aB88ZM5JUTSBRN9iuUlL9Bkq/bMM/xeoPr0JSeGDNnuclKN7ddCgZ0bEaoNm3OnyEnCKf9hSmqvTZ/x7yCGnGEiiwWeplax0qAPqWXxs1ISdTRE23NTPtj+n7WKMoV92bdTG8CmNhfd/LSR5iwMwGrmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658536; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qRKfYDk0ubnQO6U4DC9O3vj4IfjkD4+ks4HjQEmHCHQ=; b=jO4xaiAPyLQbOFsrVtkJocyM0r+zmi+9P6Z8OTCae5AVKPAPWq9WJtP9DzzmnreBdZUGgmuz9F+1vSzmBI8nFYKY+n8Up/Gjr8AC8afXWtboiPdhURrhQbiCZnbkGXXan0eWfBUjiVzxS4Qb2iw8hRNru6TDy8qz1mknZhPaTYk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658536854311.15666558252565; Wed, 18 Dec 2019 00:42:16 -0800 (PST) Received: from localhost ([::1]:51240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUuN-000699-8P for importer@patchew.org; Wed, 18 Dec 2019 03:42:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35976) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWZ-000660-CS for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWX-0002Zr-0M for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:38 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:40347 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWW-0002Xf-DG for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-388-op8Xn19HP4e4yAwnGRbwoA-1; Wed, 18 Dec 2019 03:17:31 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B8282107ACC5; Wed, 18 Dec 2019 08:17:30 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 22A601000329; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C30C3113642C; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qRKfYDk0ubnQO6U4DC9O3vj4IfjkD4+ks4HjQEmHCHQ=; b=LZNzSbmy49BuMFRITKk+O+nnJ3bO7YfzAisWRLiTDdv/doczyBAzN30Z72zugZnZna0/WP ga7kbpFy9wwZchqoPie3dtyw9AJHKMI093/uo1Q8zZlE/6BtTIh9Tp5DOKL+ewKc2huJGn n4blzC7MkCL27YMrdssYPJik7rJDKbk= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 28/35] hw/s390x: rename Error ** parameter to more common errp Date: Wed, 18 Dec 2019 09:17:14 +0100 Message-Id: <20191218081721.23520-29-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: op8Xn19HP4e4yAwnGRbwoA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Hildenbrand , Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cornelia Huck Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Cornelia Huck Message-Id: <20191205174635.18758-15-vsementsov@virtuozzo.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Signed-off-by: Markus Armbruster --- hw/s390x/event-facility.c | 2 +- hw/s390x/s390-stattrib.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index cdcf9154c4..6afe278cad 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -441,7 +441,7 @@ static void sclp_event_set_allow_all_mask_sizes(Object = *obj, bool value, ef->allow_all_mask_sizes =3D value; } =20 -static bool sclp_event_get_allow_all_mask_sizes(Object *obj, Error **e) +static bool sclp_event_get_allow_all_mask_sizes(Object *obj, Error **errp) { SCLPEventFacility *ef =3D (SCLPEventFacility *)obj; =20 diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index bf5ac014c4..58121b9f68 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -352,7 +352,8 @@ static void s390_stattrib_class_init(ObjectClass *oc, v= oid *data) dc->realize =3D s390_stattrib_realize; } =20 -static inline bool s390_stattrib_get_migration_enabled(Object *obj, Error = **e) +static inline bool s390_stattrib_get_migration_enabled(Object *obj, + Error **errp) { S390StAttribState *s =3D S390_STATTRIB(obj); =20 --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657613; cv=none; d=zohomail.com; s=zohoarc; b=H3QdRQe/6yGcq50R6LreMfQPXroueXaJxqMHtVpjUrBcWQVifmYLiA+0++7Ozih9Wu6JnLQW9j5wCXoHpkQxcuw1SItr6aFvLJnaQLLzwkbK2Us/o1WpFJsZ1ltTDAHfZJ5XGR1GH2hcPtXr3qUxwMtAyMHpbLVryQcxbj0Rl4A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657613; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YQyo31yOIMAWoY5gSODjk4z41BQXDWiKUVDzu9supbM=; b=mRAHakuGmcv/IR/wWTiIldPwj5w96oUFbZU2SqsRgDsdhhELoI1DundxmpCKs0f8ex18WAXvdNThS339nIa6BgwWhhIfacva79Y1dSanfjlEZqSDM9lfeY1hMNESNDLj2Tk6tKOlrLArrRFnXH7anZvoi1CkUDN2+Y6KkZiQ6QQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657613881506.91174814814156; Wed, 18 Dec 2019 00:26:53 -0800 (PST) Received: from localhost ([::1]:51014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUfU-0001jC-5C for importer@patchew.org; Wed, 18 Dec 2019 03:26:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35677) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWU-0005zK-Tq for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWS-0002U9-GA for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:33 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:37113 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWR-0002Rz-FF for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:31 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-31-3RxOyB4SMm2PLFYIyvViug-1; Wed, 18 Dec 2019 03:17:29 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 57A431854334; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2434A68882; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C72A3113642D; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YQyo31yOIMAWoY5gSODjk4z41BQXDWiKUVDzu9supbM=; b=EBerPnifyd5tYcOT5OJJROeLFiJUcUZ6+cTHx53naVHT/Zqo4Ik8+ToEaH3t9cUmu75mjm nEPHV4OAIBnffcnFno8MW40IixksUzWFPS+68szRmAnl5qpHZg4RJ4sOpGpFCI9z9k4bwB j9DSaykACR+FDAuctZhUAQvRqP8dQa0= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 29/35] hw/sd: drop extra whitespace in sdhci_sysbus_realize() header Date: Wed, 18 Dec 2019 09:17:15 +0100 Message-Id: <20191218081721.23520-30-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: 3RxOyB4SMm2PLFYIyvViug-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Vladimir Sementsov-Ogievskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake Message-Id: <20191205174635.18758-16-vsementsov@virtuozzo.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Markus Armbruster --- hw/sd/sdhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 88404d0e9d..18c0c052ce 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1459,7 +1459,7 @@ static void sdhci_sysbus_finalize(Object *obj) sdhci_uninitfn(s); } =20 -static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) +static void sdhci_sysbus_realize(DeviceState *dev, Error **errp) { SDHCIState *s =3D SYSBUS_SDHCI(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658208; cv=none; d=zohomail.com; s=zohoarc; b=Yy3S8iakHZbbCNMCMzPf15GhvlJfDKSI/iFb0i4xiUPBHN3FZFYPB5QvE9MWzUXA2m6MsAaQfsjLQZzIvRt9UtyNmLfAqUu5z7hh25b9tixPBXvVWasefAAYJbnMRiWPFw/jkunwr06EDzFsEdo6OneiJRaArwoWEaprjc5RMKA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658208; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=o6X5EBo5dshZ/LBY7+llNds3TSh1Xu5KuWlr5SUktLQ=; b=b3P40bBss36gIxcACw0S3Ftz2aoTOqWh36O5EvY2LlUZVXfmE6XTBpO4beL42H98kOPgj6RYqgJWU+iUscKbL94YNI4yA6KZwWICL5sktQBfkgcOoGsah+ryvczFPPRGQUQoDQR8yOO6awX0nzTPMwU4TB3VlANzyUoWU5QxJUY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658208473934.0976843198564; Wed, 18 Dec 2019 00:36:48 -0800 (PST) Received: from localhost ([::1]:51150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUp4-0005x5-Pe for importer@patchew.org; Wed, 18 Dec 2019 03:36:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35842) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWX-00061z-47 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWU-0002X6-Rs for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:22358 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWT-0002SG-BT for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:33 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-178-63fbUR12Ozy-VxVCkGacsA-1; Wed, 18 Dec 2019 03:17:29 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5CAC3800D5A; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 286567D903; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CB660113642E; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o6X5EBo5dshZ/LBY7+llNds3TSh1Xu5KuWlr5SUktLQ=; b=S12HAy7RKSnI05k49he1u+hvKM2NBYMvLatd3u+2uApS2CQUGa7huL+fHrimg9DOIqD6+/ hZveThhLNwS9Vg/+FtJgUJ9YCipAAciC0c3Tpk9MQFAWohxiTlvqdVATPVP3ZS5G7ujqDa NnteCbZ7UsVMTwe4anoEZtcQ76vhOHY= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 30/35] hw/tpm: rename Error ** parameter to more common errp Date: Wed, 18 Dec 2019 09:17:16 +0100 Message-Id: <20191218081721.23520-31-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: 63fbUR12Ozy-VxVCkGacsA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Stefan Berger Message-Id: <20191205174635.18758-17-vsementsov@virtuozzo.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Markus Armbruster --- hw/tpm/tpm_emulator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c index 22f9113432..10d587ed40 100644 --- a/hw/tpm/tpm_emulator.c +++ b/hw/tpm/tpm_emulator.c @@ -155,7 +155,7 @@ static int tpm_emulator_unix_tx_bufs(TPMEmulator *tpm_e= mu, const uint8_t *in, uint32_t in_len, uint8_t *out, uint32_t out_len, bool *selftest_done, - Error **err) + Error **errp) { ssize_t ret; bool is_selftest =3D false; @@ -165,20 +165,20 @@ static int tpm_emulator_unix_tx_bufs(TPMEmulator *tpm= _emu, is_selftest =3D tpm_util_is_selftest(in, in_len); } =20 - ret =3D qio_channel_write_all(tpm_emu->data_ioc, (char *)in, in_len, e= rr); + ret =3D qio_channel_write_all(tpm_emu->data_ioc, (char *)in, in_len, e= rrp); if (ret !=3D 0) { return -1; } =20 ret =3D qio_channel_read_all(tpm_emu->data_ioc, (char *)out, - sizeof(struct tpm_resp_hdr), err); + sizeof(struct tpm_resp_hdr), errp); if (ret !=3D 0) { return -1; } =20 ret =3D qio_channel_read_all(tpm_emu->data_ioc, (char *)out + sizeof(struct tpm_resp_hdr), - tpm_cmd_get_size(out) - sizeof(struct tpm_resp_hdr), err); + tpm_cmd_get_size(out) - sizeof(struct tpm_resp_hdr), errp); if (ret !=3D 0) { return -1; } --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657765; cv=none; d=zohomail.com; s=zohoarc; b=nBZxOHUZedNVH4SQTZYVi5SJJwld8UvnLUnWvzc/Y3lwQPBNRE15qNZY38Mz+Sd+U86YAfkvFipcDEhUw22M6OIAzlPsFMx1ttgDJ/2LiPq+ZGiU46p4g8mTN+8gQUwkl9ls8nxXeaEMMJotkz3J0rseYhnL+oqukCyT34rbQ0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657765; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dNc6hFdjFrURuHaVDzPINziic4N3duECBfxLnGmnE68=; b=cHCnXoP7orM0GlMxA1LhePka5Liq4PToR4tn/hskaar/gew+CRsc28CnKirZD7fNPxYCrkwLYnhPhndfVoblPK0cA0BQ8saEfSDE0cea8pCRwkCvUhG+YzidIpoCxPDPMeX/v+U1Kph7oQsnA+yv6B0UUG+p8F+VY4JcfhdBPuo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657765966152.63551905528243; Wed, 18 Dec 2019 00:29:25 -0800 (PST) Received: from localhost ([::1]:51046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUhw-0005G8-9O for importer@patchew.org; Wed, 18 Dec 2019 03:29:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35717) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWV-0005zv-87 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWT-0002Ua-0w for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:34 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:23114 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWR-0002SF-TZ for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:32 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-178-hvwDQF2UODulJFW8l5-1iQ-1; Wed, 18 Dec 2019 03:17:29 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6DE28801E7E; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3907A7D90B; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CF9DA113642F; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dNc6hFdjFrURuHaVDzPINziic4N3duECBfxLnGmnE68=; b=YR6oCph6YUTMAzvBEDyosGhr1rI9QusXDZeQgi5Y3DPG/Lo6yNMqFnV3MymEAprGIOeFEr ntW4Kfr0VOJF57HD3tmy3hpVDUKP8ImocobX+OjJMRCUyBT4reqjueskkPrkvFfu4mNAGY JF+Cme5HkuhDB7Xuw2PpRCIR+34ZR8s= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 31/35] hw/usb: rename Error ** parameter to more common errp Date: Wed, 18 Dec 2019 09:17:17 +0100 Message-Id: <20191218081721.23520-32-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: hvwDQF2UODulJFW8l5-1iQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20191205174635.18758-18-vsementsov@virtuozzo.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Markus Armbruster --- hw/usb/dev-network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 5de6213cc4..b81a8abe83 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -1342,7 +1342,7 @@ static NetClientInfo net_usbnet_info =3D { .cleanup =3D usbnet_cleanup, }; =20 -static void usb_net_realize(USBDevice *dev, Error **errrp) +static void usb_net_realize(USBDevice *dev, Error **errp) { USBNetState *s =3D USB_NET(dev); =20 --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576657623; cv=none; d=zohomail.com; s=zohoarc; b=Vwk528yIfqG4lJqmESUhcJ8xtBFIllkDTpAtsFF/aE9IepDKnOTyTZZIxvS/4UcsRktHNk9WC4AXVSmXr0HoE6L6PWUJFrfrWEq1JwtkDowFUPybZ2fw81S2S2CBmP6BJehCqI/TpJ0Yxcr1zqGWnwaRBC3hLYoz3dFXAqEw+Lo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576657623; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=x2KuPE/iqqGrRtvWjQbnj5EQTcmHrnHOfWbiTaAQ67g=; b=hC8sRcZHxDWz3CdM1VFZhftl+i9CbtVEP5IgieZQelOYWCGSdkwij5rw4ExPQGIkWjm0wwiliBH4/9TeGuIDkztjCpGaKYabzru4dcRvC1sE3V85qfqbBXtiXE77bWyq6z4fr8HUihKd/yIuT+l7RCHoxAPGq2NSN9P1lhfKkVw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576657623364869.0461907879451; Wed, 18 Dec 2019 00:27:03 -0800 (PST) Received: from localhost ([::1]:51020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUfd-0001yP-M4 for importer@patchew.org; Wed, 18 Dec 2019 03:27:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35847) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWX-000620-4Y for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWU-0002XO-Sr for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:53783 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWT-0002Sk-B6 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:33 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-206-HO0CAyffOVWbp_-ryNdaOw-1; Wed, 18 Dec 2019 03:17:29 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6E317107ACC4; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 396FF620D8; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D3D461136430; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x2KuPE/iqqGrRtvWjQbnj5EQTcmHrnHOfWbiTaAQ67g=; b=f+CC6zU5IlRbuP7EJ4x/CInR3KO4O2UPDXkEeL0pN4bOUzJf//sRpHy+oPHlmgtFfXzRY8 Bge+7kevdLeHuUSX9oDgRZ8ZR0v8UW8lmUwFHopa65EUrz77XnZ6jSlinSaZbnzamJFb8Z l611SBpjlhcRPvfIWoiLIRdqN95+uag= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 32/35] include/qom/object.h: rename Error ** parameter to more common errp Date: Wed, 18 Dec 2019 09:17:18 +0100 Message-Id: <20191218081721.23520-33-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: HO0CAyffOVWbp_-ryNdaOw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20191205174635.18758-19-vsementsov@virtuozzo.com> Signed-off-by: Markus Armbruster --- include/qom/object.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index 128d00c77f..716f6f655d 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1635,9 +1635,9 @@ void object_class_property_add_uint32_ptr(ObjectClass= *klass, const char *name, * property of type 'uint64'. */ void object_property_add_uint64_ptr(Object *obj, const char *name, - const uint64_t *v, Error **Errp); + const uint64_t *v, Error **errp); void object_class_property_add_uint64_ptr(ObjectClass *klass, const char *= name, - const uint64_t *v, Error **Errp); + const uint64_t *v, Error **errp); =20 /** * object_property_add_alias: --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658568; cv=none; d=zohomail.com; s=zohoarc; b=cAQYtcG0kyFYmBqB3MoEaBmtaprxaUqKFg4Wy0xvYoqGVmzvInYxIMq7EbSL4faBRyhvSSwPzD/88NGL8iHQIAZ2GlFnDm0mMlfHFabGRo1jiMgQ/hwWdobaAoBA46HnA0rukjfVZkpyH0eHhbgeWOiJzGoHJ27bYKwF5HB0GMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658568; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FZ2DbNqFEAdNbbqQ3g6CSccV8ATliONK13wR0ePiKL0=; b=gAPcJ6Ic+ght0YAl8VM+O41YepcxewynEkN8L9N/bJW0wDwkzhTpGlkzD7Y4wsDZf0kS3FGbgK6QSpa+VvqyFVDKX1ZAlh9ex2+6f9gAMgq2aHxEgOAtgoPXcXIsEO7KBN1xlDJYc05mXO/+3K/nr7aAN9CFUP8WQHWFFhwF/DY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658568263523.0221461632577; Wed, 18 Dec 2019 00:42:48 -0800 (PST) Received: from localhost ([::1]:51246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUus-00076G-2P for importer@patchew.org; Wed, 18 Dec 2019 03:42:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36126) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWa-00067G-48 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWY-0002c4-Tx for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:39 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:35732 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWW-0002YW-KE for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:36 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-337-VB7uZBIpNLyzO3XkCVIYDg-1; Wed, 18 Dec 2019 03:17:34 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9475D800D5A; Wed, 18 Dec 2019 08:17:33 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 43A5F60C18; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D7F8C1136431; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FZ2DbNqFEAdNbbqQ3g6CSccV8ATliONK13wR0ePiKL0=; b=i9VMTo/3pRnmNhpOVMQsCCHMmE2iF8t9dnIpmCohlPLk+GvjgseO/4+GoL91QyO8smOL8+ wzIz88Cw3a4SaTnHUursQrlTnj7galGe+zqqXmfmvjn4lZEHmFZYunF3zz7y+pLNEACahy YlKmv22PmH68B40umqXA2PgPwuoHvI0= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 33/35] backends/cryptodev: drop local_err from cryptodev_backend_complete() Date: Wed, 18 Dec 2019 09:17:19 +0100 Message-Id: <20191218081721.23520-34-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: VB7uZBIpNLyzO3XkCVIYDg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gonglei Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy No reason for local_err here, use errp directly instead. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Gonglei Message-Id: <20191205174635.18758-20-vsementsov@virtuozzo.com> Signed-off-by: Markus Armbruster --- backends/cryptodev.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/backends/cryptodev.c b/backends/cryptodev.c index 3c071eab95..5a9735684e 100644 --- a/backends/cryptodev.c +++ b/backends/cryptodev.c @@ -176,19 +176,10 @@ cryptodev_backend_complete(UserCreatable *uc, Error *= *errp) { CryptoDevBackend *backend =3D CRYPTODEV_BACKEND(uc); CryptoDevBackendClass *bc =3D CRYPTODEV_BACKEND_GET_CLASS(uc); - Error *local_err =3D NULL; =20 if (bc->init) { - bc->init(backend, &local_err); - if (local_err) { - goto out; - } + bc->init(backend, errp); } - - return; - -out: - error_propagate(errp, local_err); } =20 void cryptodev_backend_set_used(CryptoDevBackend *backend, bool used) --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658735; cv=none; d=zohomail.com; s=zohoarc; b=mzkXRi+cPdcUSYDN87XtaD2dyK2n6swFJPXgzJre77fMLwRiA0/f7TG8MhNC3kBBrmfCCcKIwnYWi5aE8zqrEwdFQ3M9TQHRfHXqxjj5vw32Ss/6Y8x3vspBDtmkpiTIbC2tay1Y4r/dWMN3VxiPXbVT3HfAUTe8BeYhyL/G7M8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658735; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HktqrVv0Tt2FKK/0WSo+4o3EvZ+0VSPvuEV+CM3+v8Q=; b=RW/crCXylPJ+OcxtHSmgv/HzdMqS5D/sU5yuw8jCS0e21ZaoLHPB1ye/KlC+L4EtTJIjIWT9KqoBnugf/mBVx9gl3qJX0fdqDdWKNoX75r//nNdDKK1rMNMSoJjtNnT1uH0nSNh4L/DszfaebQG0dWbgedeAVHkTwmpS/s9gYHA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658735586200.44509169300034; Wed, 18 Dec 2019 00:45:35 -0800 (PST) Received: from localhost ([::1]:51284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUxa-00031c-FT for importer@patchew.org; Wed, 18 Dec 2019 03:45:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47681) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUbo-0005Bv-TU for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:23:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUbn-0003su-2m for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:23:04 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:53754 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUbm-0003qp-VU for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:23:03 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-324-GOH8EWd-MkqOup3JYwhUAA-1; Wed, 18 Dec 2019 03:17:29 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id BC455107ACCD; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 47D945DA70; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DC2421136432; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HktqrVv0Tt2FKK/0WSo+4o3EvZ+0VSPvuEV+CM3+v8Q=; b=Q658exgyFu4ewYpvJh7InZgtRwDG1LAjXfNTiJOoI40lRhkNALx/j7CJUAjPnsq7QKX2ka 5J8YefA9Owzs6rv9f1iaj5+my98J9IfuleBUEaMzed7s+/TuVVcMAPLQFQN42dl/qHHzNm ohgdaKwUpcnq9/GKKEPFxBRJ9ou+TTE= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 34/35] hw/vfio/ap: drop local_err from vfio_ap_realize Date: Wed, 18 Dec 2019 09:17:20 +0100 Message-Id: <20191218081721.23520-35-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: GOH8EWd-MkqOup3JYwhUAA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy , Cornelia Huck Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy No reason for local_err here, use errp directly instead. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Markus Armbruster Reviewed-by: Cornelia Huck Message-Id: <20191205174635.18758-21-vsementsov@virtuozzo.com> Signed-off-by: Markus Armbruster --- hw/vfio/ap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index da6a20669d..8fbaa724c2 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -89,14 +89,13 @@ static void vfio_ap_realize(DeviceState *dev, Error **e= rrp) { int ret; char *mdevid; - Error *local_err =3D NULL; VFIOGroup *vfio_group; APDevice *apdev =3D AP_DEVICE(dev); VFIOAPDevice *vapdev =3D VFIO_AP_DEVICE(apdev); =20 - vfio_group =3D vfio_ap_get_group(vapdev, &local_err); + vfio_group =3D vfio_ap_get_group(vapdev, errp); if (!vfio_group) { - goto out_err; + return; } =20 vapdev->vdev.ops =3D &vfio_ap_ops; @@ -113,7 +112,7 @@ static void vfio_ap_realize(DeviceState *dev, Error **e= rrp) */ vapdev->vdev.balloon_allowed =3D true; =20 - ret =3D vfio_get_device(vfio_group, mdevid, &vapdev->vdev, &local_err); + ret =3D vfio_get_device(vfio_group, mdevid, &vapdev->vdev, errp); if (ret) { goto out_get_dev_err; } @@ -123,8 +122,6 @@ static void vfio_ap_realize(DeviceState *dev, Error **e= rrp) out_get_dev_err: vfio_ap_put_device(vapdev); vfio_put_group(vfio_group); -out_err: - error_propagate(errp, local_err); } =20 static void vfio_ap_unrealize(DeviceState *dev, Error **errp) --=20 2.21.0 From nobody Thu May 2 16:04:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576658406; cv=none; d=zohomail.com; s=zohoarc; b=BP+BcW04gAEX8UOQSw5Ad85coHwNL9L/Aiyn25EnehGaM6IcJ0ncUGwNlHwT3xoGWwvKyBVyGjk4C71m8qfLH6cs/KstFMTfQFlb1nimKZoZeMtCMEicrNXVlp6UUbs7QaPN7JqjtteHHbAdwYHHVAUcnq9Nlg5fTsFSQL6Fwo8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576658406; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+WIgv+99fVQZsaEz7YPvw8reoHX0PjBuDeUHEDbQX4o=; b=IUdFso73bdf0uzz53Dv4rGU6dgQ9xMScJ6YqaJlGOiYv6JEl5rMRHsKrlqlZ7i7qjLvGSq5QoweDMKiSNbfzBGzeuto3BRKSxloR0J0TWJpAn1R70UrDQQ9c1JDLVNiKPayIlBI3JfPCz4mZzXOh/s5Jija8+RHgT4OUcY8G81Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576658406045488.70574405784225; Wed, 18 Dec 2019 00:40:06 -0800 (PST) Received: from localhost ([::1]:51188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUsG-0003Id-Ek for importer@patchew.org; Wed, 18 Dec 2019 03:40:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35971) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihUWZ-00065y-C0 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihUWW-0002Yl-Jr for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:38 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:39103 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihUWU-0002VT-L8 for qemu-devel@nongnu.org; Wed, 18 Dec 2019 03:17:34 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-23-U3Y3aGt1MUK62gKRYmYCfg-1; Wed, 18 Dec 2019 03:17:29 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7B809DB2B; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A1A468888; Wed, 18 Dec 2019 08:17:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E03591136433; Wed, 18 Dec 2019 09:17:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576657053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+WIgv+99fVQZsaEz7YPvw8reoHX0PjBuDeUHEDbQX4o=; b=hnDBefIQt6GXVsM643PMDaWveVZL46qdzrCAPPfpbOea8XtQmCtw5ZFn+UeyrdL5lAlM3H +Bf3F5yKou7VhUgEqoThECZy3mzhTQyui5UzWbI6qL7ryJt31lhgApMEOMsh6RrYdCoHCQ zTm1dgZmwyT+uDqzQ+UxyV/LTIrS5t0= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 35/35] nbd: assert that Error** is not NULL in nbd_iter_channel_error Date: Wed, 18 Dec 2019 09:17:21 +0100 Message-Id: <20191218081721.23520-36-armbru@redhat.com> In-Reply-To: <20191218081721.23520-1-armbru@redhat.com> References: <20191218081721.23520-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: U3Y3aGt1MUK62gKRYmYCfg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy All callers of nbd_iter_channel_error() pass the address of a local_err variable, and only call this function if an error has already occurred, using this function to propagate that error. This is already implied by its name (local_err instead of the classic errp), but it is worth additionally stressing this by adding an assertion to make it part of the function contract. The local_err parameter is not here to return information about nbd_iter_channel_error failure. Instead it's assumed to be filled when passed to the function. This is already stressed by its name (local_err, instead of classic errp). Stress it additionally by assertion. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20191205174635.18758-22-vsementsov@virtuozzo.com> Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- block/nbd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/nbd.c b/block/nbd.c index 5f18f78a94..d085554f21 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -866,6 +866,7 @@ typedef struct NBDReplyChunkIter { static void nbd_iter_channel_error(NBDReplyChunkIter *iter, int ret, Error **local_err) { + assert(local_err && *local_err); assert(ret < 0); =20 if (!iter->ret) { --=20 2.21.0