From nobody Sun Feb 8 17:22:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1682332919; cv=none; d=zohomail.com; s=zohoarc; b=HUTUbXRdmb4FDPbH65YbFJ79z1pHcUFh6AC9e/veftc0M8CAUC9qX3cr6AY9YwvdnkL1VsTBdGIRDhvXca4yaeGgc+fBwEqQrQdJ5jLhCqbsNxhonIbOB2vqOAYou/UaTtdzsQyZr6K2PWp6XVUCR2H5vq4pEWbTl+/1Lt3LrUI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682332919; 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=ANqd8xghQwEqrjN8opAXcRYDNZwqBuQN1NET+XDpbL0=; b=eof4qu4ZNzsoyTSSSjMGXgMMl4S7qrpu7z5g5Jib7S2gSFdiFnsFBb+ZWKQOnw73powiBcWEbGYcWB4ntPZtJxuPE627Kn5RBmBh4dTj+BeyYGWFWXTrGMMxGvTYmUTmLchCWISWdb2r9xHh0KYICajBpjsW4ymvGM9QVxpl26Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1682332919408954.0718540668123; Mon, 24 Apr 2023 03:41:59 -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-318-rco9a7rGOFSVNygnBR4A0Q-1; Mon, 24 Apr 2023 06:41:55 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 232A1857FB4; Mon, 24 Apr 2023 10:41:53 +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 DCB2414171BD; Mon, 24 Apr 2023 10:41:52 +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 B66691946595; Mon, 24 Apr 2023 10:41:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0A9A3194658D for ; Mon, 24 Apr 2023 10:41:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id F1FE41121319; Mon, 24 Apr 2023 10:41:50 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 996A41121318 for ; Mon, 24 Apr 2023 10:41:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682332918; 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=ANqd8xghQwEqrjN8opAXcRYDNZwqBuQN1NET+XDpbL0=; b=A2eg0m+WQdmb8/eW5ZXqqrDCEVVToHbP+P6R5s2DSUKHrno4a8n1KP0jXkN+5lJRYRW7uN dSOM6iVxbzjB+ETvgKCakIOtr+6bn6YqrLHEkUkAYkhoSIWWUVt2KN8kpz5Z/klgpFRRgm PS96XcWhVJXEMY44/I8S8rDszlwEI1E= X-MC-Unique: rco9a7rGOFSVNygnBR4A0Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 2/9] qemu_domain: Move internals of qemuDomainPrepareHostdev() into a separate function Date: Mon, 24 Apr 2023 12:41:41 +0200 Message-Id: <0d967b106562cf46fd8e8bf6cc8f5da10b0e49fa.1682332714.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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 3.1 on 10.11.54.7 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: 1682332921375100001 Content-Type: text/plain; charset="utf-8"; x-default="true" So far, qemuDomainPrepareHostdev() is a NOP for anything but a SCSI hostdev. This will change soon. Therefore, move the SCSI hostdev preparation into a separate function (qemuDomainPrepareHostdevSCSI()) and make qemuDomainPrepareHostdev() call function corresponding to the hostdev type (or nothing if the type doesn't need any preparation). Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/qemu/qemu_domain.c | 110 ++++++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 45 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 41db98880c..f462476d2a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11239,55 +11239,75 @@ qemuDomainPrepareDiskSource(virDomainDiskDef *dis= k, } =20 =20 +static int +qemuDomainPrepareHostdevSCSI(virDomainHostdevDef *hostdev, + qemuDomainObjPrivate *priv) +{ + virDomainHostdevSubsysSCSI *scsisrc =3D &hostdev->source.subsys.u.scsi; + virStorageSource *src =3D NULL; + + switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) { + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE: + virObjectUnref(scsisrc->u.host.src); + scsisrc->u.host.src =3D virStorageSourceNew(); + src =3D scsisrc->u.host.src; + + src->type =3D VIR_STORAGE_TYPE_BLOCK; + + 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, scsisrc-= >protocol); + return -1; + } + + if (src) { + const char *backendalias =3D hostdev->info->alias; + + src->readonly =3D hostdev->readonly; + src->id =3D qemuDomainStorageIDNew(priv); + src->nodestorage =3D g_strdup_printf("libvirt-%d-backend", src->id= ); + backendalias =3D src->nodestorage; + + if (src->auth) { + virSecretUsageType usageType =3D VIR_SECRET_USAGE_TYPE_ISCSI; + qemuDomainStorageSourcePrivate *srcPriv =3D qemuDomainStorageS= ourcePrivateFetch(src); + + if (!(srcPriv->secinfo =3D qemuDomainSecretInfoSetupFromSecret= (priv, + b= ackendalias, + N= ULL, 0, + u= sageType, + s= rc->auth->username, + &= src->auth->seclookupdef))) + return -1; + } + } + + return 0; +} + + int qemuDomainPrepareHostdev(virDomainHostdevDef *hostdev, qemuDomainObjPrivate *priv) { - if (virHostdevIsSCSIDevice(hostdev)) { - virDomainHostdevSubsysSCSI *scsisrc =3D &hostdev->source.subsys.u.= scsi; - virStorageSource *src =3D NULL; - - switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) { - case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE: - virObjectUnref(scsisrc->u.host.src); - scsisrc->u.host.src =3D virStorageSourceNew(); - src =3D scsisrc->u.host.src; - - src->type =3D VIR_STORAGE_TYPE_BLOCK; - - 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 -1; - } - - if (src) { - const char *backendalias =3D hostdev->info->alias; - - src->readonly =3D hostdev->readonly; - src->id =3D qemuDomainStorageIDNew(priv); - src->nodestorage =3D g_strdup_printf("libvirt-%d-backend", src= ->id); - backendalias =3D src->nodestorage; - - if (src->auth) { - virSecretUsageType usageType =3D VIR_SECRET_USAGE_TYPE_ISC= SI; - qemuDomainStorageSourcePrivate *srcPriv =3D qemuDomainStor= ageSourcePrivateFetch(src); - - if (!(srcPriv->secinfo =3D qemuDomainSecretInfoSetupFromSe= cret(priv, - = backendalias, - = NULL, 0, - = usageType, - = src->auth->username, - = &src->auth->seclookupdef))) - return -1; - } - } + if (hostdev->mode !=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) + return 0; + + switch ((virDomainHostdevSubsysType)hostdev->source.subsys.type) { + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: + return qemuDomainPrepareHostdevSCSI(hostdev, priv); + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST: + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: + break; } =20 return 0; --=20 2.39.2