From nobody Mon Dec 15 23:31:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658846348; cv=none; d=zohomail.com; s=zohoarc; b=B6Jx0Xlq49400jxdB32LWy/b3IrMdgdbh7/1Of/gkaMc28ZUNXfTsitA9q0mbQ78iK9SbFZ1JFsC8btDZvA4sYxAzV9Oy2r7aEzJmqacYHpD0FZMJZsUNdjiMOlNwx2vS3e6FtQW/u9HQQYUupH/VHK0aBClXEsQXeYrRkAmVhw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846348; 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=QXw2kFHcxdI50cYVmiGHaUeK9QA29XdCsqSjVVQwsd8=; b=jGZzi+cFezFWrgrNFZuVqqnhxtVC0mlyJAyYMHRUIfpX/Gi8i3Z2LNXFzPizRhZC2fKqbbe26LlZfiKNDfgA0rPvgX12d9CkTaTYqe5hxdc4B8QD9LHF7/E0cTiiYCPAQPeuC98Z86oVZbAVKIfXqPp0Ht6kmf1Df9WPy0uFaR0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1658846348563512.024749404126; Tue, 26 Jul 2022 07:39:08 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-146-N6VEx84mNvuy1fWQ9ePTqQ-1; Tue, 26 Jul 2022 10:38:25 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 91B803801149; Tue, 26 Jul 2022 14:38:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B8D02024CC3; Tue, 26 Jul 2022 14:38:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 302F51947042; Tue, 26 Jul 2022 14:38:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B18C01945D99 for ; Tue, 26 Jul 2022 14:38:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 989BD40CFD0A; Tue, 26 Jul 2022 14:38:18 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDAF9400DFD7 for ; Tue, 26 Jul 2022 14:38:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846347; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=QXw2kFHcxdI50cYVmiGHaUeK9QA29XdCsqSjVVQwsd8=; b=VzxC8jmO1PQnmj91HFUlbSE3Fn2cmOqZyIzog1YbuG7UkiWZesziziOP5KggYMP58hoKuJ oV+gLSqA9If/1dhoCKBB8q5XeRGdPFvOH0WkqonQk1a9+za300tTjJgVYiwqFW6heARuOg XnPE/2zyli95IezXfALnVjuxQMv7xXU= X-MC-Unique: N6VEx84mNvuy1fWQ9ePTqQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 15/80] qemu: Refactor access to 'qomName' field of the qemu disk private data Date: Tue, 26 Jul 2022 16:36:53 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658846350301100001 Content-Type: text/plain; charset="utf-8" The code which fills 'qomName' does so only when the blockdev capability is enabled so we don't have to check it separately as it can be only non-NULL when blockdev is used. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_driver.c | 29 ++++++++++++----------------- src/qemu/qemu_process.c | 3 +-- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cfb02f7b0f..d5a3181c0d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10119,16 +10119,15 @@ qemuDomainBlocksStatsGather(virQEMUDriver *driver, return -1; } - if (blockdev && QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) { + if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) entryname =3D QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; - } else { - if (!disk->info.alias) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing disk device alias name for %s"),= disk->dst); - return -1; - } - + else entryname =3D disk->info.alias; + + if (!entryname) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("missing disk device alias name for %s"), dis= k->dst); + return -1; } } @@ -10180,7 +10179,7 @@ qemuDomainBlocksStatsGather(virQEMUDriver *driver, if (virStorageSourceGetActualType(disk->src) =3D=3D VIR_STORAG= E_TYPE_VHOST_USER) continue; - if (blockdev && QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) + if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) entryname =3D QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; if (!entryname) @@ -16312,8 +16311,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, if (!qemuDomainDiskBlockIoTuneIsSupported(disk->src)) goto endjob; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) && - QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) { + if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) { qdevid =3D QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; } else { if (!(drivealias =3D qemuAliasDiskDriveFromDisk(disk))) @@ -16497,8 +16495,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, if (!qemuDomainDiskBlockIoTuneIsSupported(disk->src)) goto endjob; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) && - QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) { + if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) { qdevid =3D QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; } else { if (!(drivealias =3D qemuAliasDiskDriveFromDisk(disk))) @@ -16597,7 +16594,6 @@ qemuDomainGetDiskErrors(virDomainPtr dom, virDomainObj *vm =3D NULL; qemuDomainObjPrivate *priv; g_autoptr(GHashTable) table =3D NULL; - bool blockdev =3D false; int ret =3D -1; size_t i; int n =3D 0; @@ -16608,7 +16604,6 @@ qemuDomainGetDiskErrors(virDomainPtr dom, goto cleanup; priv =3D vm->privateData; - blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); if (virDomainGetDiskErrorsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -16636,7 +16631,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); const char *entryname =3D disk->info.alias; - if (blockdev && diskPriv->qomName) + if (diskPriv->qomName) entryname =3D diskPriv->qomName; if ((info =3D virHashLookup(table, entryname)) && @@ -18505,7 +18500,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef = *disk, /* for 'sd' disks we won't be displaying stats for the backing cha= in * as we don't update the stats correctly */ - if (blockdev && QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) { + if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) { frontendalias =3D QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; backendalias =3D n->nodeformat; backendstoragealias =3D n->nodestorage; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 438c903578..260116dc67 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8593,7 +8593,6 @@ qemuProcessRefreshDisks(virQEMUDriver *driver, virDomainAsyncJob asyncJob) { qemuDomainObjPrivate *priv =3D vm->privateData; - bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); g_autoptr(GHashTable) table =3D NULL; size_t i; @@ -8611,7 +8610,7 @@ qemuProcessRefreshDisks(virQEMUDriver *driver, struct qemuDomainDiskInfo *info; const char *entryname =3D disk->info.alias; - if (blockdev && diskpriv->qomName) + if (diskpriv->qomName) entryname =3D diskpriv->qomName; if (!(info =3D virHashLookup(table, entryname))) --=20 2.36.1