From nobody Sun Feb 8 08:13:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1532015514786572.9076026124346; Thu, 19 Jul 2018 08:51:54 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6D3FA3082A4D; Thu, 19 Jul 2018 15:51:53 +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 2BF132010CDB; Thu, 19 Jul 2018 15:51:53 +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 851C94A463; Thu, 19 Jul 2018 15:51:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6JFpNeA028599 for ; Thu, 19 Jul 2018 11:51:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 570D51C5A6; Thu, 19 Jul 2018 15:51:23 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBBB61C5B0 for ; Thu, 19 Jul 2018 15:51:22 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Jul 2018 17:50:57 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 05/24] tests: qemuxml2argv: Unify network cdrom source testing 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 19 Jul 2018 15:51:54 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Unify most of the tests into a common test named disk-cdrom-network by adding multiple cdroms. The 'http' test is dropped since there can be only 4 cdroms. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- tests/qemuxml2argvdata/disk-cdrom-network-ftp.args | 27 ---------------- tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml | 36 ------------------= ---- .../qemuxml2argvdata/disk-cdrom-network-ftps.args | 27 ---------------- tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml | 36 ------------------= ---- .../qemuxml2argvdata/disk-cdrom-network-http.args | 27 ---------------- tests/qemuxml2argvdata/disk-cdrom-network-http.xml | 36 ------------------= ---- .../qemuxml2argvdata/disk-cdrom-network-tftp.args | 27 ---------------- tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml | 36 ------------------= ---- ...-network-https.args =3D> disk-cdrom-network.args} | 9 ++++++ ...om-network-https.xml =3D> disk-cdrom-network.xml} | 27 ++++++++++++++++ tests/qemuxml2argvtest.c | 6 +--- 11 files changed, 37 insertions(+), 257 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftp.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftps.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-http.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-http.xml delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-tftp.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml rename tests/qemuxml2argvdata/{disk-cdrom-network-https.args =3D> disk-cdr= om-network.args} (58%) rename tests/qemuxml2argvdata/{disk-cdrom-network-https.xml =3D> disk-cdro= m-network.xml} (52%) diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftp.args b/tests/qem= uxml2argvdata/disk-cdrom-network-ftp.args deleted file mode 100644 index e9eab22aaf..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-ftp.args +++ /dev/null @@ -1,27 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/home/test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-x86_64 \ --name QEMUGuest1 \ --S \ --machine pc-1.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ --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,nowait \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --boot d \ --usb \ --drive file=3Dftp://host.name:21/url/path/file.iso,format=3Draw,if=3Dnone,\ -id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml b/tests/qemu= xml2argvdata/disk-cdrom-network-ftp.xml deleted file mode 100644 index b4e3311606..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml +++ /dev/null @@ -1,36 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 1048576 - 1048576 - 1 - - hvm - - - - - - - - - destroy - restart - restart - - /usr/bin/qemu-system-x86_64 - - - - - - - -
- - - - - - - diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftps.args b/tests/qe= muxml2argvdata/disk-cdrom-network-ftps.args deleted file mode 100644 index d334f7938f..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-ftps.args +++ /dev/null @@ -1,27 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/home/test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-x86_64 \ --name QEMUGuest1 \ --S \ --machine pc-1.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ --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,nowait \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --boot d \ --usb \ --drive file=3Dftps://host.name:990/url/path/file.iso,format=3Draw,if=3Dnon= e,\ -id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml b/tests/qem= uxml2argvdata/disk-cdrom-network-ftps.xml deleted file mode 100644 index 4e6ca1bad1..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml +++ /dev/null @@ -1,36 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 1048576 - 1048576 - 1 - - hvm - - - - - - - - - destroy - restart - restart - - /usr/bin/qemu-system-x86_64 - - - - - - - -
- - - - - - - diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-http.args b/tests/qe= muxml2argvdata/disk-cdrom-network-http.args deleted file mode 100644 index cca0c6c3be..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-http.args +++ /dev/null @@ -1,27 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/home/test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-x86_64 \ --name QEMUGuest1 \ --S \ --machine pc-1.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ --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,nowait \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --boot d \ --usb \ --drive file=3Dhttp://host.name:80/url/path/file.iso,format=3Draw,if=3Dnone= ,\ -id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-http.xml b/tests/qem= uxml2argvdata/disk-cdrom-network-http.xml deleted file mode 100644 index 0eed65672b..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-http.xml +++ /dev/null @@ -1,36 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 1048576 - 1048576 - 1 - - hvm - - - - - - - - - destroy - restart - restart - - /usr/bin/qemu-system-x86_64 - - - - - - - -
- - - - - - - diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-tftp.args b/tests/qe= muxml2argvdata/disk-cdrom-network-tftp.args deleted file mode 100644 index 8882c2c915..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-tftp.args +++ /dev/null @@ -1,27 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/home/test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-x86_64 \ --name QEMUGuest1 \ --S \ --machine pc-1.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ --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,nowait \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --boot d \ --usb \ --drive file=3Dtftp://host.name:69/url/path/file.iso,format=3Draw,if=3Dnone= ,\ -id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ --device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml b/tests/qem= uxml2argvdata/disk-cdrom-network-tftp.xml deleted file mode 100644 index 1c3b185b00..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml +++ /dev/null @@ -1,36 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 1048576 - 1048576 - 1 - - hvm - - - - - - - - - destroy - restart - restart - - /usr/bin/qemu-system-x86_64 - - - - - - - -
- - - - - - - diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-https.args b/tests/q= emuxml2argvdata/disk-cdrom-network.args similarity index 58% rename from tests/qemuxml2argvdata/disk-cdrom-network-https.args rename to tests/qemuxml2argvdata/disk-cdrom-network.args index b62186270f..6dee39e3fd 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network-https.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.args @@ -21,7 +21,16 @@ server,nowait \ -no-shutdown \ -boot d \ -usb \ +-drive file=3Dftp://host.name:21/url/path/file.iso,format=3Draw,if=3Dnone,\ +id=3Ddrive-ide0-0-0,media=3Dcdrom,readonly=3Don \ +-device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ +-drive file=3Dftps://host.name:990/url/path/file.iso,format=3Draw,if=3Dnon= e,\ +id=3Ddrive-ide0-0-1,media=3Dcdrom,readonly=3Don \ +-device ide-drive,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-= 1 \ -drive file=3Dhttps://host.name:443/url/path/file.iso,format=3Draw,if=3Dno= ne,\ id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ -device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ +-drive file=3Dtftp://host.name:69/url/path/file.iso,format=3Draw,if=3Dnone= ,\ +id=3Ddrive-ide0-1-1,media=3Dcdrom,readonly=3Don \ +-device ide-drive,bus=3Dide.1,unit=3D1,drive=3Ddrive-ide0-1-1,id=3Dide0-1-= 1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-https.xml b/tests/qe= muxml2argvdata/disk-cdrom-network.xml similarity index 52% rename from tests/qemuxml2argvdata/disk-cdrom-network-https.xml rename to tests/qemuxml2argvdata/disk-cdrom-network.xml index cd92fe44a8..0bdc0e1883 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network-https.xml +++ b/tests/qemuxml2argvdata/disk-cdrom-network.xml @@ -19,6 +19,24 @@ restart /usr/bin/qemu-system-x86_64 + + + + + + + +
+ + + + + + + + +
+ @@ -28,6 +46,15 @@
+ + + + + + + +
+ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4bf826177f..44b6245747 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -990,11 +990,7 @@ mymain(void) DO_TEST("nosharepages", QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); DO_TEST("disk-iscsi", NONE); - DO_TEST("disk-cdrom-network-http", QEMU_CAPS_KVM); - DO_TEST("disk-cdrom-network-https", QEMU_CAPS_KVM); - DO_TEST("disk-cdrom-network-ftp", QEMU_CAPS_KVM); - DO_TEST("disk-cdrom-network-ftps", QEMU_CAPS_KVM); - DO_TEST("disk-cdrom-network-tftp", QEMU_CAPS_KVM); + DO_TEST("disk-cdrom-network", QEMU_CAPS_KVM); DO_TEST("disk-cdrom-empty", NONE); DO_TEST("disk-cdrom-tray", QEMU_CAPS_VIRTIO_TX_ALG); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list