File bae185c7-tests-drop-redundant-serial.patch of Package libvirt.8586
commit bae185c77bcc686e515fff9c89ac9fab448e3503
Author: Cole Robinson <crobinso@redhat.com>
Date: Mon Jun 26 12:46:16 2017 -0400
tests: qemuxml2argv: drop redundant serial testing
Several cases have incidental <serial> or <console> XML which aren't
the features being tested for. Upcoming changes will cause some
churn here, so instead drop these bits now.
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args
@@ -28,5 +28,4 @@ server,nowait \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \
-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\
drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \
--serial pty \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x2
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.xml
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.xml
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.xml
@@ -28,12 +28,6 @@
</disk>
<controller type='scsi' index='0'/>
<controller type='pci' index='0' model='pcie-root'/>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='virtio'/>
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args
@@ -23,6 +23,5 @@ server,nowait \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--serial pty \
-device usb-tablet,id=input0,bus=usb.0,port=1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml
@@ -28,12 +28,6 @@
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
<input type='tablet' bus='usb'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
@@ -30,5 +30,4 @@ media=cdrom,id=drive-ide0-1-0,readonly=o
-device virtio-net-pci,tx=bh,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,\
addr=0x3 \
-net user,vlan=0,name=hostnet0 \
--serial pty \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml
@@ -40,12 +40,6 @@
<model type='virtio'/>
<driver name='vhost' txmode='iothread'/>
</interface>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='virtio'/>
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
@@ -30,5 +30,4 @@ media=cdrom,id=drive-ide0-1-0,readonly=o
-device virtio-net-pci,tx=bh,ioeventfd=off,vlan=0,id=net0,\
mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
-net user,vlan=0,name=hostnet0 \
--serial pty \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml
@@ -37,11 +37,5 @@
<controller type='virtio-serial' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
</controller>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
</devices>
</domain>
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
@@ -30,5 +30,4 @@ media=cdrom,id=drive-ide0-1-0,readonly=o
-device virtio-net-pci,event_idx=off,vlan=0,id=net0,mac=52:54:00:e5:48:58,\
bus=pci.0,addr=0x3 \
-net user,vlan=0,name=hostnet0 \
--serial pty \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml
@@ -40,12 +40,6 @@
<model type='virtio'/>
<driver name='vhost' event_idx='off'/>
</interface>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='virtio'/>
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
@@ -29,7 +29,6 @@ media=cdrom,id=drive-ide0-1-0,readonly=o
-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-device rtl8139,vlan=0,id=net0,mac=52:54:00:71:70:89,bus=pci.0,addr=0x7 \
-net tap,fd=3,vlan=0,name=hostnet0 \
--serial pty \
-device usb-tablet,id=input0,bus=usb.0,port=1 \
-spice port=5900,addr=127.0.0.1 \
-vga std \
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml
@@ -63,12 +63,6 @@
<script path='/etc/qemu-ifup'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
</interface>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
<input type='tablet' bus='usb'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args
@@ -40,7 +40,6 @@ id=drive-virtio-disk0 \
id=virtio-disk0 \
-drive if=none,media=cdrom,id=drive-ide0-0-0,readonly=on \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--serial pty \
-chardev socket,id=charchannel0,\
path=/var/lib/libvirt/qemu/channel/target/fedora.org.qemu.guest_agent.0,server,\
nowait \
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.xml
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.xml
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.xml
@@ -70,12 +70,6 @@
<controller type='virtio-serial' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
</controller>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
<channel type='unix'>
<source mode='bind' path='/var/lib/libvirt/qemu/channel/target/fedora.org.qemu.guest_agent.0'/>
<target type='virtio' name='org.qemu.guest_agent.0'/>
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args
@@ -25,5 +25,4 @@ server,nowait \
-initrd /media/ram/ramdisk \
-append 'root=/dev/ram rw console=ttyS0,115200' \
-usb \
--serial pty \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.xml
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.xml
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.xml
@@ -17,12 +17,6 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-ppc64</emulator>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
<memballoon model='virtio'/>
<memory model='dimm'>
<target>
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
@@ -28,5 +28,4 @@ id=virtio-disk0 \
id=virtio-disk1 \
-device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \
-net user,vlan=0,name=hostnet0 \
--serial pty \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml
+++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml
@@ -39,12 +39,6 @@
<model type='virtio'/>
<driver name='vhost' event_idx='off'/>
</interface>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='virtio'/>
Index: libvirt-3.3.0/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram.xml
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram.xml
+++ libvirt-3.3.0/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram.xml
@@ -32,12 +32,6 @@
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
<input type='tablet' bus='usb'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
Index: libvirt-3.3.0/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-copy_on_read.xml
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-copy_on_read.xml
+++ libvirt-3.3.0/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-copy_on_read.xml
@@ -45,12 +45,6 @@
<driver name='vhost' txmode='iothread'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='virtio'>
Index: libvirt-3.3.0/tests/qemuxml2xmloutdata/qemuxml2xmlout-event_idx.xml
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2xmloutdata/qemuxml2xmlout-event_idx.xml
+++ libvirt-3.3.0/tests/qemuxml2xmloutdata/qemuxml2xmlout-event_idx.xml
@@ -45,12 +45,6 @@
<driver name='vhost' event_idx='off'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='virtio'>
Index: libvirt-3.3.0/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
+++ libvirt-3.3.0/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
@@ -68,12 +68,6 @@
<model type='rtl8139'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
</interface>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
<input type='tablet' bus='usb'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
Index: libvirt-3.3.0/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-lun.xml
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-lun.xml
+++ libvirt-3.3.0/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-lun.xml
@@ -44,12 +44,6 @@
<driver name='vhost' event_idx='off'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>
- <serial type='pty'>
- <target port='0'/>
- </serial>
- <console type='pty'>
- <target type='serial' port='0'/>
- </console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='virtio'>
