From nobody Sun Feb 8 12:52:46 2026 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=1658846427; cv=none; d=zohomail.com; s=zohoarc; b=mpjwkIK3FQdKXEMJ02ee+MuvyBVfB64AIxEPaN5e2CBZspwU3CSV8RUrsnJrh3l+9DEagZpAlJ2c9KPlSm7+GnI/nbcFJC+UlVf1cyjhTEbEBRTSEUGBjJTziXLRwBw7rAu6eEf0PfpljSSYqfZK8pgC2FV0I6NWWSCR7z66JC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846427; 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=rHGxZ27WsFa2XP7xXlhUV7ogwKYYur7cY/YaAIOFsS4=; b=auwGfiJGOxXYL3Ju6tYB38LBJZ4ORVfEAbjGpjjxqZUmQBQAVstVh3rG1WMmH0NwixYYiLMFgeiECNiw1GVdk9FY11Oqjmxg3Yp6PXlyzrq9a36X+mZ4NhpHW59+LRYw+5JdOFZIrjJhgefYgaLgiKGijQVBjXQNXBfkc10Hup0= 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 1658846427714448.1539283845585; Tue, 26 Jul 2022 07:40:27 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-170-29DPOQmcP-CLfqgtpsmmyA-1; Tue, 26 Jul 2022 10:39:32 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2EBF018A6592; Tue, 26 Jul 2022 14:39:17 +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 18BF7C27D95; Tue, 26 Jul 2022 14:39:17 +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 E87871940378; Tue, 26 Jul 2022 14:39:15 +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 EDBBE194B950 for ; Tue, 26 Jul 2022 14:39:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BD86840CF8EE; Tue, 26 Jul 2022 14:39:11 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA8D240CFD0A for ; Tue, 26 Jul 2022 14:39:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846426; 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=rHGxZ27WsFa2XP7xXlhUV7ogwKYYur7cY/YaAIOFsS4=; b=PBI1agmSmf6gQm5XQ2AJTM1OMZ7/hUoPIL7pQi6edRXWpeumE+0WDvRVXL/clbt2WDIcKB gjitlzd0PXXVC2QEGDJyt1siA9FXtYyxLUzy7QuXjgUqMEFsRqTuOR73WuG9p5HP8BWGao k6XU2Vbjyw2tZpJaCwbxTWhtV/AbQQE= X-MC-Unique: 29DPOQmcP-CLfqgtpsmmyA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 71/80] qemuDomainDiskGetBackendAlias: Assume QEMU_CAPS_BLOCKDEV is supported Date: Tue, 26 Jul 2022 16:37:49 +0200 Message-Id: <6e495907f0fc92ca2ee7e7f7cd4f925985437bf4.1658843187.git.pkrempa@redhat.com> 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.85 on 10.11.54.8 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: 1658846428283100005 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 11 ++++------- src/qemu/qemu_domain.h | 4 +--- src/qemu/qemu_hotplug.c | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a8c954edf6..afdf79ff55 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1935,7 +1935,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (virStorageSourceGetActualType(disk->src) =3D=3D VIR_STORAGE_TYPE_V= HOST_USER) { chardev =3D qemuDomainGetVhostUserChrAlias(disk->info.alias); } else { - if (qemuDomainDiskGetBackendAlias(disk, qemuCaps, &drive) < 0) + if (qemuDomainDiskGetBackendAlias(disk, &drive) < 0) return NULL; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8999f58d20..8997041b34 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7802,7 +7802,8 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver, * Returns the pointer to the node-name of the topmost layer used by @disk= as * backend. Currently returns the nodename of the copy-on-read filter if e= nabled * or the nodename of the top image's format driver. Empty disks return NU= LL. - * This must be used only when VIR_QEMU_CAPS_BLOCKDEV is enabled. + * This must be used only with disks instantiated via -blockdev (thus not + * for SD cards). */ const char * qemuDomainDiskGetTopNodename(virDomainDiskDef *disk) @@ -7822,7 +7823,6 @@ qemuDomainDiskGetTopNodename(virDomainDiskDef *disk) /** * qemuDomainDiskGetBackendAlias: * @disk: disk definition - * @qemuCaps: emulator capabilities * @backendAlias: filled with the alias of the disk storage backend * * Returns the correct alias for the disk backend. This may be the alias of @@ -7835,13 +7835,11 @@ qemuDomainDiskGetTopNodename(virDomainDiskDef *disk) */ int qemuDomainDiskGetBackendAlias(virDomainDiskDef *disk, - virQEMUCaps *qemuCaps, char **backendAlias) { *backendAlias =3D NULL; - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV) || - qemuDiskBusIsSD(disk->bus)) { + if (qemuDiskBusIsSD(disk->bus)) { if (!(*backendAlias =3D qemuAliasDiskDriveFromDisk(disk))) return -1; @@ -10961,8 +10959,7 @@ qemuDomainPrepareDiskSource(virDomainDiskDef *disk, disk->src->format =3D VIR_STORAGE_FILE_RAW; } - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) && - !qemuDiskBusIsSD(disk->bus)) { + if (!qemuDiskBusIsSD(disk->bus)) { if (qemuDomainPrepareDiskSourceBlockdev(disk, priv, cfg) < 0) return -1; } else { diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b674d49207..7dc720dcb8 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -734,10 +734,8 @@ qemuDomainDiskGetTopNodename(virDomainDiskDef *disk) ATTRIBUTE_NONNULL(1); int qemuDomainDiskGetBackendAlias(virDomainDiskDef *disk, - virQEMUCaps *qemuCaps, char **backendAlias) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int qemuDomainStorageSourceChainAccessAllow(virQEMUDriver *driver, virDomainObj *vm, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a752702fc4..afc9d299f5 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -480,7 +480,7 @@ qemuDomainChangeMediaBlockdev(virQEMUDriver *driver, if (!(newbackend =3D qemuBuildStorageSourceChainAttachPrepareBlock= dev(newsrc))) return -1; - if (qemuDomainDiskGetBackendAlias(disk, priv->qemuCaps, &nodename)= < 0) + if (qemuDomainDiskGetBackendAlias(disk, &nodename) < 0) return -1; } --=20 2.36.1