From: Jim Fehlig <jfehlig@suse.com>
Date: Mon, 14 Dec 2015 21:24:56 +0000 (-0700)
Subject: Xen: tests: remove net-ioemu xm config test
X-Git-Tag: v1.3.1-rc1~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f281926e1d263030297b01668ecba55269a1a478;p=thirdparty%2Flibvirt.git

Xen: tests: remove net-ioemu xm config test

Remove the fullvirt-net-ioemu test since explicitly specifying
'type=ioemu' has not been needed in xm/xend for a long time. It is
not used at all in xl/libxl.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
---

diff --git a/tests/xmconfigdata/test-fullvirt-net-ioemu.cfg b/tests/xmconfigdata/test-fullvirt-net-ioemu.cfg
deleted file mode 100644
index 722f02148d..0000000000
--- a/tests/xmconfigdata/test-fullvirt-net-ioemu.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-name = "XenGuest2"
-uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
-maxmem = 579
-memory = 394
-vcpus = 1
-pae = 1
-acpi = 1
-apic = 1
-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,type=ioemu" ]
-parallel = "none"
-serial = "none"
-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-net-ioemu.xml b/tests/xmconfigdata/test-fullvirt-net-ioemu.xml
deleted file mode 100644
index ad15ddef8a..0000000000
--- a/tests/xmconfigdata/test-fullvirt-net-ioemu.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='xenbr1'/>
-      <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/xmconfigtest.c b/tests/xmconfigtest.c
index 04535fbacb..bfbd9c4e61 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -243,7 +243,6 @@ mymain(void)
 
     DO_TEST("fullvirt-sound", 2);
 
-    DO_TEST("fullvirt-net-ioemu", 2);
     DO_TEST("fullvirt-net-netfront", 2);
 
     DO_TEST_FORMAT("fullvirt-default-feature", 2);