From nobody Thu Nov 14 07:18:14 2024 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=1632310582; cv=none; d=zohomail.com; s=zohoarc; b=GvmgCip4doaV5/ax3/xVSO3R4iTV/Iq9WR9C+SKzXXeggWXr6tvgwwkwCJ8YHKA/OGfB59HIYM1sOVXsNEBu8sz3k1uQE8g11rarJclGV56CzFMn2dK/xRkgX2KgCBEVsUk7DgmQHmuLm28VRo5vlg8QS6avayeoMyfAH9V3Kj4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632310582; 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=kDr0+wCdurhr+nf6PzsHKY6Aosk/zU+Z53ZnUdykZ08=; b=e4SsHVkO5RNaduH4DhMoKCFm/4HjaTrnkMqBC2dRshOCCo6Xa8HLhncQ10o1nHkmMx/zvLqvG01YAPJOxfIaLkZixlGS8x5NLzN4Ua9Em2N+BiZ4n1yb4XXEUnGAurOAqmzbfH2/RAXi2r8g7kYnwIb7qpxbc5U6BuUOmprCVsU= 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 163231058295456.20351159472352; Wed, 22 Sep 2021 04:36: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-45-1FHbEYgnNdO2JEHKuojGTQ-1; Wed, 22 Sep 2021 07:36: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 A7D54A40C9; Wed, 22 Sep 2021 11:36:10 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8BAD4652AC; Wed, 22 Sep 2021 11:36:10 +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 589054EA39; Wed, 22 Sep 2021 11:36:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18MBZm0X006696 for ; Wed, 22 Sep 2021 07:35:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id D090F60854; Wed, 22 Sep 2021 11:35:48 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2987660871 for ; Wed, 22 Sep 2021 11:35:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632310581; 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=kDr0+wCdurhr+nf6PzsHKY6Aosk/zU+Z53ZnUdykZ08=; b=dxppJCvxsbwXoj62YxYnyzZ6Zuo5rYl3I47V+HZOft0iegSwmigh+8E2Ep9x+lev2jhvEj JNJFFrNdF3GNUJWWII7itQqmOdSVNjD3NWdGTjPmfdTwH9DPYAsy/hLcr4RRu7rB7Jxim0 yHh0ns6rfp6KnlpdmnT2ThsFZe3y2lA= X-MC-Unique: 1FHbEYgnNdO2JEHKuojGTQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/12] qemuBuildSCSIiSCSIHostdevDrvStr: Don't call qemuDiskSourceNeedsProps Date: Wed, 22 Sep 2021 13:35:28 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 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: 1632310584660100005 Content-Type: text/plain; charset="utf-8" It always returns true for iSCSI, so we can remove the fallback logic. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 60b47573d5..0b87719f75 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4501,24 +4501,12 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDef= *dev) g_autoptr(virJSONValue) srcprops =3D NULL; virDomainHostdevSubsysSCSI *scsisrc =3D &dev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIiSCSI *iscsisrc =3D &scsisrc->u.iscsi; - qemuDomainStorageSourcePrivate *srcPriv =3D - QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src); - if (qemuDiskSourceNeedsProps(iscsisrc->src)) { - if (!(srcprops =3D qemuDiskSourceGetProps(iscsisrc->src))) - return NULL; - if (!(netsource =3D virQEMUBuildDriveCommandlineFromJSON(srcprops)= )) - return NULL; - virBufferAsprintf(&buf, "%s,if=3Dnone,format=3Draw", netsource); - } else { - /* Rather than pull what we think we want - use the network disk c= ode */ - if (!(netsource =3D qemuBuildNetworkDriveStr(iscsisrc->src, srcPri= v ? - srcPriv->secinfo : NULL= ))) - return NULL; - virBufferAddLit(&buf, "file=3D"); - virQEMUBuildBufferEscapeComma(&buf, netsource); - virBufferAddLit(&buf, ",if=3Dnone,format=3Draw"); - } + if (!(srcprops =3D qemuDiskSourceGetProps(iscsisrc->src))) + return NULL; + if (!(netsource =3D virQEMUBuildDriveCommandlineFromJSON(srcprops))) + return NULL; + virBufferAsprintf(&buf, "%s,if=3Dnone,format=3Draw", netsource); return virBufferContentAndReset(&buf); } --=20 2.31.1