From nobody Mon Feb 9 00:07:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1599835222; cv=none; d=zohomail.com; s=zohoarc; b=LfVzCLSpCqDoNGFgWpP0ykr2tBLn+xysGwQ6dibZ+4c1BkGtBPMlflqxmx5xezoSzzKhqZ8fTYXU5GqqD6E0pX1Mpeb0yoilLDwYndag1ILRXABYEkIiPL/5IeBclGSa1W0UAudFbGmXccC0CRnsyG9vB68wd3c6ZgP4sBIQXfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599835222; 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=LWS9GkxZD6dxCvDig1Jy1kwcLyqpH+OsKK5J6cJl3KI=; b=kYaInB3xD+MgHRvaspU/gG75gU3T6AVa8ODtSyMumD3MBB3CjscbHnTqiyB2ZhZftUByh1X1hQQrgbehNWApHsklCIP2rJo5lh8TMm+KIf0t50BY3xEdzM48lGqhmxr83BCoG9kjTA7/KmaX76Fl6erz1unaL4U50MMLp1YqsxY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1599835222281418.22456651959; Fri, 11 Sep 2020 07:40:22 -0700 (PDT) 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-393-6HcqMy64OCmARLSOnlspsw-1; Fri, 11 Sep 2020 10:39:49 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 57B0418B9F92; Fri, 11 Sep 2020 14:39:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 35D285DA33; Fri, 11 Sep 2020 14:39:43 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 003B8181A869; Fri, 11 Sep 2020 14:39:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08BEbswB002405 for ; Fri, 11 Sep 2020 10:37:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4FAFF8FCA1; Fri, 11 Sep 2020 14:37:54 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDDF78FCA5 for ; Fri, 11 Sep 2020 14:37:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599835221; 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=LWS9GkxZD6dxCvDig1Jy1kwcLyqpH+OsKK5J6cJl3KI=; b=iqYwsZDO3lw3NMSi5GAS3+0lCk8MaGm5xiPX45YGSiccPrvKJaFUxQQhf2eIhO5g16Jl/j epxP0A3FLOb8i6aun5n7KmHKUjczxMnCYLVOzxNE3oTx1NMsdXL0TIkAercdvfTDjxN+m8 VDrgYmsCBV9i12qBdDTspYAP9G6c6nY= X-MC-Unique: 6HcqMy64OCmARLSOnlspsw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/17] qemuBuildHostdevSCSI(A|De)tachPrepare: Use virStorageSource in def for SCSI hostdevs Date: Fri, 11 Sep 2020 16:37:28 +0200 Message-Id: <48f45ddb478e1db39248215b7c6a94f2e2a2f5fa.1599834862.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Modify the attach/detach data generators to actually use the virStorageSourceStructure embedded in the SCSI config data rather than creating an ad-hoc internal one. The modification will allow us to properly store the nodename used for the backend in the status XML rather than re-generating it all the time. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 71 +++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bd98b0a97c..d92b967419 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5053,24 +5053,35 @@ qemuBuildHostdevSCSIDetachPrepare(virDomainHostdevD= efPtr hostdev, virQEMUCapsPtr qemuCaps) { virDomainHostdevSubsysSCSIPtr scsisrc =3D &hostdev->source.subsys.u.sc= si; - virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =3D &scsisrc->u.iscsi; g_autoptr(qemuBlockStorageSourceAttachData) ret =3D g_new0(qemuBlockSt= orageSourceAttachData, 1); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)) { - if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE= _ISCSI) { - qemuDomainStorageSourcePrivatePtr srcpriv =3D QEMU_DOMAIN_STOR= AGE_SOURCE_PRIVATE(iscsisrc->src); + virStorageSourcePtr src; + qemuDomainStorageSourcePrivatePtr srcpriv; - ret->storageNodeName =3D iscsisrc->src->nodestorage; + switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) { + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE: + src =3D scsisrc->u.host.src; + break; - if (srcpriv && srcpriv->secinfo && - srcpriv->secinfo->type =3D=3D VIR_DOMAIN_SECRET_INFO_TYPE_= AES) - ret->authsecretAlias =3D g_strdup(srcpriv->secinfo->s.aes.= alias); - } else { - ret->storageNodeNameCopy =3D g_strdup_printf("libvirt-%s-backe= nd", hostdev->info->alias); - ret->storageNodeName =3D ret->storageNodeNameCopy; + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI: + src =3D scsisrc->u.iscsi.src; + break; + + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST: + default: + virReportEnumRangeError(virDomainHostdevSCSIProtocolType, scsi= src->protocol); + return NULL; } + srcpriv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); + ret->storageNodeName =3D src->nodestorage; ret->storageAttached =3D true; + + if (srcpriv && srcpriv->secinfo && + srcpriv->secinfo->type =3D=3D VIR_DOMAIN_SECRET_INFO_TYPE_AES) + ret->authsecretAlias =3D g_strdup(srcpriv->secinfo->s.aes.alia= s); + } else { ret->driveAlias =3D qemuAliasFromHostdev(hostdev); ret->driveAdded =3D true; @@ -5086,45 +5097,57 @@ qemuBuildHostdevSCSIAttachPrepare(virDomainHostdevD= efPtr hostdev, virQEMUCapsPtr qemuCaps) { virDomainHostdevSubsysSCSIPtr scsisrc =3D &hostdev->source.subsys.u.sc= si; - virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =3D &scsisrc->u.iscsi; - virStorageSourcePtr src; - g_autoptr(virStorageSource) localsrc =3D NULL; g_autoptr(qemuBlockStorageSourceAttachData) ret =3D g_new0(qemuBlockSt= orageSourceAttachData, 1); + virStorageSourcePtr src =3D NULL; if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)) { - if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE= _ISCSI) { - src =3D iscsisrc->src; - } else { - g_autofree char *devstr =3D qemuBuildSCSIHostHostdevDrvStr(hos= tdev); + g_autofree char *devstr =3D NULL; - if (!devstr) + switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) { + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE: + if (!scsisrc->u.host.src && + !(scsisrc->u.host.src =3D virStorageSourceNew())) return NULL; - if (!(src =3D localsrc =3D virStorageSourceNew())) + if (!(devstr =3D qemuBuildSCSIHostHostdevDrvStr(hostdev))) return NULL; + src =3D scsisrc->u.host.src; + src->type =3D VIR_STORAGE_TYPE_BLOCK; src->readonly =3D hostdev->readonly; src->path =3D g_strdup_printf("/dev/%s", devstr); + + break; + + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI: + src =3D scsisrc->u.iscsi.src; + break; + + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST: + default: + virReportEnumRangeError(virDomainHostdevSCSIProtocolType, scsi= src->protocol); + return NULL; } src->nodestorage =3D g_strdup_printf("libvirt-%s-backend", hostdev= ->info->alias); - ret->storageNodeNameCopy =3D g_strdup(src->nodestorage); - ret->storageNodeName =3D ret->storageNodeNameCopy; - *backendAlias =3D ret->storageNodeNameCopy; + ret->storageNodeName =3D src->nodestorage; + *backendAlias =3D src->nodestorage; if (!(ret->storageProps =3D qemuBlockStorageSourceGetBackendProps(= src, QE= MU_BLOCK_STORAGE_SOURCE_BACKEND_PROPS_SKIP_UNMAP))) return NULL; } else { + if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE= _ISCSI) + src =3D scsisrc->u.iscsi.src; ret->driveCmd =3D qemuBuildSCSIHostdevDrvStr(hostdev, qemuCaps); ret->driveAlias =3D qemuAliasFromHostdev(hostdev); *backendAlias =3D ret->driveAlias; } - if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISC= SI && - qemuBuildStorageSourceAttachPrepareCommon(iscsisrc->src, ret, qemu= Caps) < 0) + if (src && + qemuBuildStorageSourceAttachPrepareCommon(src, ret, qemuCaps) < 0) return NULL; return g_steal_pointer(&ret); --=20 2.26.2