From nobody Mon Feb 9 02:14:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1632315867; cv=none; d=zohomail.com; s=zohoarc; b=XwqswEHW0TDau5100PEjCfE6DTFm+aFVzo6LUhvrGiKCBzyZAHN4AkvDRerA5rG6GJGIzn2UpdJBEl3uUHGULvX9FWcVxi9WlkM+wyCys+hsS/L04NITmezILliDjUvvQf7Fjt8Vmxc0BEe9np+njexzVllr4IlDljMiUmiI3mg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632315867; 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=zOfXNfB1FdGtUTlzU7bGjhnOLBsR1MhH7aT6nGjBNzo=; b=EwQMcck7Oui9TeFXJ9aSPNbP+GPsbjIwp7C8lwifu8dmHQ2PVw6eJbvuE6wJVT/yQgQ3YhFq1RGPgvxMBtlk85I/D9R2pO6st3uDv6VM2Y5jIh/pUgyXXJYdhVuk4iJQI/nBaAH1qFlG99Kcm7/iIJfESfPoyGbV8P8lwlqSfh4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1632315867973985.9911460663124; Wed, 22 Sep 2021 06:04:27 -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-498-2Isyq-j-Nfi0GT61zYfILw-1; Wed, 22 Sep 2021 09:04:25 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2559884A5E0; Wed, 22 Sep 2021 13:04:20 +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 0771260843; Wed, 22 Sep 2021 13:04:20 +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 C48064EA30; Wed, 22 Sep 2021 13:04:19 +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 18MD4IQ2020909 for ; Wed, 22 Sep 2021 09:04:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1E16617B4F; Wed, 22 Sep 2021 13:04:18 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 750685F91D for ; Wed, 22 Sep 2021 13:04:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632315867; 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=zOfXNfB1FdGtUTlzU7bGjhnOLBsR1MhH7aT6nGjBNzo=; b=PFPwnN3aa8J+xHxfFUe+WKgGyfbnwLmUepA+kW2vuIZlhcuDRBChm1caTj5jZH3EqYdAAq 3wR9+wLIqttOu0Rw5JwAbN8zcAugV9d6ecuv7C8XHnrWXmLZ2/dfIb+tftYNYVQ4KKTsGz qOZ8ZDrSWW45sjLRz8HFy2fwN5yoit8= X-MC-Unique: 2Isyq-j-Nfi0GT61zYfILw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/20] qemuxml2argvtest: Merge 'disk-iscsi' case into 'disk-cache' Date: Wed, 22 Sep 2021 15:02:21 +0200 Message-Id: <0795ed6996cbf4e2a4f50ec450b442effe0aa1ea.1632315628.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.13 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) X-ZM-MESSAGEID: 1632315876326100001 Content-Type: text/plain; charset="utf-8" Use the iSCSI disk path in one of the disks of the 'disk-cache' test as it's the only specialty of 'disk-iscsi' case and remove the now pointless files. Signed-off-by: Peter Krempa --- .../disk-cache.x86_64-2.12.0.args | 2 +- .../disk-cache.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-cache.xml | 2 +- tests/qemuxml2argvdata/disk-iscsi.args | 31 ------------------- tests/qemuxml2argvdata/disk-iscsi.xml | 28 ----------------- tests/qemuxml2argvtest.c | 1 - .../disk-cache.x86_64-2.12.0.xml | 2 +- .../disk-cache.x86_64-latest.xml | 2 +- 8 files changed, 5 insertions(+), 65 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-iscsi.args delete mode 100644 tests/qemuxml2argvdata/disk-iscsi.xml diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args b/tests/q= emuxml2argvdata/disk-cache.x86_64-2.12.0.args index f3c4e9edc1..fab26632d4 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args @@ -33,7 +33,7 @@ QEMU_AUDIO_DRV=3Dnone \ -device ide-hd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-1,w= rite-cache=3Don \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-s= csi0-0-0,cache=3Dnone \ -device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,drive=3Ddrive-scsi0-0-0,id=3Dscs= i0-0-0,write-cache=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-v= irtio-disk0,cache=3Dwritethrough \ +-drive file=3D/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan= .hdserver:hydrar-desktop.win7vm-lun-0,format=3Dqcow2,if=3Dnone,id=3Ddrive-v= irtio-disk0,cache=3Dwritethrough \ -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk0,id=3Dvirtio-disk0,write-cache=3Doff \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-u= sb-disk1,cache=3Ddirectsync \ -device usb-storage,bus=3Dusb.0,port=3D1,drive=3Ddrive-usb-disk1,id=3Dusb-= disk1,removable=3Doff,write-cache=3Doff \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-cache.x86_64-latest.args index eb8aeef0fc..7c78e04f77 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args @@ -37,7 +37,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-3-storage"}' \ -device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,device_id=3Ddrive-scsi0-0-0,driv= e=3Dlibvirt-3-format,id=3Dscsi0-0-0,write-cache=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","cache":{"direct":false,"no-flush":false},"aut= o-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/disk/by-path/ip-192.16= 8.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0","no= de-name":"libvirt-2-storage","cache":{"direct":false,"no-flush":false},"aut= o-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":false,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0,write-cache=3Doff \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/disk-cache.xml b/tests/qemuxml2argvdata= /disk-cache.xml index e1ba6f953f..8ef609a622 100644 --- a/tests/qemuxml2argvdata/disk-cache.xml +++ b/tests/qemuxml2argvdata/disk-cache.xml @@ -33,7 +33,7 @@ - + diff --git a/tests/qemuxml2argvdata/disk-iscsi.args b/tests/qemuxml2argvdat= a/disk-iscsi.args deleted file mode 100644 index a0365694e0..0000000000 --- a/tests/qemuxml2argvdata/disk-iscsi.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --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-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --usb \ --drive file=3D/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan= .hdserver:hydrar-desktop.win7vm-lun-0,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 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-iscsi.xml b/tests/qemuxml2argvdata= /disk-iscsi.xml deleted file mode 100644 index 04d821989f..0000000000 --- a/tests/qemuxml2argvdata/disk-iscsi.xml +++ /dev/null @@ -1,28 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - -
- - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ea3fc5901d..1f633e3f07 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1297,7 +1297,6 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-cdrom"); DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid"); DO_TEST_CAPS_LATEST("disk-cdrom-bus-other"); - DO_TEST_NOCAPS("disk-iscsi"); DO_TEST_CAPS_VER("disk-cdrom-network", "2.12.0"); DO_TEST_CAPS_LATEST("disk-cdrom-network"); DO_TEST_CAPS_VER("disk-cdrom-tray", "2.12.0"); diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml b/tests/= qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml index 7c835918af..15a6665145 100644 --- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml +++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml @@ -34,7 +34,7 @@ - +
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml b/tests/= qemuxml2xmloutdata/disk-cache.x86_64-latest.xml index 708bc0bb88..c770deaaab 100644 --- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml @@ -37,7 +37,7 @@ - +
--=20 2.31.1