[libvirt] [PATCH 4/4] xmconfigdata: drop tests for multi serial
Bob Liu
bob.liu at oracle.com
Thu Aug 18 02:20:51 UTC 2016
xen-xm doesn't support mult serial devices at all, so these tests are
meaningless.
Signed-off-by: Bob Liu <bob.liu at oracle.com>
---
v2: Also delete the test case from xmconfigtest.
---
.../test-fullvirt-serial-dev-2-ports.cfg | 27 ---------
.../test-fullvirt-serial-dev-2-ports.xml | 65 ----------------------
.../test-fullvirt-serial-dev-2nd-port.cfg | 27 ---------
.../test-fullvirt-serial-dev-2nd-port.xml | 61 --------------------
tests/xmconfigtest.c | 2 -
5 files changed, 182 deletions(-)
delete mode 100644 tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
delete mode 100644 tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
delete mode 100644 tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
delete mode 100644 tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
deleted file mode 100644
index f4963e1..0000000
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-name = "XenGuest2"
-uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
-maxmem = 579
-memory = 394
-vcpus = 1
-pae = 1
-acpi = 1
-apic = 1
-viridian = 0
-rtc_timeoffset = 0
-localtime = 0
-on_poweroff = "destroy"
-on_reboot = "restart"
-on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
-sdl = 0
-vnc = 1
-vncunused = 1
-vnclisten = "127.0.0.1"
-vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
-parallel = "none"
-serial = [ "/dev/ttyS0", "/dev/ttyS1" ]
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
deleted file mode 100644
index 753043d..0000000
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<domain type='xen'>
- <name>XenGuest2</name>
- <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>592896</memory>
- <currentMemory unit='KiB'>403456</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='i686' machine='xenfv'>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='cdrom'/>
- </os>
- <features>
- <acpi/>
- <apic/>
- <pae/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
- <disk type='block' device='disk'>
- <driver name='phy'/>
- <source dev='/dev/HostVG/XenGuest2'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1' target='0' unit='0'/>
- </disk>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:66:92:9c'/>
- <source bridge='xenbr1'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <serial type='dev'>
- <source path='/dev/ttyS0'/>
- <target port='0'/>
- </serial>
- <serial type='dev'>
- <source path='/dev/ttyS1'/>
- <target port='1'/>
- </serial>
- <console type='dev'>
- <source path='/dev/ttyS0'/>
- <target type='serial' port='0'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
- <listen type='address' address='127.0.0.1'/>
- </graphics>
- <video>
- <model type='cirrus' vram='16384' heads='1' primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
deleted file mode 100644
index 2dc3258..0000000
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-name = "XenGuest2"
-uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
-maxmem = 579
-memory = 394
-vcpus = 1
-pae = 1
-acpi = 1
-apic = 1
-viridian = 0
-rtc_timeoffset = 0
-localtime = 0
-on_poweroff = "destroy"
-on_reboot = "restart"
-on_crash = "restart"
-device_model = "/usr/lib/xen/bin/qemu-dm"
-sdl = 0
-vnc = 1
-vncunused = 1
-vnclisten = "127.0.0.1"
-vncpasswd = "123poi"
-vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
-parallel = "none"
-serial = [ "none", "/dev/ttyS1" ]
-builder = "hvm"
-kernel = "/usr/lib/xen/boot/hvmloader"
-boot = "d"
-disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ]
diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
deleted file mode 100644
index a104c6f..0000000
--- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<domain type='xen'>
- <name>XenGuest2</name>
- <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>592896</memory>
- <currentMemory unit='KiB'>403456</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='i686' machine='xenfv'>hvm</type>
- <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
- <boot dev='cdrom'/>
- </os>
- <features>
- <acpi/>
- <apic/>
- <pae/>
- </features>
- <clock offset='variable' adjustment='0' basis='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>restart</on_crash>
- <devices>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
- <disk type='block' device='disk'>
- <driver name='phy'/>
- <source dev='/dev/HostVG/XenGuest2'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='file'/>
- <source file='/root/boot.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1' target='0' unit='0'/>
- </disk>
- <controller type='ide' index='0'/>
- <interface type='bridge'>
- <mac address='00:16:3e:66:92:9c'/>
- <source bridge='xenbr1'/>
- <script path='vif-bridge'/>
- <model type='e1000'/>
- </interface>
- <serial type='dev'>
- <source path='/dev/ttyS1'/>
- <target port='1'/>
- </serial>
- <console type='dev'>
- <source path='/dev/ttyS1'/>
- <target type='serial' port='1'/>
- </console>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
- <listen type='address' address='127.0.0.1'/>
- </graphics>
- <video>
- <model type='cirrus' vram='16384' heads='1' primary='yes'/>
- </video>
- <memballoon model='xen'/>
- </devices>
-</domain>
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index 7032d43..96990ee 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -222,8 +222,6 @@ mymain(void)
DO_TEST("fullvirt-usbtablet");
DO_TEST("fullvirt-usbmouse");
DO_TEST("fullvirt-serial-file");
- DO_TEST("fullvirt-serial-dev-2-ports");
- DO_TEST("fullvirt-serial-dev-2nd-port");
DO_TEST("fullvirt-serial-null");
DO_TEST("fullvirt-serial-pipe");
DO_TEST("fullvirt-serial-pty");
--
2.6.5
More information about the libvir-list
mailing list