From nobody Mon Feb 9 18:44:04 2026 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1626786380; cv=none; d=zohomail.com; s=zohoarc; b=RqrVeXp18FLPvKbP1/V28SoklyBYEhUJp6fiduH2Bds/rLvytktORfnVHNcUSDAE221J3N0IQcX+hyKQ0fwc53AlZJfU4XGwKyE7Kpy7REtv0nJ2CWf22L8cW6+oXFku8/xHPcWTMfjh9HSk1/iVpiRk9ZxgymL9hV/YAHCd1Uw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626786380; 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=1W55TDbA6w0lNfwPGSJWgrGEpkj82bG0uWUcGoXhooU=; b=NmIeg/gxbmqUzKab/P1lMVt/LWBhZGzl4VovQ1oJk6aKgihJFc3jSN3//3gvM5c3Jftj1STUsvGvj+JUF+bm5uH9FY9qHDoTHEPRHmjKZtHH6dCmTK6fkUJHdZbNRZ7PfkUnD/Q7zmpkxzS70kQ7eLIOxKz4yCNYXQUe3uFfmTI= 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 1626786380412190.90655179681846; Tue, 20 Jul 2021 06:06:20 -0700 (PDT) Received: from localhost ([::1]:44618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5pRz-0007i6-4s for importer@patchew.org; Tue, 20 Jul 2021 09:06:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5pGU-00052Y-R5 for qemu-devel@nongnu.org; Tue, 20 Jul 2021 08:54:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5pGN-0008Hd-01 for qemu-devel@nongnu.org; Tue, 20 Jul 2021 08:54:26 -0400 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-15-QqgJcHFMMpSZBxywSO41Rw-1; Tue, 20 Jul 2021 08:54:17 -0400 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 3A25A34657 for ; Tue, 20 Jul 2021 12:54:16 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-114-187.ams2.redhat.com [10.36.114.187]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DFEED5D6A1; Tue, 20 Jul 2021 12:54:15 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 22835112D855; Tue, 20 Jul 2021 14:54:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626785658; 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=1W55TDbA6w0lNfwPGSJWgrGEpkj82bG0uWUcGoXhooU=; b=imZ5dT3ynsahlfUuOQL+vaYUp/VqpFjBo2pGwxVIIVisFdF9C16Aa3ksqG1tVwyL7Nh+3M Zm2l924AAk1qp6ZqvJiSaXBG754DwpsI4ptpKs10OoOvlpXUk60zEuqa7obROSb5EE7V4k 5fTl4Mk6YM4DSvBuVSox9l1TL0E94Ag= X-MC-Unique: QqgJcHFMMpSZBxywSO41Rw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 15/16] vl: Clean up -smp error handling Date: Tue, 20 Jul 2021 14:54:07 +0200 Message-Id: <20210720125408.387910-16-armbru@redhat.com> In-Reply-To: <20210720125408.387910-1-armbru@redhat.com> References: <20210720125408.387910-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.474, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1626786382114100001 Content-Type: text/plain; charset="utf-8" The Error ** argument must be NULL, &error_abort, &error_fatal, or a pointer to a variable containing NULL. Passing an argument of the latter kind twice without clearing it in between is wrong: if the first call sets an error, it no longer points to NULL for the second call. machine_parse_property_opt() is wrong that way: it passes @errp to keyval_parse() without checking for failure, then passes it to keyval_merge(). Harmless, since the only caller passes &error_fatal. Clean up: drop the parameter, and use &error_fatal directly. Cc: Paolo Bonzini Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/vl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index f9ffeb8d4d..ce0ecc736b 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1535,19 +1535,19 @@ static void machine_help_func(const QDict *qdict) =20 static void machine_parse_property_opt(QemuOptsList *opts_list, const char *propname, - const char *arg, Error **errp) + const char *arg) { QDict *opts, *prop; bool help =3D false; =20 - prop =3D keyval_parse(arg, opts_list->implied_opt_name, &help, errp); + prop =3D keyval_parse(arg, opts_list->implied_opt_name, &help, &error_= fatal); if (help) { qemu_opts_print_help(opts_list, true); return; } opts =3D qdict_new(); qdict_put(opts, propname, prop); - keyval_merge(machine_opts_dict, opts, errp); + keyval_merge(machine_opts_dict, opts, &error_fatal); qobject_unref(opts); } =20 @@ -3321,7 +3321,8 @@ void qemu_init(int argc, char **argv, char **envp) } break; case QEMU_OPTION_smp: - machine_parse_property_opt(qemu_find_opts("smp-opts"), "sm= p", optarg, &error_fatal); + machine_parse_property_opt(qemu_find_opts("smp-opts"), + "smp", optarg); break; case QEMU_OPTION_vnc: vnc_parse(optarg); --=20 2.31.1