From nobody Mon Feb 9 03:17:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1594391661; cv=none; d=zohomail.com; s=zohoarc; b=RC42XFViySA8J2UazGF2/aK86eYyYzevnaBZ3sys8feP4uJaPZL2r7gL/HGKtm/FcNGCCrzT0zpSM4t5j67EEw3Dwgz1pauTc0186JYdzGjJiwZIab+4cmk961Nipz4O7w3wVga1wm0LcdyFTfSgC9kG1WBUWnhjHIBdSfPV9/I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594391661; 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=dlHkIgkQ/3FTZeVwxAwCZgeLl8AXeAVU8nV3eDmTGfQ=; b=YJvuVL/zWfEQg2JLiUxNoxdK8mz2W9gHO0Z+scawC2mU1psxWnjhCnav+DMGnziKWnHbPAfQqQR73iQPFDw25xxOmN7hI48q0yW4l9eq+hnxpiu8o/HOAQ91UEfQ1I+epXTXKwtk7AHIL5p1S8cCWRuH+ujP3p4qVb3Fhuk85Tk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594391661324550.9565784429624; Fri, 10 Jul 2020 07:34:21 -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-181-ae9DtBl7MseGUuSvpNBqtA-1; Fri, 10 Jul 2020 10:34:17 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 60DC5108E; Fri, 10 Jul 2020 14:34:11 +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 423BB7EF9E; Fri, 10 Jul 2020 14:34:11 +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 0E0FB8436F; Fri, 10 Jul 2020 14:34:11 +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 06AEXtR9007063 for ; Fri, 10 Jul 2020 10:33:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 489DB7880F; Fri, 10 Jul 2020 14:33:55 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id A57AA17D82 for ; Fri, 10 Jul 2020 14:33:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594391660; 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=dlHkIgkQ/3FTZeVwxAwCZgeLl8AXeAVU8nV3eDmTGfQ=; b=enhlIHKAve8zTWh57M5p+GdnoCgAw9CECXZnEVmh6J8FqQ1pngXkopRjEoGoBST+3i61Zj iDHIrVIZ5OJsonbPKL2bTlF9Jwh7lm/XIhB8QDqxuE0ulU2zLlI9d9l5R7HlINPPJTlFTR XthYi17cluee1948CiJGYl2VGFx9Ihw= X-MC-Unique: ae9DtBl7MseGUuSvpNBqtA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/18] qemuBuildHostdevCommandLine: Extract (i)SCSI code Date: Fri, 10 Jul 2020 16:33:31 +0200 Message-Id: <4a169d07a0da2a1bd6b9d814c5494e599b4fd7fe.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.15 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" Move all (i)SCSI related code into a new function named 'qemuBuildHostdevSCSICommandLine'. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 61 +++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c41976b903..3d9479f863 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5063,6 +5063,43 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *d= ef, return virBufferContentAndReset(&buf); } + +static int +qemuBuildHostdevSCSICommandLine(virCommandPtr cmd, + const virDomainDef *def, + virDomainHostdevDefPtr hostdev, + virQEMUCapsPtr qemuCaps) +{ + virDomainHostdevSubsysSCSIPtr scsisrc =3D &hostdev->source.subsys.u.sc= si; + g_autofree char *devstr =3D NULL; + g_autofree char *drvstr =3D NULL; + + if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISC= SI) { + virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =3D + &scsisrc->u.iscsi; + qemuDomainStorageSourcePrivatePtr srcPriv =3D + QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src); + + if (qemuBuildDiskSecinfoCommandLine(cmd, srcPriv ? + srcPriv->secinfo : + NULL) < 0) + return -1; + } + + virCommandAddArg(cmd, "-drive"); + if (!(drvstr =3D qemuBuildSCSIHostdevDrvStr(hostdev, qemuCaps))) + return -1; + virCommandAddArg(cmd, drvstr); + + virCommandAddArg(cmd, "-device"); + if (!(devstr =3D qemuBuildSCSIHostdevDevStr(def, hostdev))) + return -1; + virCommandAddArg(cmd, devstr); + + return 0; +} + + static int qemuBuildHostdevCommandLine(virCommandPtr cmd, const virDomainDef *def, @@ -5074,10 +5111,8 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, for (i =3D 0; i < def->nhostdevs; i++) { virDomainHostdevDefPtr hostdev =3D def->hostdevs[i]; virDomainHostdevSubsysPtr subsys =3D &hostdev->source.subsys; - virDomainHostdevSubsysSCSIPtr scsisrc =3D &hostdev->source.subsys.= u.scsi; virDomainHostdevSubsysMediatedDevPtr mdevsrc =3D &subsys->u.mdev; g_autofree char *devstr =3D NULL; - g_autofree char *drvstr =3D NULL; g_autofree char *vhostfdName =3D NULL; unsigned int bootIndex =3D hostdev->info->bootIndex; int vhostfd =3D -1; @@ -5123,28 +5158,8 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, /* SCSI */ case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: - if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_= TYPE_ISCSI) { - virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =3D - &scsisrc->u.iscsi; - qemuDomainStorageSourcePrivatePtr srcPriv =3D - QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src); - - if (qemuBuildDiskSecinfoCommandLine(cmd, srcPriv ? - srcPriv->secinfo : - NULL) < 0) - return -1; - } - - virCommandAddArg(cmd, "-drive"); - if (!(drvstr =3D qemuBuildSCSIHostdevDrvStr(hostdev, qemuCaps)= )) + if (qemuBuildHostdevSCSICommandLine(cmd, def, hostdev, qemuCap= s) < 0) return -1; - virCommandAddArg(cmd, drvstr); - - virCommandAddArg(cmd, "-device"); - if (!(devstr =3D qemuBuildSCSIHostdevDevStr(def, hostdev))) - return -1; - virCommandAddArg(cmd, devstr); - break; /* SCSI_host */ --=20 2.26.2