From nobody Mon Feb 9 06:48:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1594391704; cv=none; d=zohomail.com; s=zohoarc; b=P7z04R/93uU8M1+rIMbM/62RR9GqGhvftneQWhhWAS7xP5xSDUnrKbzMP/SBb+w836FwSFwb6WJSTrwRLF2UkMCM1MWCVO0mONPVr1YME/7oS2eR7rw4hyuASCpMPE1ZfqZlD2+cfuct2W18Jg17maqRUuIkOH1LpkKjM6hkCOE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594391704; 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=goxVBR2gQOqnfyU3NUuVwTHCruM7DeE/mjCi2M006yk=; b=bNSxF4jt9slA7fqQy0umYQfdcOA54OlVw0IcZ8wFTCNsXDFzK/99FtmpaiiIF7gddNpbgXDLxwXWHXwKJFgubHcx/V3d2gOspFGa3+WxA1I7+7wwSQjl1+zo9WAt7UqkOXupIuga5dwezDjoQhT2CdOprxhPp4k7Bm0E0b8SjtM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 159439170441695.89392318782723; Fri, 10 Jul 2020 07:35:04 -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-350-2rJ0naheOFKLqWZEiusC3g-1; Fri, 10 Jul 2020 10:34:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BD75C1085; Fri, 10 Jul 2020 14:34:13 +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 9CA6A6FECF; Fri, 10 Jul 2020 14:34:13 +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 6B43C180530A; Fri, 10 Jul 2020 14:34:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06AEXwea007129 for ; Fri, 10 Jul 2020 10:33:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 829C078A3D; Fri, 10 Jul 2020 14:33:58 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id D419917D82 for ; Fri, 10 Jul 2020 14:33:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594391703; 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=goxVBR2gQOqnfyU3NUuVwTHCruM7DeE/mjCi2M006yk=; b=DZ/PJofkA3BmKSOVB66MIA1K06bCbMZyQUjaaufiL1xeosWk2sr6SKQnJ2FdwbzlcRd2bU SJXRwT6Ib3FDR5xYPaNuYLI/JEnkSTXqEMRHdBnrD2EjDYmVc5FYKuQ6jnwPUh+zrQIzKm glAk+WVsT7HpLtpQfxH13FtM21xqC4Q= X-MC-Unique: 2rJ0naheOFKLqWZEiusC3g-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 13/18] qemu: command: Create qemuBlockStorageSourceAttachData for (i)SCSI hostdevs Date: Fri, 10 Jul 2020 16:33:34 +0200 Message-Id: <499faf295cb9de00052fdf0852b23c44a696fbfe.1594391524.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Add convertor for creating qemuBlockStorageSourceAttachData which will allow reusing the infrastructure which we have for attaching disks also for hostdevs. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 83 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_command.h | 8 ++++ 2 files changed, 91 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 200decd6e0..6b3b1b39ca 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5062,6 +5062,89 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *d= ef, } +qemuBlockStorageSourceAttachData * +qemuBuildHostdevSCSIDetachPrepare(virDomainHostdevDefPtr 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); + + ret->storageNodeName =3D iscsisrc->src->nodestorage; + + 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; + } + + ret->storageAttached =3D true; + } else { + ret->driveAlias =3D qemuAliasFromHostdev(hostdev); + ret->driveAdded =3D true; + } + + return g_steal_pointer(&ret); +} + + +qemuBlockStorageSourceAttachData * +qemuBuildHostdevSCSIAttachPrepare(virDomainHostdevDefPtr hostdev, + const char **backendAlias, + 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); + + 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); + + if (!devstr) + return NULL; + + if (!(src =3D localsrc =3D virStorageSourceNew())) + return NULL; + + src->type =3D VIR_STORAGE_TYPE_BLOCK; + src->readonly =3D hostdev->readonly; + src->path =3D g_strdup_printf("/dev/%s", devstr); + } + + 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; + + if (!(ret->storageProps =3D qemuBlockStorageSourceGetBackendProps(= src, + QE= MU_BLOCK_STORAGE_SOURCE_BACKEND_PROPS_SKIP_UNMAP))) + return NULL; + + } else { + 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) + return NULL; + + return g_steal_pointer(&ret); +} + + static int qemuBuildHostdevSCSICommandLine(virCommandPtr cmd, const virDomainDef *def, diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index d0de27d9b0..a43cdb2733 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -182,6 +182,14 @@ char *qemuBuildSCSIHostdevDevStr(const virDomainDef *d= ef, virDomainHostdevDefPtr dev, const char *backendAlias); +qemuBlockStorageSourceAttachData * +qemuBuildHostdevSCSIAttachPrepare(virDomainHostdevDefPtr hostdev, + const char **backendAlias, + virQEMUCapsPtr qemuCaps); +qemuBlockStorageSourceAttachData * +qemuBuildHostdevSCSIDetachPrepare(virDomainHostdevDefPtr hostdev, + virQEMUCapsPtr qemuCaps); + char * qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev, --=20 2.26.2