From nobody Fri Nov 22 04:51:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1730793661801963.9228953163218; Tue, 5 Nov 2024 00:01:01 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id C0EBE1274; Tue, 5 Nov 2024 03:01:00 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 633FC130A; Tue, 5 Nov 2024 02:58:49 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 02DD1E7C; Tue, 5 Nov 2024 02:58:42 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id AF4D512C2 for ; Tue, 5 Nov 2024 02:58:21 -0500 (EST) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-456-MR51IOf5Pc2mQkFnWIReow-1; Tue, 05 Nov 2024 02:58:20 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 402D21955DAE for ; Tue, 5 Nov 2024 07:58:19 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.2]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 70F4B300018D for ; Tue, 5 Nov 2024 07:58:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730793501; 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=utidtcVR9o4EKzdVaDFyGkvb/0IeijVPGdjqIW+W6cQ=; b=L5JKhKyIPtpSs2PmQeBxSHHCvTPf+3IFvxDlGklsPUMO51i/5r10K+jN+eWz6mQhQ2K84k MzTzBMf/ZRk7RqymbgNY3b2hebfQFuhEekULzJLZ2eDEX2unvwlqdded/cO3kMWgIgCdkg STf/EW6QHfEy15jjSRGY6aHyiG/SvHk= X-MC-Unique: MR51IOf5Pc2mQkFnWIReow-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 04/13] conf: domain: Clarify nvram/loader format logic Date: Tue, 5 Nov 2024 08:58:02 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZSBCPTEH2ZAU5CYBT6CCQL3CS6KMR7NO X-Message-ID-Hash: ZSBCPTEH2ZAU5CYBT6CCQL3CS6KMR7NO X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1730793663083116600 Content-Type: text/plain; charset="utf-8" Restructure the code to assign first (as this is simpler to refactor in the future) and avoid mixing implicit value checks with explicit ones by checking for _NONE. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6d7dee7956..4dda943c73 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17129,15 +17129,16 @@ virDomainLoaderDefParseXMLNvram(virDomainLoaderDe= f *loader, &format, VIR_STORAGE_FILE_NONE) < 0) { return -1; } - if (format && - format !=3D VIR_STORAGE_FILE_RAW && - format !=3D VIR_STORAGE_FILE_QCOW2) { + src->format =3D format; + + if (src->format !=3D VIR_STORAGE_FILE_NONE && + src->format !=3D VIR_STORAGE_FILE_RAW && + src->format !=3D VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_XML_ERROR, _("Unsupported nvram format '%1$s'"), - virStorageFileFormatTypeToString(format)); + virStorageFileFormatTypeToString(src->format)); return -1; } - src->format =3D format; if ((typePresent =3D virXMLPropEnum(nvramNode, "type", virStorageTypeFromString, VIR_XML_PR= OP_NONE, @@ -17219,15 +17220,17 @@ virDomainLoaderDefParseXMLLoader(virDomainLoaderD= ef *loader, &format, VIR_STORAGE_FILE_NONE) < 0) { return -1; } - if (format && - format !=3D VIR_STORAGE_FILE_RAW && - format !=3D VIR_STORAGE_FILE_QCOW2) { + + loader->format =3D format; + + if (loader->format !=3D VIR_STORAGE_FILE_NONE && + loader->format !=3D VIR_STORAGE_FILE_RAW && + loader->format !=3D VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_XML_ERROR, _("Unsupported loader format '%1$s'"), - virStorageFileFormatTypeToString(format)); + virStorageFileFormatTypeToString(loader->format)); return -1; } - loader->format =3D format; return 0; } --=20 2.47.0