From nobody Mon Feb 9 04:33:46 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=1592840578; cv=none; d=zohomail.com; s=zohoarc; b=Bl0RdBUbnWT5Ns6FCNuS0S/cU0C1TtYX2oCVNn/2xYp/fwak3BDPU989RKXkee8JFatWunDBdeC/Nc3g2EFfVuk75Fr2CE5V+uts536sojaipvHuPQsISkf+P9iejglunhM17oJL30N3U51xbtzc/wU9PC/ZRdY4HyU3nripGRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840578; 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=qUqZ5wMR7rg+UgR8rn0Iou9AsHnlqSoAGVoOo/nlhsk=; b=ZbYQYXmHoiqJY7KZtBB3DrEpsRo7ytJaN98J8V/9Nlq1y0NHMELLqWJO6WyTpnqsXMuwbOJPnZ7WdAPuSPuxMgL7UrFfZdWFFNCkvWMABwZqNfbEGirtlpmM0WfxUHh6hSwfyQ4QqdlRr8RfdRG1SN5oGvS7WD8Xc5AcDqbYpiI= 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 1592840578330739.685847914338; Mon, 22 Jun 2020 08:42:58 -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-281-N9b3Nh8zOJeyA3_ozyDaqQ-1; Mon, 22 Jun 2020 11:42:54 -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 428631883612; Mon, 22 Jun 2020 15:42:45 +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 1ECCD5C1BD; Mon, 22 Jun 2020 15:42:45 +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 E1F92180597C; Mon, 22 Jun 2020 15:42:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05MFgZd8020470 for ; Mon, 22 Jun 2020 11:42:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9D7395C220; Mon, 22 Jun 2020 15:42:35 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1125F5C1BD for ; Mon, 22 Jun 2020 15:42:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840577; 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=qUqZ5wMR7rg+UgR8rn0Iou9AsHnlqSoAGVoOo/nlhsk=; b=FVPA1EUdeUKdnoxVmiRb61H8M3JtNo/8eM0lQji81LvD25t44dTLq9S6gLKnJHV8vdX8Vp j/y1WAnaUoRFNm/gTQYwCQz+XtP+eJdLUlzHV7oOKEOTlqX9XjLVAX29+1coVWYmgagKZf mhhvmTN0/AVG8Anq3Yp9pOkTStlkIQo= X-MC-Unique: N9b3Nh8zOJeyA3_ozyDaqQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/12] qemuxml2argvtest: hostdev-scsi-virtio-scsi: Integrate 'hostdev-scsi-readonly' Date: Mon, 22 Jun 2020 17:42:22 +0200 Message-Id: <11d29688a34c148730f199f915e22621718b6a2b.1592840388.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" This can be tested along with other stuff. Signed-off-by: Peter Krempa --- .../hostdev-scsi-readonly.args | 34 -------------- .../hostdev-scsi-readonly.xml | 38 --------------- ...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 3 ++ ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 3 ++ ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 3 ++ .../hostdev-scsi-virtio-scsi.xml | 8 ++++ tests/qemuxml2argvtest.c | 3 -- .../hostdev-scsi-readonly.xml | 47 ------------------- .../hostdev-scsi-virtio-scsi.xml | 8 ++++ tests/qemuxml2xmltest.c | 3 -- 10 files changed, 25 insertions(+), 125 deletions(-) delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-readonly.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-readonly.xml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args b/tests/qemu= xml2argvdata/hostdev-scsi-readonly.args deleted file mode 100644 index 0e481e74647..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest2 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i386 \ --name QEMUGuest2 \ --S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest2/moni= tor.sock,\ -server,nowait \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ --usb \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev0,readonly= =3Don \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D8,\ -drive=3Ddrive-hostdev0,id=3Dhostdev0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml b/tests/qemux= ml2argvdata/hostdev-scsi-readonly.xml deleted file mode 100644 index 2e70edd6400..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.xml +++ /dev/null @@ -1,38 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - -
- - - - - - - - - - -
- - -
- - - - 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 810d02a408a..50353df478c 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 @@ -34,5 +34,8 @@ server,nowait \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev0 \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D8,\ drive=3Ddrive-hostdev0,id=3Dhostdev0 \ +-drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,\ +drive=3Ddrive-hostdev1,id=3Dhostdev1 \ -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 e74fd1118ca..e0680fce4cf 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 @@ -33,6 +33,9 @@ file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev0 \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D8,\ drive=3Ddrive-hostdev0,id=3Dhostdev0 \ +-drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,\ +drive=3Ddrive-hostdev1,id=3Dhostdev1 \ -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 9a70b6eeb0f..0da84d08b30 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -37,6 +37,9 @@ file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev0 \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D8,\ drive=3Ddrive-hostdev0,id=3Dhostdev0 \ +-drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,\ +drive=3Ddrive-hostdev1,id=3Dhostdev1 \ -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 0fe01de1abd..013c8cd17f7 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml @@ -32,6 +32,14 @@
+ + + +
+ + +
+ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d9544a511b7..e10d90fbf88 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2663,9 +2663,6 @@ mymain(void) DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0"); DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi"); - DO_TEST("hostdev-scsi-readonly", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-virtio-iscsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml b/tests/qem= uxml2xmloutdata/hostdev-scsi-readonly.xml deleted file mode 100644 index 17bb7e3904d..00000000000 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml +++ /dev/null @@ -1,47 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - -
- - -
- - -
- - -
- - - - - - - -
- - -
- - -
- - - diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml b/tests/= qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml index 81ae94318b5..a1fa36de386 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml @@ -39,6 +39,14 @@
+ + + +
+ + +
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2857f4f30f9..d3da788979d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1021,9 +1021,6 @@ mymain(void) DO_TEST("hostdev-scsi-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-scsi-readonly", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-shareable", QEMU_CAPS_VIRTIO_SCSI, --=20 2.26.2