From nobody Mon Feb 9 07:56:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1602775576; cv=none; d=zohomail.com; s=zohoarc; b=DnUPJIqVv0IsXJ2z6vU1JKjc4+8QcZbiaWFCZetPGIRdXXVKNsldDszYQLm/qPDHzUI6doE77U2Cly+fo4C6UQ4aVZY7YL26VVOHR7xhF4lM303KU8p2QX1k/bsjbToZhBZPn02pInhugN2WDEfbeh7E/dLLHemJZvDiqkIksFw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602775576; h=Content-Type:Content-Transfer-Encoding:Cc: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=86do5lY8b5hKb6JgnDfZqnW7CS90ej4uWHQrTOHEI+c=; b=Jww+9npPmd1bbAIiX+r3fFhSjvhCzahUV+bGdmNn5ZFyJinxrYxf3HhdFzGw4xiBNoalo6v7QjVh3b2QBe5+DUbewReLZcOho4Dw3b746AdtCLfbgB34IQBcoh0xdC2CEiUuovi75mBPzav/UqpxT2PByY7uh3Cc5I3/ZelyPoA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602775576617309.5399807541984; Thu, 15 Oct 2020 08:26:16 -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-520-OrEfcEOcP-mS1vEf06KjbQ-1; Thu, 15 Oct 2020 11:25:58 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 84FBE8015FD; Thu, 15 Oct 2020 15:25:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6233E60C07; Thu, 15 Oct 2020 15:25:50 +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 30E56181A894; Thu, 15 Oct 2020 15:25:50 +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 09FFPT6v015677 for ; Thu, 15 Oct 2020 11:25:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0E3D775131; Thu, 15 Oct 2020 15:25:29 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B4F375135; Thu, 15 Oct 2020 15:25:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602775575; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=86do5lY8b5hKb6JgnDfZqnW7CS90ej4uWHQrTOHEI+c=; b=iYS2M2TcUb/P4E4BSYl57Vd8akTumqm7pIE0ledg/qU5qTFhx6ty1U0adDjcPMTFAxM4PI zQfK2c1+2mA4kRCPIsXuFKfsXMzJUTf4nPnr+F7nVj/dRnkIIr1DRKs6hCPHEw+z6gZ/AM 0R6QJERZdHm0QYlYrRqOjaRbAFGLwoY= X-MC-Unique: OrEfcEOcP-mS1vEf06KjbQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/6] qemu: Detect whether a SCSI hostdev is a cdrom Date: Thu, 15 Oct 2020 17:25:13 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: daggs 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.12 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) Content-Type: text/plain; charset="utf-8" QEMU has a special blockdev backend for a cdrom called 'host_cdrom'. Use it for SCSI hostdevs so that guests can detect the cdrom properly. For testing purposes we format a cdrom if the fake adapter name is "cdrom". Signed-off-by: Peter Krempa --- src/qemu/qemu_process.c | 4 ++++ .../hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 3 +++ .../hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 3 +++ .../hostdev-scsi-virtio-scsi.x86_64-latest.args | 4 ++++ tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml | 8 ++++++++ tests/qemuxml2argvtest.c | 7 ++++++- tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml | 8 ++++++++ 7 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 70b8d39db9..6e6073c0e1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6233,6 +6233,10 @@ qemuProcessPrepareHostHostdev(virDomainHostdevDefPtr= hostdev) return -1; src->path =3D g_strdup_printf("/dev/%s", devstr); + + if (virFileIsCDROM(src->path) =3D=3D 1) + src->hostcdrom =3D true; + break; } diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.a= rgs b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args index bb8a466f70..03ed12912e 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args @@ -58,5 +58,8 @@ drive=3Ddrive-hostdev4,id=3Dhostdev4 \ 3260/iqn.1992-01.com.example%3Astorage/2,if=3Dnone,format=3Draw,id=3Ddrive= -hostdev5 \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D5,\ drive=3Ddrive-hostdev5,id=3Dhostdev5 \ +-drive file=3D/dev/sr0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev6,readonly= =3Don \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D5,\ +drive=3Ddrive-hostdev6,id=3Dhostdev6 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.a= rgs b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args index 973ae5677a..5aaf2a9ea2 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args @@ -70,6 +70,9 @@ file.initiator-name=3Diqn.2020-07.com.example:test,if=3Dn= one,format=3Draw,\ id=3Ddrive-hostdev5 \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D5,\ drive=3Ddrive-hostdev5,id=3Dhostdev5 \ +-drive file=3D/dev/sr0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev6,readonly= =3Don \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D5,\ +drive=3Ddrive-hostdev6,id=3Dhostdev6 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index c00ef41bf2..b26fbe36ff 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -76,6 +76,10 @@ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,for= mat=3Dbase64 \ "node-name":"libvirt-8-backend","read-only":false}' \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D5,\ drive=3Dlibvirt-8-backend,id=3Dhostdev5 \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/sr0",\ +"node-name":"libvirt-9-backend","read-only":true}' \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D5,\ +drive=3Dlibvirt-9-backend,id=3Dhostdev6 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml b/tests/qe= muxml2argvdata/hostdev-scsi-virtio-scsi.xml index d096e0cb28..9374acef90 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml @@ -82,6 +82,14 @@
+ + + +
+ + +
+ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3c1bec804a..3db4824a26 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -419,7 +419,12 @@ testCompareXMLToArgvCreateArgs(virQEMUDriverPtr drv, switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) { case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE: - scsisrc->u.host.src->path =3D g_strdup("/dev/sg0"); + if (STREQ(scsisrc->u.host.adapter, "cdrom")) { + scsisrc->u.host.src->path =3D g_strdup("/dev/sr0"); + scsisrc->u.host.src->hostcdrom =3D true; + } else { + scsisrc->u.host.src->path =3D g_strdup("/dev/sg0"); + } break; case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI: diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml b/tests/= qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml index 3e2e21dc55..6f6899c114 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml @@ -89,6 +89,14 @@
+ + + +
+ + +
+
--=20 2.26.2