From nobody Mon Nov 25 01:44:30 2024 Delivered-To: importer@patchew.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=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1719409487; cv=none; d=zohomail.com; s=zohoarc; b=BJHFi1uwajWwwbEmJdsZXP8tko6jEgrSu7BLF/htvSKA3Xrbngovr2OTXL8jVSYpIsiib8uv96Wg5yB79P7st620LkuTaEwKANpeJklt74WJlaKQSvwp5AULjjssKaB/83XyeyQJxltUbpUE6eKFmBi70ZujmGE46nLlULHBuSY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1719409487; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VG1GR1FjrXFc8YGzTRoYNNCRAPmd5emLkaLTsifcTUE=; b=GhCpiFQetd+0awjSrrZsltnhdoDfeord7DsV/r4UL3zehMIno1Z7YHdjwdVsIMUwx48CI326gFihMCvuxpzii3Wyk3TsesLJmo+8kWEedXBx8NRCvk+W0uhzT1e5wnoHUB1eqiD1hp80sMIBZgvAY/t30na1TAppBt+6ajuSzCE= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1719409487709813.1620258426567; Wed, 26 Jun 2024 06:44:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMSw0-0000zf-48; Wed, 26 Jun 2024 09:43:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMSvw-0000xf-Ql; Wed, 26 Jun 2024 09:43:36 -0400 Received: from forwardcorp1b.mail.yandex.net ([178.154.239.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMSvt-0007CL-Kq; Wed, 26 Jun 2024 09:43:36 -0400 Received: from mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:958d:0:640:7be4:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id C166360D7B; Wed, 26 Jun 2024 16:43:27 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6b8:b081:b645::1:29]) by mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id 6hQ8Aa0IZiE0-Oq39TsaE; Wed, 26 Jun 2024 16:43:27 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1719409407; bh=VG1GR1FjrXFc8YGzTRoYNNCRAPmd5emLkaLTsifcTUE=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=NX8ubXoR8fV7uegB3sIxxaxLQf8gp12pzFQVRBwtdBy5w3w6mul1Y13zlMJJnhPq5 ZErEGBfZJ/tgEFV2drMT+5w4X7kNgjW014/daNVWanWcNBCS3tkcGpV660vJ/i1752 nzJadmRtIhetj9GM/jRAWGT9WIjBzvTLM+bLiVnw= Authentication-Results: mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, qemu-trivial@nongnu.org, armbru@redhat.com, Vladimir Sementsov-Ogievskiy Subject: [PATCH 1/3] vl.c: select_machine(): use ERRP_GUARD instead of error propagation Date: Wed, 26 Jun 2024 16:43:03 +0300 Message-Id: <20240626134305.432627-2-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240626134305.432627-1-vsementsov@yandex-team.ru> References: <20240626134305.432627-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=178.154.239.136; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1719409489291100010 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy --- system/vl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/system/vl.c b/system/vl.c index cfcb674425..fa81037ce2 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1665,28 +1665,28 @@ static const QEMUOption *lookup_opt(int argc, char = **argv, =20 static MachineClass *select_machine(QDict *qdict, Error **errp) { + ERRP_GUARD(); const char *machine_type =3D qdict_get_try_str(qdict, "type"); GSList *machines =3D object_class_get_list(TYPE_MACHINE, false); - MachineClass *machine_class; - Error *local_err =3D NULL; + MachineClass *machine_class =3D NULL; =20 if (machine_type) { machine_class =3D find_machine(machine_type, machines); qdict_del(qdict, "type"); if (!machine_class) { - error_setg(&local_err, "unsupported machine type"); + error_setg(errp, "unsupported machine type"); } } else { machine_class =3D find_default_machine(machines); if (!machine_class) { - error_setg(&local_err, "No machine specified, and there is no = default"); + error_setg(errp, "No machine specified, and there is no defaul= t"); } } =20 g_slist_free(machines); - if (local_err) { - error_append_hint(&local_err, "Use -machine help to list supported= machines\n"); - error_propagate(errp, local_err); + if (!machine_class) { + error_append_hint(errp, + "Use -machine help to list supported machines\n"= ); } return machine_class; } --=20 2.34.1