From nobody Sat Apr 20 05:05:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1605888521; cv=none; d=zohomail.com; s=zohoarc; b=D7FWUxfdYXWUCFlnbTLxQvMx/OKzR31yJQsTlJwktMrU3mVlHh9GEDaIvQ44EqB1/v/qk83QrY+Zzvu0eIXdGnorx9SK3bM7AI8V+33h1TFItEtatcrrxGbcEtL102XNJJHoWuAD4zOcZk+yNMZ/u8N3C24SbGzAuAtDDkStWmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605888521; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=HYAUhcxYcbBAzKHgbMrV4JH1y+PPg3aj9J+BuTYR5Sw=; b=i/RR3zq7XLDMsg7s5gvEQkL/LUVsYHVMgMJopD7Dt0V6NFYSCvpA/2JzcjfOSXxPWBPZ4jibw81QOQW1juBTeQOkNbZdawbjuvN9uohV76a0B3CbjSoWT5ks4aiY8GlWLYUp/jwI0Gl7rd0CoBLkNRdWmUXed02SQg1VJFUxwcs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605888521925981.9855867537783; Fri, 20 Nov 2020 08:08:41 -0800 (PST) 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-515-V12CWazpMfqAu3f2s60TVg-1; Fri, 20 Nov 2020 11:08:37 -0500 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 10EAC1005D5A; Fri, 20 Nov 2020 16:08:30 +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 9C7AB5D6AD; Fri, 20 Nov 2020 16:08:29 +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 EAE4E4BB7B; Fri, 20 Nov 2020 16:08:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AKG8RuZ024006 for ; Fri, 20 Nov 2020 11:08:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id 89AE05D6CF; Fri, 20 Nov 2020 16:08:27 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-243.ams2.redhat.com [10.36.114.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF2685D6BA; Fri, 20 Nov 2020 16:08:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605888520; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=HYAUhcxYcbBAzKHgbMrV4JH1y+PPg3aj9J+BuTYR5Sw=; b=ikrXfrOxSPTfJD7XF/nDbObZI3kKXD1wtEygukjca03hqvihcGt2H9VyPsHU3LG2L6QI61 p41a+DPevwl9BUmliIL0ky2Z1iUiDno/Q3wiHqPanVuKeAeH0CiEnCyTq7iaWTc0rLVZOw rELPzgt510XQjwoBbTNTVry7xa7Piz4= X-MC-Unique: V12CWazpMfqAu3f2s60TVg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH] qemu: fix setting of scsi-id for ESP SCSI controllers Date: Fri, 20 Nov 2020 16:08:21 +0000 Message-Id: <20201120160821.976578-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The ESP SCSI controllers have same requirement as the LSI Logic controller for each disk to be set via the scsi-id=3DNNN property, not the lun=3DNNN property. Switching the code to use an enum will force authors to pay attention to this difference when adding future SCSI controllers. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- src/qemu/qemu_command.c | 26 +++++++++++++++++++++-- tests/qemuxml2argvdata/sparc-minimal.args | 4 ++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fbaacb8dd8..479bcc0b0c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1625,17 +1625,39 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, disk->info.addr.dri= ve.controller))) return NULL; =20 - if (controllerModel =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOG= IC) { + switch ((virDomainControllerModelSCSI)controllerModel) { + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_NCR53C90: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DC390: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AM53C974: virBufferAsprintf(&opt, ",bus=3D%s.%d,scsi-id=3D%d", contAlias, disk->info.addr.drive.bus, disk->info.addr.drive.unit); - } else { + break; + + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_TRANSITIONAL: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_NON_TRANSITIONAL: virBufferAsprintf(&opt, ",bus=3D%s.0,channel=3D%d,scsi-id=3D%d= ,lun=3D%d", contAlias, disk->info.addr.drive.bus, disk->info.addr.drive.target, disk->info.addr.drive.unit); + break; + + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected SCSI controller model %d"), + controllerModel); + return NULL; } =20 if (scsiVPDDeviceId) diff --git a/tests/qemuxml2argvdata/sparc-minimal.args b/tests/qemuxml2argv= data/sparc-minimal.args index 65cf99c895..0bf4c8f825 100644 --- a/tests/qemuxml2argvdata/sparc-minimal.args +++ b/tests/qemuxml2argvdata/sparc-minimal.args @@ -26,9 +26,9 @@ path=3D/tmp/lib/domain--1-redhat62sparc/monitor.sock,serv= er,nowait \ -usb \ -drive file=3D/home/berrange/VirtualMachines/redhat-6.2-sparc.img,format= =3Dqcow2,\ if=3Dnone,id=3Ddrive-scsi0-0-0-0 \ --device scsi-hd,bus=3Dscsi.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Ddrive= -scsi0-0-0-0,\ +-device scsi-hd,bus=3Dscsi.0,scsi-id=3D0,drive=3Ddrive-scsi0-0-0-0,\ id=3Dscsi0-0-0-0,bootindex=3D1 \ -drive file=3D/home/berrange/VirtualMachines/redhat-6.2-sparc.iso,format= =3Draw,\ if=3Dnone,id=3Ddrive-scsi0-0-0-1,readonly=3Don \ --device scsi-cd,bus=3Dscsi.0,channel=3D0,scsi-id=3D0,lun=3D1,drive=3Ddrive= -scsi0-0-0-1,\ +-device scsi-cd,bus=3Dscsi.0,scsi-id=3D1,drive=3Ddrive-scsi0-0-0-1,\ id=3Dscsi0-0-0-1 --=20 2.28.0