From nobody Mon Dec 15 23:01:47 2025 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=1658846583; cv=none; d=zohomail.com; s=zohoarc; b=Vg0KUZayaG3reLcqYzQyaS18YySHJIFJv+DHKwDfsMb8NU6LgDEaGCUkgXtPUCHC4jwvUuVHZDG029SeQZ1NZd9ybQqAQnW3fQh5LuRrFFKTGgiWOGiBw4wr1HCdw2CIerd1Um1SwCAP3Uwx64dVG2Hho+DrKjwUk0NcG7ACwwc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846583; 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=zPMw55L5MKaS3fQwQSqKk8+fvae9CS03SXmMLS6hLqw=; b=OrD9B3GN8ke6tN6Z8WKmj+SCY+uSxxu9WKXsbC+rD+1eYHFM6mVql3fqmIieVAACoQi9VMMVdp7PlzVi5KNufqzLBzViy4i10t4TRTdxc8Z8HL51YXHW64H7c5lNz4XJieRiTNvc0SlyCrN8tOE3jVqBt0Hh7xMvBcFUibTLB5c= 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 165884658357328.853341708953053; Tue, 26 Jul 2022 07:43:03 -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-554-r2zfw6WkNlWC1veRSmUxsA-1; Tue, 26 Jul 2022 10:38:49 -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 7375E18A663E; Tue, 26 Jul 2022 14:38:31 +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 5E97F1415118; Tue, 26 Jul 2022 14:38:31 +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 C71571947058; Tue, 26 Jul 2022 14:38:30 +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 579C41945D99 for ; Tue, 26 Jul 2022 14:38:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4431B400EA8E; Tue, 26 Jul 2022 14:38:21 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDE39400DFD7 for ; Tue, 26 Jul 2022 14:38:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846582; 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=zPMw55L5MKaS3fQwQSqKk8+fvae9CS03SXmMLS6hLqw=; b=VrZv9zD/q0XCgkz7tXlRWOXZl3HaU8DCSRdi/0WqfPrU2hXpb0K/9XVuUGRZd/sbjUOPi5 9EniqsbnoKSeFe14NehFZrvsudoUsJUAeC5Sp0ja2y2zxjXZzQIIot1qdT04GEBPtTdV1F 7BUjr9Lu+znXqp3h0XS+Kylme4sM3MQ= X-MC-Unique: r2zfw6WkNlWC1veRSmUxsA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 18/80] qemu: Remove code conditional on QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI Date: Tue, 26 Jul 2022 16:36:56 +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.85 on 10.11.54.7 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: 1658846585107100001 Content-Type: text/plain; charset="utf-8" Now that QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI is always set we can remove the code which handled cases when the capability was not set. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_command.c | 142 +++++++++++----------------------------- src/qemu/qemu_domain.c | 18 ++--- 2 files changed, 43 insertions(+), 117 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cb54190780..e0c5e15a63 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5091,27 +5091,6 @@ qemuBuildHubCommandLine(virCommand *cmd, } -static char * -qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDef *dev) -{ - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - g_autoptr(virJSONValue) srcprops =3D NULL; - virDomainHostdevSubsysSCSI *scsisrc =3D &dev->source.subsys.u.scsi; - virDomainHostdevSubsysSCSIiSCSI *iscsisrc =3D &scsisrc->u.iscsi; - - if (!(srcprops =3D qemuDiskSourceGetProps(iscsisrc->src))) - return NULL; - - if (virQEMUBuildCommandLineJSON(srcprops, &buf, NULL, - virQEMUBuildCommandLineJSONArrayNumber= ed) < 0) - return NULL; - - virBufferAddLit(&buf, ",if=3Dnone,format=3Draw"); - - return virBufferContentAndReset(&buf); -} - - virJSONValue * qemuBuildSCSIVHostHostdevDevProps(const virDomainDef *def, virDomainHostdevDef *dev, @@ -5138,32 +5117,6 @@ qemuBuildSCSIVHostHostdevDevProps(const virDomainDef= *def, } -static char * -qemuBuildSCSIHostdevDrvStr(virDomainHostdevDef *dev) -{ - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - g_autofree char *source =3D NULL; - g_autofree char *drivealias =3D NULL; - virDomainHostdevSubsysSCSI *scsisrc =3D &dev->source.subsys.u.scsi; - - if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISC= SI) { - if (!(source =3D qemuBuildSCSIiSCSIHostdevDrvStr(dev))) - return NULL; - virBufferAdd(&buf, source, -1); - } else { - virBufferAsprintf(&buf, "file=3D%s,if=3Dnone,format=3Draw", scsisr= c->u.host.src->path); - } - - if (!(drivealias =3D qemuAliasFromHostdev(dev))) - return NULL; - virBufferAsprintf(&buf, ",id=3D%s", drivealias); - - if (dev->readonly) - virBufferAddLit(&buf, ",readonly=3Don"); - - return virBufferContentAndReset(&buf); -} - virJSONValue * qemuBuildSCSIHostdevDevProps(const virDomainDef *def, virDomainHostdevDef *dev, @@ -5286,41 +5239,34 @@ qemuBuildHostdevMediatedDevProps(const virDomainDef= *def, qemuBlockStorageSourceAttachData * qemuBuildHostdevSCSIDetachPrepare(virDomainHostdevDef *hostdev, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { virDomainHostdevSubsysSCSI *scsisrc =3D &hostdev->source.subsys.u.scsi; g_autoptr(qemuBlockStorageSourceAttachData) ret =3D g_new0(qemuBlockSt= orageSourceAttachData, 1); + virStorageSource *src; + qemuDomainStorageSourcePrivate *srcpriv; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)) { - virStorageSource *src; - qemuDomainStorageSourcePrivate *srcpriv; - - switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) { - case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE: - src =3D scsisrc->u.host.src; - break; - - case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI: - src =3D scsisrc->u.iscsi.src; - break; + switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) { + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE: + src =3D scsisrc->u.host.src; + break; - case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST: - default: - virReportEnumRangeError(virDomainHostdevSCSIProtocolType, scsi= src->protocol); - return NULL; - } + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI: + src =3D scsisrc->u.iscsi.src; + break; - srcpriv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); - ret->storageNodeName =3D src->nodestorage; - ret->storageAttached =3D true; + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST: + default: + virReportEnumRangeError(virDomainHostdevSCSIProtocolType, scsisrc-= >protocol); + return NULL; + } - if (srcpriv && srcpriv->secinfo) - ret->authsecretAlias =3D g_strdup(srcpriv->secinfo->alias); + srcpriv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); + ret->storageNodeName =3D src->nodestorage; + ret->storageAttached =3D true; - } else { - ret->driveAlias =3D qemuAliasFromHostdev(hostdev); - ret->driveAdded =3D true; - } + if (srcpriv && srcpriv->secinfo) + ret->authsecretAlias =3D g_strdup(srcpriv->secinfo->alias); return g_steal_pointer(&ret); } @@ -5329,45 +5275,35 @@ qemuBuildHostdevSCSIDetachPrepare(virDomainHostdevD= ef *hostdev, qemuBlockStorageSourceAttachData * qemuBuildHostdevSCSIAttachPrepare(virDomainHostdevDef *hostdev, const char **backendAlias, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { virDomainHostdevSubsysSCSI *scsisrc =3D &hostdev->source.subsys.u.scsi; g_autoptr(qemuBlockStorageSourceAttachData) ret =3D g_new0(qemuBlockSt= orageSourceAttachData, 1); virStorageSource *src =3D NULL; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)) { - switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) { - case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE: - src =3D scsisrc->u.host.src; - break; - - case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI: - src =3D scsisrc->u.iscsi.src; - break; + switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) { + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE: + src =3D scsisrc->u.host.src; + break; - case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST: - default: - virReportEnumRangeError(virDomainHostdevSCSIProtocolType, scsi= src->protocol); - return NULL; - } + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI: + src =3D scsisrc->u.iscsi.src; + break; - ret->storageNodeName =3D src->nodestorage; - *backendAlias =3D src->nodestorage; + case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST: + default: + virReportEnumRangeError(virDomainHostdevSCSIProtocolType, scsisrc-= >protocol); + return NULL; + } - if (!(ret->storageProps =3D qemuBlockStorageSourceGetBackendProps(= src, - QE= MU_BLOCK_STORAGE_SOURCE_BACKEND_PROPS_SKIP_UNMAP))) - return NULL; + ret->storageNodeName =3D src->nodestorage; + *backendAlias =3D src->nodestorage; - } else { - if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE= _ISCSI) - src =3D scsisrc->u.iscsi.src; - ret->driveCmd =3D qemuBuildSCSIHostdevDrvStr(hostdev); - ret->driveAlias =3D qemuAliasFromHostdev(hostdev); - *backendAlias =3D ret->driveAlias; - } + if (!(ret->storageProps =3D qemuBlockStorageSourceGetBackendProps(src, + QEMU_B= LOCK_STORAGE_SOURCE_BACKEND_PROPS_SKIP_UNMAP))) + return NULL; - if (src && - qemuBuildStorageSourceAttachPrepareCommon(src, ret) < 0) + if (qemuBuildStorageSourceAttachPrepareCommon(src, ret) < 0) return NULL; return g_steal_pointer(&ret); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 245cae9c60..d45c5d30a9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5718,7 +5718,6 @@ qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(vi= rDomainHostdevDef *hostdev, */ static int qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(virDomainHostdevDef= *hostdev, - virQEMUCaps *qemuCa= ps, unsigned int parseF= lags) { virDomainHostdevSubsysSCSI *scsisrc =3D &hostdev->source.subsys.u.scsi; @@ -5727,11 +5726,6 @@ qemuDomainDeviceHostdevDefPostParseRestoreBackendAli= as(virDomainHostdevDef *host if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS)) return 0; - if (hostdev->mode !=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || - hostdev->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SC= SI || - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)) - return 0; - switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) { case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE: if (!scsisrc->u.host.src) @@ -5782,8 +5776,7 @@ qemuDomainHostdevDefPostParse(virDomainHostdevDef *ho= stdev, if (qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(hostdev, parseF= lags) < 0) return -1; - if (qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(hostdev, qe= muCaps, - parseFlags)= < 0) + if (qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(hostdev, pa= rseFlags) < 0) return -1; if (hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && @@ -11018,12 +11011,9 @@ qemuDomainPrepareHostdev(virDomainHostdevDef *host= dev, const char *backendalias =3D hostdev->info->alias; src->readonly =3D hostdev->readonly; - - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_= SCSI)) { - src->id =3D qemuDomainStorageIDNew(priv); - src->nodestorage =3D g_strdup_printf("libvirt-%d-backend",= src->id); - backendalias =3D src->nodestorage; - } + 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; --=20 2.36.1