[libvirt] [PATCH 01/16] Xen: tests: remove old xm config tests

Remove xm config tests for old xend 3.0.2 config format. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com&gt; --- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 26 ------------ tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 49 ---------------------- .../test-paravirt-old-pvfb-vncdisplay.cfg | 18 -------- .../test-paravirt-old-pvfb-vncdisplay.xml | 36 ---------------- tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 17 -------- tests/xmconfigdata/test-paravirt-old-pvfb.xml | 36 ---------------- tests/xmconfigtest.c | 3 -- 7 files changed, 185 deletions(-) diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg deleted file mode 100755 index 5c8b47b..0000000 --- a/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg +++ /dev/null @@ -1,26 +0,0 @@ -name = "XenGuest2" -uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" -maxmem = 579 -memory = 394 -vcpus = 1 -pae = 1 -acpi = 1 -apic = 1 -cdrom = "/root/boot.iso" -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=xenbr0,script=vif-bridge,model=e1000,type=ioemu" ] -parallel = "none" -serial = "none" -builder = "hvm" -kernel = "/usr/lib/xen/boot/hvmloader" -boot = "d" -disk = [ "phy:/dev/HostVG/XenGuest2,ioemu:hda,w" ] diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml deleted file mode 100644 index dd5fd3f..0000000 --- a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml +++ /dev/null @@ -1,49 +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='utc' adjustment='reset'/> - <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> - <interface type='bridge'> - <mac address='00:16:3e:66:92:9c'/> - <source bridge='xenbr0'/> - <script path='vif-bridge'/> - <model type='e1000'/> - </interface> - <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> - <memballoon model='xen'/> - </devices> -</domain> diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg deleted file mode 100644 index 94c01ed..0000000 --- a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg +++ /dev/null @@ -1,18 +0,0 @@ -name = "XenGuest1" -uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809" -maxmem = 579 -memory = 394 -vcpus = 1 -localtime = 0 -on_poweroff = "destroy" -on_reboot = "restart" -on_crash = "restart" -sdl = 0 -vnc = 1 -vncunused = 0 -vncdisplay = 25 -vnclisten = "127.0.0.1" -vncpasswd = "123poi" -vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ] -bootloader = "/usr/bin/pygrub" -disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ] diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml deleted file mode 100644 index ce7bfb9..0000000 --- a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml +++ /dev/null @@ -1,36 +0,0 @@ -<domain type='xen'> - <name>XenGuest1</name> - <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>592896</memory> - <currentMemory unit='KiB'>403456</currentMemory> - <vcpu placement='static'>1</vcpu> - <bootloader>/usr/bin/pygrub</bootloader> - <os> - <type arch='i686' machine='xenpv'>linux</type> - </os> - <clock offset='utc' adjustment='reset'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <disk type='block' device='disk'> - <driver name='phy'/> - <source dev='/dev/HostVG/XenGuest1'/> - <target dev='xvda' bus='xen'/> - </disk> - <interface type='bridge'> - <mac address='00:16:3e:66:94:9c'/> - <source bridge='br0'/> - <script path='vif-bridge'/> - </interface> - <console type='pty'> - <target type='xen' port='0'/> - </console> - <input type='mouse' bus='xen'/> - <input type='keyboard' bus='xen'/> - <graphics type='vnc' port='5925' autoport='no' listen='127.0.0.1' passwd='123poi'> - <listen type='address' address='127.0.0.1'/> - </graphics> - <memballoon model='xen'/> - </devices> -</domain> diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.cfg b/tests/xmconfigdata/test-paravirt-old-pvfb.cfg deleted file mode 100755 index 9f11f5b..0000000 --- a/tests/xmconfigdata/test-paravirt-old-pvfb.cfg +++ /dev/null @@ -1,17 +0,0 @@ -name = "XenGuest1" -uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809" -maxmem = 579 -memory = 394 -vcpus = 1 -localtime = 0 -on_poweroff = "destroy" -on_reboot = "restart" -on_crash = "restart" -sdl = 0 -vnc = 1 -vncunused = 1 -vnclisten = "127.0.0.1" -vncpasswd = "123poi" -vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ] -bootloader = "/usr/bin/pygrub" -disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ] diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.xml b/tests/xmconfigdata/test-paravirt-old-pvfb.xml deleted file mode 100644 index cba6dff..0000000 --- a/tests/xmconfigdata/test-paravirt-old-pvfb.xml +++ /dev/null @@ -1,36 +0,0 @@ -<domain type='xen'> - <name>XenGuest1</name> - <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>592896</memory> - <currentMemory unit='KiB'>403456</currentMemory> - <vcpu placement='static'>1</vcpu> - <bootloader>/usr/bin/pygrub</bootloader> - <os> - <type arch='i686' machine='xenpv'>linux</type> - </os> - <clock offset='utc' adjustment='reset'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <disk type='block' device='disk'> - <driver name='phy'/> - <source dev='/dev/HostVG/XenGuest1'/> - <target dev='xvda' bus='xen'/> - </disk> - <interface type='bridge'> - <mac address='00:16:3e:66:94:9c'/> - <source bridge='br0'/> - <script path='vif-bridge'/> - </interface> - <console type='pty'> - <target type='xen' port='0'/> - </console> - <input type='mouse' bus='xen'/> - <input type='keyboard' bus='xen'/> - <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> - <listen type='address' address='127.0.0.1'/> - </graphics> - <memballoon model='xen'/> - </devices> -</domain> diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 804f9ee..04535fb 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -214,14 +214,11 @@ mymain(void) DO_TEST_FORMAT(name, version); \ } while (0) - DO_TEST("paravirt-old-pvfb", 1); - DO_TEST("paravirt-old-pvfb-vncdisplay", 1); DO_TEST("paravirt-new-pvfb", 3); DO_TEST("paravirt-new-pvfb-vncdisplay", 3); DO_TEST("paravirt-net-e1000", 3); DO_TEST("paravirt-net-vifname", 3); DO_TEST("paravirt-vcpu", 2); - DO_TEST("fullvirt-old-cdrom", 1); DO_TEST("fullvirt-new-cdrom", 2); DO_TEST("fullvirt-utc", 2); DO_TEST("fullvirt-localtime", 2); -- 2.1.4