From nobody Tue Dec 16 12:22:33 2025 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 1740042266173989.4686679056529; Thu, 20 Feb 2025 01:04:26 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 1FA231E09; Thu, 20 Feb 2025 04:04:25 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C86281DC4; Thu, 20 Feb 2025 04:02:07 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3E6E21E60; Thu, 20 Feb 2025 04:02:02 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 4A78F1D56 for ; Thu, 20 Feb 2025 04:01:49 -0500 (EST) Received: from mx-prod-mc-05.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-621-5VY6xOJZMtONcTneOWmZ6A-1; Thu, 20 Feb 2025 04:01:47 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 56E55190FF83 for ; Thu, 20 Feb 2025 09:01:46 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 78FEC19412A3 for ; Thu, 20 Feb 2025 09:01:45 +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.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,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=1740042109; 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=JRc7lKaiq3ATkEijO3Fiv01KVpMI6xHPloD62wx+uUM=; b=XA+owpo/hvRTj/VW+4xaRK0LkNu5wzSY117/RdCluBpFqFowRvRG7r+t1Ua0N08yMu+DZa T3cY86EHg7SCedGgC7sqXCoC9N54cTPX0E1IJBr9Bdj8YIA3uNdJRNX6WMLDD2LQHX7ZJ6 hRhNOxgWTdq1lohpifqRlOk72r2D10Y= X-MC-Unique: 5VY6xOJZMtONcTneOWmZ6A-1 X-Mimecast-MFC-AGG-ID: 5VY6xOJZMtONcTneOWmZ6A_1740042106 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 06/21] qemuDomainStorageAlias: Remove NULL checks from callers Date: Thu, 20 Feb 2025 10:01:19 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: hZS2MfJw53__eXvA05SlpJemrDJQOo2uttZ2I-x_nQQ_1740042106 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: DP32KQZYMZXDPVBL7VASOYFCKR6MA2EV X-Message-ID-Hash: DP32KQZYMZXDPVBL7VASOYFCKR6MA2EV 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: 1740042269078019100 Content-Type: text/plain; charset="utf-8" 'qemuDomainStorageAlias' always returns non-NULL pointer if it gets a non-NULL string on input. Remove unneeded checks from callers. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 5 ++--- src/qemu/qemu_monitor_json.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aee66b2bc7..877fefaa38 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17415,9 +17415,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, backendstoragealias =3D qemuBlockStorageSourceGetStorageNodena= me(n); } else { /* alias may be NULL if the VM is not running */ - if (disk->info.alias && - !(alias =3D qemuDomainStorageAlias(disk->info.alias, n->id= ))) - return -1; + if (disk->info.alias) + alias =3D qemuDomainStorageAlias(disk->info.alias, n->id); /* for 'sd' disks we won't be displaying stats for the backing= chain * as we don't update the stats correctly */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 554572b13d..74420b2ee7 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2332,9 +2332,8 @@ qemuMonitorJSONGetOneBlockStatsInfo(virJSONValue *dev, g_autofree char *devicename =3D NULL; virJSONValue *backing; - if (dev_name && - !(devicename =3D qemuDomainStorageAlias(dev_name, depth))) - return -1; + if (dev_name) + devicename =3D qemuDomainStorageAlias(dev_name, depth); qdevname =3D virJSONValueObjectGetString(dev, "qdev"); nodename =3D virJSONValueObjectGetString(dev, "node-name"); --=20 2.48.1