From nobody Sun Feb 8 22:08:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1594391670; cv=none; d=zohomail.com; s=zohoarc; b=oDOHvQj0HQXBcjtRX3NXAZfIJFwFLXRQmhpUkhg5w27I1SLwqoi9/8WpwAc9hOvzlTTNMOBBn4wddAfThOLbR9h8nXxmlazKu2ZyrCb14x4XEBW9WDAuaBKyHFIfz7IsaNO/4RW2TKigbr4JA3x1aVR1cr8RJiqlblyioSrxUKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594391670; 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=E+yaSvbo4lX3RzUcBnh2L9yMwyOy2R59dGRfxz4r1lo=; b=F/yDJ7XYBxZD8xWjlZwaY1MKKt+JwXlAS7zM4ou8uVVs/Sk3eYO5D7cwkLrhJpam0MAZziT/TOeSgGWjmF8MNumhG0jaEiI4l6dxVTA5pTQavRFfJtKJ0zAsWpxUAL9fqDPpJVfXAMsp2Fy6MkqzCEFJnsgNXRmWDP07MmBcfKw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1594391670781817.2543475794256; Fri, 10 Jul 2020 07:34:30 -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-434-6dy9AFLDP2WqBunmnxC7Sg-1; Fri, 10 Jul 2020 10:34:26 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D129C102C812; Fri, 10 Jul 2020 14:34:13 +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 AF61E5FC2E; 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 7ECF68436E; 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 06AEXuoC007084 for ; Fri, 10 Jul 2020 10:33:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 601EC17D82; Fri, 10 Jul 2020 14:33:56 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFBFB78A41 for ; Fri, 10 Jul 2020 14:33:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594391669; 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=E+yaSvbo4lX3RzUcBnh2L9yMwyOy2R59dGRfxz4r1lo=; b=GUOPzKM8Wis/P2r7hlw9QNxC+BIHqce8pg9SoUQMF59PxeBFvA1xneT+mcuXSspVsPSX/W J30g+M/BhD7WwS0fHseiqK5DIMLVh5GTm6P3okZBb+uGodVLAdLce60wU6nmsG1mmB034X hnJMKaoknN6dLc1+mI30sNZ641cD2vo= X-MC-Unique: 6dy9AFLDP2WqBunmnxC7Sg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/18] qemuBuildSCSIHostdevDevStr: Pass in backend alias Date: Fri, 10 Jul 2020 16:33:32 +0200 Message-Id: <015067cd046ea679914cfa36f8095f4dfbd6e4e5.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.16 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" Don't (re)generate the backend alias (alias of the -drive backend for now) internally but rather pass it in. Later on it will be replaced by the nodename when blockdev is used depending on the capabilities. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 14 ++++++++------ src/qemu/qemu_command.h | 4 +++- src/qemu/qemu_hotplug.c | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3d9479f863..200decd6e0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4641,11 +4641,11 @@ qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr d= ev, char * qemuBuildSCSIHostdevDevStr(const virDomainDef *def, - virDomainHostdevDefPtr dev) + virDomainHostdevDefPtr dev, + const char *backendAlias) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int model =3D -1; - g_autofree char *driveAlias =3D NULL; const char *contAlias; model =3D qemuDomainFindSCSIControllerModel(def, dev->info); @@ -4687,9 +4687,7 @@ qemuBuildSCSIHostdevDevStr(const virDomainDef *def, dev->info->addr.drive.unit); } - if (!(driveAlias =3D qemuAliasFromHostdev(dev))) - return NULL; - virBufferAsprintf(&buf, ",drive=3D%s,id=3D%s", driveAlias, dev->info->= alias); + virBufferAsprintf(&buf, ",drive=3D%s,id=3D%s", backendAlias, dev->info= ->alias); if (dev->info->bootIndex) virBufferAsprintf(&buf, ",bootindex=3D%u", dev->info->bootIndex); @@ -5073,6 +5071,7 @@ qemuBuildHostdevSCSICommandLine(virCommandPtr cmd, virDomainHostdevSubsysSCSIPtr scsisrc =3D &hostdev->source.subsys.u.sc= si; g_autofree char *devstr =3D NULL; g_autofree char *drvstr =3D NULL; + g_autofree char *backendAlias =3D NULL; if (scsisrc->protocol =3D=3D VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISC= SI) { virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =3D @@ -5091,8 +5090,11 @@ qemuBuildHostdevSCSICommandLine(virCommandPtr cmd, return -1; virCommandAddArg(cmd, drvstr); + if (!(backendAlias =3D qemuAliasFromHostdev(hostdev))) + return -1; + virCommandAddArg(cmd, "-device"); - if (!(devstr =3D qemuBuildSCSIHostdevDevStr(def, hostdev))) + if (!(devstr =3D qemuBuildSCSIHostdevDevStr(def, hostdev, backendAlias= ))) return -1; virCommandAddArg(cmd, devstr); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 55bc67072a..d0de27d9b0 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -179,7 +179,9 @@ char *qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr= dev, virQEMUCapsPtr qemuCaps); char *qemuBuildSCSIHostdevDevStr(const virDomainDef *def, - virDomainHostdevDefPtr dev); + virDomainHostdevDefPtr dev, + const char *backendAlias); + char * qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index cbd4c88abe..fbbd6a533c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2629,7 +2629,7 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriverPtr drive= r, if (!(drivealias =3D qemuAliasFromHostdev(hostdev))) goto cleanup; - if (!(devstr =3D qemuBuildSCSIHostdevDevStr(vm->def, hostdev))) + if (!(devstr =3D qemuBuildSCSIHostdevDevStr(vm->def, hostdev, driveali= as))) goto cleanup; if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) --=20 2.26.2