From ccc0da3e5173a6cc4b0a7244f80db1c17c83ccf0 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 21 Apr 2015 19:37:01 -0400
Subject: [PATCH] tests: Add specific VM for virtxml tests

Decouple it from test-many-devices which is really about manual testing
of virt-manager UI. It's annoying that every time test-many-devices is
extended we need to regenerate all the virtxml tests.
---
 .../compare/virt-xml-add-disk-basic.xml       |   2 +-
 .../virt-xml-add-disk-create-storage.xml      |   4 +-
 .../compare/virt-xml-add-disk-notarget.xml    |   4 +-
 .../compare/virt-xml-add-host-device.xml      |   2 +-
 .../compare/virt-xml-add-sound.xml            |   2 +-
 .../compare/virt-xml-edit-all.xml             |  24 +-
 .../compare/virt-xml-edit-clear-clock.xml     |   2 +-
 .../compare/virt-xml-edit-clear-cpu.xml       |   2 +-
 .../compare/virt-xml-edit-neg-num.xml         |   2 +-
 .../compare/virt-xml-edit-pos-num.xml         |   4 +-
 .../virt-xml-edit-select-disk-path.xml        |   6 +-
 .../virt-xml-edit-select-disk-target.xml      |   4 +-
 .../virt-xml-edit-select-network-mac.xml      |   6 +-
 .../virt-xml-edit-select-sound-model.xml      |   4 +-
 .../virt-xml-edit-simple-blkiotune.xml        |   2 +-
 .../compare/virt-xml-edit-simple-boot.xml     |   2 +-
 .../compare/virt-xml-edit-simple-channel.xml  |   4 +-
 .../compare/virt-xml-edit-simple-clock.xml    |   2 +-
 .../compare/virt-xml-edit-simple-console.xml  |   8 +-
 .../virt-xml-edit-simple-controller.xml       |   8 +-
 .../compare/virt-xml-edit-simple-cpu.xml      |   2 +-
 .../virt-xml-edit-simple-disk-remove-path.xml |   2 +-
 .../compare/virt-xml-edit-simple-disk.xml     |   6 +-
 .../compare/virt-xml-edit-simple-events.xml   |   2 +-
 .../compare/virt-xml-edit-simple-features.xml |   2 +-
 .../virt-xml-edit-simple-filesystem.xml       |   8 +-
 .../compare/virt-xml-edit-simple-graphics.xml |   8 +-
 .../virt-xml-edit-simple-host-device.xml      |   7 +-
 .../compare/virt-xml-edit-simple-idmap.xml    |   2 +-
 .../virt-xml-edit-simple-memballoon.xml       |   6 +-
 .../compare/virt-xml-edit-simple-memory.xml   |   6 +-
 .../compare/virt-xml-edit-simple-metadata.xml |   5 +-
 .../compare/virt-xml-edit-simple-network.xml  |   6 +-
 .../compare/virt-xml-edit-simple-numatune.xml |   2 +-
 .../compare/virt-xml-edit-simple-parallel.xml |   8 +-
 .../compare/virt-xml-edit-simple-pm.xml       |   2 +-
 .../compare/virt-xml-edit-simple-redirdev.xml |   6 +-
 .../compare/virt-xml-edit-simple-rng.xml      |   2 +-
 .../compare/virt-xml-edit-simple-security.xml |   2 +-
 .../compare/virt-xml-edit-simple-serial.xml   |   8 +-
 .../virt-xml-edit-simple-smartcard.xml        |   8 +-
 .../compare/virt-xml-edit-simple-soundhw.xml  |   8 +-
 .../compare/virt-xml-edit-simple-tpm.xml      |   4 +-
 .../compare/virt-xml-edit-simple-vcpus.xml    |   2 +-
 .../compare/virt-xml-edit-simple-video.xml    |   2 +-
 .../compare/virt-xml-edit-simple-watchdog.xml |   8 +-
 .../compare/virt-xml-remove-disk-index.xml    |  12 +-
 .../compare/virt-xml-remove-disk-path.xml     |  19 +-
 .../compare/virt-xml-remove-hostdev-name.xml  |  16 +-
 .../compare/virt-xml-remove-sound-model.xml   |   4 +-
 .../compare/virt-xml-remove-video-all.xml     |   2 +-
 tests/clitest.py                              |  20 +-
 tests/testdriver.xml                          | 207 +++++++++++++++++-
 .../vmx2libvirt_test-vmx-zip.libvirt          |   8 +-
 54 files changed, 335 insertions(+), 171 deletions(-)

diff --git a/tests/cli-test-xml/compare/virt-xml-add-disk-basic.xml b/tests/cli-test-xml/compare/virt-xml-add-disk-basic.xml
index 2a1ae8412..2967c89cc 100644
--- a/tests/cli-test-xml/compare/virt-xml-add-disk-basic.xml
+++ b/tests/cli-test-xml/compare/virt-xml-add-disk-basic.xml
@@ -8,5 +8,5 @@
    </devices>
  </domain>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-add-disk-create-storage.xml b/tests/cli-test-xml/compare/virt-xml-add-disk-create-storage.xml
index a72c14bef..3ab7ba5d5 100644
--- a/tests/cli-test-xml/compare/virt-xml-add-disk-create-storage.xml
+++ b/tests/cli-test-xml/compare/virt-xml-add-disk-create-storage.xml
@@ -3,10 +3,10 @@
      </panic>
 +    <disk type="file" device="disk">
 +      <source file="/dev/default-pool/new1.img"/>
-+      <target dev="vdaf"/>
++      <target dev="sdb"/>
 +    </disk>
    </devices>
  </domain>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-add-disk-notarget.xml b/tests/cli-test-xml/compare/virt-xml-add-disk-notarget.xml
index 148a1283b..34daa6436 100644
--- a/tests/cli-test-xml/compare/virt-xml-add-disk-notarget.xml
+++ b/tests/cli-test-xml/compare/virt-xml-add-disk-notarget.xml
@@ -3,10 +3,10 @@
      </panic>
 +    <disk type="file" device="disk">
 +      <source file="/dev/default-pool/testvol1.img"/>
-+      <target dev="vdaf"/>
++      <target dev="sdb"/>
 +    </disk>
    </devices>
  </domain>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-add-host-device.xml b/tests/cli-test-xml/compare/virt-xml-add-host-device.xml
index 8a44f207b..1e0cd4f40 100644
--- a/tests/cli-test-xml/compare/virt-xml-add-host-device.xml
+++ b/tests/cli-test-xml/compare/virt-xml-add-host-device.xml
@@ -9,5 +9,5 @@
    </devices>
  </domain>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-add-sound.xml b/tests/cli-test-xml/compare/virt-xml-add-sound.xml
index 320971d90..b92adeb0b 100644
--- a/tests/cli-test-xml/compare/virt-xml-add-sound.xml
+++ b/tests/cli-test-xml/compare/virt-xml-add-sound.xml
@@ -5,5 +5,5 @@
    </devices>
  </domain>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-all.xml b/tests/cli-test-xml/compare/virt-xml-edit-all.xml
index acbb5a7f0..d7bd071ee 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-all.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-all.xml
@@ -1,13 +1,6 @@
          <vendor id="0x04b3"/>
          <product id="0x4485"/>
        </source>
-+      <driver name="vfio"/>
-     </hostdev>
-     <hostdev mode="subsystem" type="usb" managed="yes">
-       <source>
-         <address bus="3" device="2"/>
-       </source>
-       <boot order="9"/>
 +      <driver name="vfio"/>
      </hostdev>
      <hostdev mode="subsystem" type="pci" managed="yes">
@@ -15,25 +8,10 @@
          <address domain="0x0000" bus="0x00" slot="0x19" function="0x0"/>
        </source>
        <rom bar="off"/>
-+      <driver name="vfio"/>
-     </hostdev>
-     <hostdev mode="subsystem" type="pci" managed="yes">
-       <source>
-         <address domain="0x0003" bus="0x00" slot="0x19" function="0x0"/>
-       </source>
-       <boot order="6"/>
-+      <driver name="vfio"/>
-     </hostdev>
-     <hostdev mode="subsystem" type="scsi" managed="no">
-       <source>
-@@
-         <address bus="0" target="0" unit="0"/>
-       </source>
-       <address type="drive" controller="0" bus="0" target="0" unit="0"/>
 +      <driver name="vfio"/>
      </hostdev>
      <redirdev bus="usb" type="tcp">
        <source mode="connect" host="localhost" service="4000"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-clear-clock.xml b/tests/cli-test-xml/compare/virt-xml-edit-clear-clock.xml
index 6a613cf49..76283b9f7 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-clear-clock.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-clear-clock.xml
@@ -16,5 +16,5 @@
 +  <clock offset="utc"/>
  </domain>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-clear-cpu.xml b/tests/cli-test-xml/compare/virt-xml-edit-clear-cpu.xml
index cb39731b4..5ae932888 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-clear-cpu.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-clear-cpu.xml
@@ -28,5 +28,5 @@
 +  <cpu mode="host-passthrough"/>
  </domain>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml b/tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml
index 6b8435506..f78ab8bdc 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-neg-num.xml
@@ -7,5 +7,5 @@
      <hostdev mode="subsystem" type="usb" managed="yes">
        <source>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml b/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml
index d5e15bfb2..16e05b572 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-pos-num.xml
@@ -1,4 +1,4 @@
-     </graphics>
+     <graphics type="vnc" port="-1" autoport="yes"/>
      <sound model="sb16"/>
      <sound model="es1370"/>
 -    <sound model="ich6"/>
@@ -7,5 +7,5 @@
        <model type="vmvga" vram="16384" heads="1"/>
      </video>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-select-disk-path.xml b/tests/cli-test-xml/compare/virt-xml-edit-select-disk-path.xml
index 1fe58cde9..b656649c8 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-select-disk-path.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-select-disk-path.xml
@@ -6,8 +6,8 @@
        <address type="drive" controller="9" bus="0" target="0" unit="0"/>
 +      <readonly/>
      </disk>
-     <disk type="block" device="cdrom">
-       <target dev="sdb" bus="scsi"/>
+     <controller type="scsi" index="0"/>
+     <controller type="scsi" index="1"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-select-disk-target.xml b/tests/cli-test-xml/compare/virt-xml-edit-select-disk-target.xml
index e4778ee26..1cb969f20 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-select-disk-target.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-select-disk-target.xml
@@ -1,4 +1,4 @@
-       <address type="drive" controller="0" bus="0" target="0" unit="1"/>
+       <address type="drive" controller="0" bus="0" target="0" unit="0"/>
      </disk>
      <disk type="file" device="disk">
 -      <source file="/tmp/foobar"/>
@@ -7,5 +7,5 @@
        <iotune>
          <read_bytes_sec>5242880</read_bytes_sec>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-select-network-mac.xml b/tests/cli-test-xml/compare/virt-xml-edit-select-network-mac.xml
index d109bfe4f..bdfd28678 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-select-network-mac.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-select-network-mac.xml
@@ -4,8 +4,8 @@
 -      <target dev="nic02"/>
 +      <target dev="nic55"/>
      </interface>
-     <interface type="direct">
-       <mac address="f0:11:22:33:44:5f"/>
+     <smartcard mode="host">
+       <address type="ccid" controller="0" slot="0"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml b/tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml
index d5e15bfb2..16e05b572 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-select-sound-model.xml
@@ -1,4 +1,4 @@
-     </graphics>
+     <graphics type="vnc" port="-1" autoport="yes"/>
      <sound model="sb16"/>
      <sound model="es1370"/>
 -    <sound model="ich6"/>
@@ -7,5 +7,5 @@
        <model type="vmvga" vram="16384" heads="1"/>
      </video>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-blkiotune.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-blkiotune.xml
index 1b1c6b971..00aeea3f8 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-blkiotune.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-blkiotune.xml
@@ -12,5 +12,5 @@
    </blkiotune>
    <memoryBacking>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml
index f8e073940..bf947b6c8 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-boot.xml
@@ -9,5 +9,5 @@
    <idmap>
      <uid start="0" target="1000" count="10"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-channel.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-channel.xml
index 187d483b3..2935216b0 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-channel.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-channel.xml
@@ -1,5 +1,5 @@
      <console type="pty">
-       <target type="uml" port="1"/>
+       <target type="virtio" port="0"/>
      </console>
 -    <channel type="pipe">
 +    <channel type="null">
@@ -7,5 +7,5 @@
        <target type="guestfwd" address="10.0.2.1" port="4600"/>
      </channel>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-clock.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-clock.xml
index 8d17555bd..a75201ff3 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-clock.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-clock.xml
@@ -13,5 +13,5 @@
    <on_poweroff>destroy</on_poweroff>
    <on_reboot>restart</on_reboot>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-console.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-console.xml
index 4e1343270..7bf3a198f 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-console.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-console.xml
@@ -1,11 +1,11 @@
-       <target port="2"/>
+       <target port="0"/>
      </parallel>
      <console type="pty">
 -      <target type="virtio" port="0"/>
 +      <target type="serial" port="0"/>
      </console>
-     <console type="pty">
-       <target type="uml" port="1"/>
+     <channel type="pipe">
+       <source path="/tmp/guestfwd"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-controller.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-controller.xml
index c4507955c..7d27f21fe 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-controller.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-controller.xml
@@ -1,11 +1,11 @@
-       <source file="/tmp/foobar4"/>
-       <target dev="xvdc" bus="xen"/>
+       <boot order="1"/>
+       <address type="drive" controller="9" bus="0" target="0" unit="0"/>
      </disk>
--    <controller type="scsi" index="0" model="virtio-scsi"/>
+-    <controller type="scsi" index="0"/>
 +    <controller type="scsi" index="15" model="lsilogic"/>
      <controller type="scsi" index="1"/>
      <controller type="scsi" index="2"/>
      <controller type="scsi" index="3"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-cpu.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-cpu.xml
index 48d250e38..1cdce0fc3 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-cpu.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-cpu.xml
@@ -18,5 +18,5 @@
    <clock offset="utc">
      <timer name="rtc" tickpolicy="catchup"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-disk-remove-path.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-disk-remove-path.xml
index 421d6b1ec..d2808aedf 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-disk-remove-path.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-disk-remove-path.xml
@@ -6,5 +6,5 @@
        <boot order="5"/>
        <address type="drive" controller="0" bus="0" target="0" unit="0"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-disk.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-disk.xml
index 25c38faf4..74ab7900b 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-disk.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-disk.xml
@@ -8,8 +8,8 @@
        <address type="drive" controller="0" bus="0" target="0" unit="0"/>
 +      <readonly/>
      </disk>
-     <disk type="dir" device="floppy">
-       <source dir="/tmp"/>
+     <disk type="file" device="disk">
+       <source file="/tmp/foobar"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-events.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-events.xml
index 8ca96c875..6e9b82d1c 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-events.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-events.xml
@@ -7,5 +7,5 @@
      <suspend-to-mem enabled="no"/>
    </pm>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-features.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-features.xml
index 039dca299..b9487a989 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-features.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-features.xml
@@ -11,5 +11,5 @@
        <spinlocks state="on" retries="12287"/>
      </hyperv>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-filesystem.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-filesystem.xml
index 6bb242702..e1936da4d 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-filesystem.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-filesystem.xml
@@ -1,5 +1,5 @@
+     <controller type="ide" index="0"/>
      <controller type="virtio-serial" index="0"/>
-     <controller type="virtio-serial" index="1"/>
      <controller type="ccid" index="0"/>
 -    <filesystem type="mount" accessmode="passthrough">
 +    <filesystem type="mount" accessmode="mapped">
@@ -9,8 +9,8 @@
 +      <source dir="/1/2/3"/>
 +      <target dir="/4/5/6"/>
      </filesystem>
-     <filesystem type="template" accessmode="passthrough">
-       <source name="template_fedora"/>
+     <interface type="network">
+       <mac address="22:22:33:54:32:10"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-graphics.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-graphics.xml
index 408fda7f0..6f75e296d 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-graphics.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-graphics.xml
@@ -3,9 +3,9 @@
      <input type="keyboard" bus="ps2"/>
 -    <graphics type="vnc" port="-1" autoport="yes"/>
 +    <graphics type="vnc" port="-1" tlsPort="5902" keymap="ja"/>
-     <graphics type="vnc" port="-1" autoport="yes"/>
-     <graphics type="vnc" port="-1" autoport="yes" listen="1.2.3.4" keymap="fi">
-       <listen type="address" address="1.2.3.4"/>
+     <sound model="sb16"/>
+     <sound model="es1370"/>
+     <sound model="ich6"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-host-device.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-host-device.xml
index 904916609..6e16098d8 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-host-device.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-host-device.xml
@@ -3,14 +3,13 @@
        <source>
 -        <vendor id="0x04b3"/>
 -        <product id="0x4485"/>
--      </source>
 +        <vendor id="0x0781"/>
 +        <product id="0x5151"/>
-+      </source>
+       </source>
 +      <driver name="vfio"/>
      </hostdev>
-     <hostdev mode="subsystem" type="usb" managed="yes">
+     <hostdev mode="subsystem" type="pci" managed="yes">
        <source>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml
index d2e35bc94..b2c15a305 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-idmap.xml
@@ -9,5 +9,5 @@
    <features>
      <acpi/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-memballoon.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-memballoon.xml
index 91b4057c2..19587d150 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-memballoon.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-memballoon.xml
@@ -1,5 +1,5 @@
-       <usbdev allow="no"/>
-     </redirfilter>
+       <protocol type="raw"/>
+     </redirdev>
      <watchdog model="ib700" action="poweroff"/>
 -    <memballoon model="virtio"/>
 +    <memballoon model="none"/>
@@ -7,5 +7,5 @@
        <rate bytes="1234" period="2000"/>
        <backend model="egd" type="tcp">
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-memory.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-memory.xml
index 9e0430ce3..2529aa090 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-memory.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-memory.xml
@@ -1,5 +1,5 @@
-   <description>Foo bar baz &amp;
-     yeah boii &lt; &gt; yeahfoo
+   <uuid>12345678-12f4-1234-1234-123456789012</uuid>
+   <description>Test VM for virtxml cli tests
    </description>
 -  <memory unit="KiB">409600</memory>
 -  <currentMemory unit="KiB">204800</currentMemory>
@@ -17,5 +17,5 @@
    <vcpu placement="static" cpuset="1-2,5-9,11,13-14">9</vcpu>
    <numatune>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-metadata.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-metadata.xml
index d4fe5e933..e4db75b85 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-metadata.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-metadata.xml
@@ -1,8 +1,7 @@
  <domain type="test">
--  <name>test-many-devices</name>
+-  <name>test-for-virtxml</name>
 -  <uuid>12345678-12f4-1234-1234-123456789012</uuid>
--  <description>Foo bar baz &amp;
--    yeah boii &lt; &gt; yeahfoo
+-  <description>Test VM for virtxml cli tests
 -  </description>
 +  <name>foo-my-new-name</name>
 +  <uuid>12345678-12F4-1234-1234-123456789AFA</uuid>
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-network.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-network.xml
index 632f9c320..946497606 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-network.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-network.xml
@@ -10,8 +10,8 @@
 -      <model type="e1000"/>
 +      <model type="virtio"/>
      </interface>
-     <interface type="network">
-       <mac address="22:11:11:11:11:11"/>
+     <interface type="bridge">
+       <mac address="22:00:00:44:aa:bf"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-numatune.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-numatune.xml
index 1fc370258..dd7138c79 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-numatune.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-numatune.xml
@@ -7,5 +7,5 @@
    <os>
      <type arch="i686">hvm</type>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-parallel.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-parallel.xml
index 83559a945..ca2c81174 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-parallel.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-parallel.xml
@@ -1,5 +1,5 @@
-       <protocol type="telnet"/>
-       <target port="1"/>
+     <serial type="null">
+       <target port="0"/>
      </serial>
 -    <parallel type="file">
 -      <source path="/tmp/foo.log"/>
@@ -7,7 +7,7 @@
 +      <source path="/some/other/log"/>
        <target port="0"/>
      </parallel>
-     <parallel type="unix">
+     <console type="pty">
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-pm.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-pm.xml
index cc0c12eec..ee06581df 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-pm.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-pm.xml
@@ -8,5 +8,5 @@
    <devices>
      <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-redirdev.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-redirdev.xml
index ffc264995..e665cca19 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-redirdev.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-redirdev.xml
@@ -1,5 +1,5 @@
        </source>
-       <address type="drive" controller="0" bus="0" target="0" unit="0"/>
+       <rom bar="off"/>
      </hostdev>
 -    <redirdev bus="usb" type="tcp">
 -      <source mode="connect" host="localhost" service="4000"/>
@@ -7,7 +7,7 @@
 +      <source mode="connect" host="example.com" service="12345"/>
        <protocol type="raw"/>
      </redirdev>
-     <redirdev bus="usb" type="spicevmc">
+     <watchdog model="ib700" action="poweroff"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-rng.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-rng.xml
index bd4d93e9b..8f1563673 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-rng.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-rng.xml
@@ -7,5 +7,5 @@
          <source mode="connect" host="1.2.3.4" service="1234"/>
          <protocol type="raw"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-security.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-security.xml
index d10798097..7cf09c5bc 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-security.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-security.xml
@@ -6,5 +6,5 @@
 +  </seclabel>
  </domain>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-serial.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-serial.xml
index 87e959f16..811a532a6 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-serial.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-serial.xml
@@ -1,11 +1,11 @@
-       <protocol type="raw"/>
-       <address type="ccid" controller="0" slot="3"/>
+     <smartcard mode="host">
+       <address type="ccid" controller="0" slot="0"/>
      </smartcard>
 -    <serial type="null">
 +    <serial type="pty">
        <target port="0"/>
      </serial>
-     <serial type="tcp">
+     <parallel type="file">
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-smartcard.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-smartcard.xml
index 900af969d..84eed904f 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-smartcard.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-smartcard.xml
@@ -1,11 +1,11 @@
-       <boot order="3"/>
-       <address type="pci" domain="0x0000" bus="0x00" slot="0x07" function="0x0"/>
+       <script path="/etc/qemu-ifup"/>
+       <target dev="nic02"/>
      </interface>
 -    <smartcard mode="host">
 +    <smartcard mode="host" type="spicevmc">
        <address type="ccid" controller="0" slot="0"/>
      </smartcard>
-     <smartcard mode="host-certificates">
+     <serial type="null">
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-soundhw.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-soundhw.xml
index 1c808b541..c48215d48 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-soundhw.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-soundhw.xml
@@ -1,11 +1,11 @@
-       <channel name="inputs" mode="secure"/>
-       <channel name="record" mode="insecure"/>
-     </graphics>
+     <input type="mouse" bus="ps2"/>
+     <input type="keyboard" bus="ps2"/>
+     <graphics type="vnc" port="-1" autoport="yes"/>
 -    <sound model="sb16"/>
 +    <sound model="pcspk"/>
      <sound model="es1370"/>
      <sound model="ich6"/>
      <video>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-tpm.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-tpm.xml
index b235f9b8a..92266df0d 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-tpm.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-tpm.xml
@@ -1,4 +1,4 @@
-     <input type="keyboard" bus="usb"/>
+     </channel>
      <tpm model="tpm-tis">
        <backend type="passthrough">
 -        <device path="/dev/tzz"/>
@@ -7,5 +7,5 @@
      </tpm>
      <input type="mouse" bus="ps2"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-vcpus.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-vcpus.xml
index d24ef9fa6..b7037b76a 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-vcpus.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-vcpus.xml
@@ -15,5 +15,5 @@
    <clock offset="utc">
      <timer name="rtc" tickpolicy="catchup"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml
index f70c7da4d..a93454392 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-video.xml
@@ -7,5 +7,5 @@
      <video>
        <model type="cirrus" vram="16384" heads="3"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-simple-watchdog.xml b/tests/cli-test-xml/compare/virt-xml-edit-simple-watchdog.xml
index d37771c23..6d65d758a 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-simple-watchdog.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-simple-watchdog.xml
@@ -1,11 +1,11 @@
-       <usbdev class="0x08" vendor="0x15E1" product="0x2007" version="1.10" allow="yes"/>
-       <usbdev allow="no"/>
-     </redirfilter>
+       <source mode="connect" host="localhost" service="4000"/>
+       <protocol type="raw"/>
+     </redirdev>
 -    <watchdog model="ib700" action="poweroff"/>
 +    <watchdog model="ib700" action="reset"/>
      <memballoon model="virtio"/>
      <rng model="virtio">
        <rate bytes="1234" period="2000"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-disk-index.xml b/tests/cli-test-xml/compare/virt-xml-remove-disk-index.xml
index 5401edce4..48b786544 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-disk-index.xml
+++ b/tests/cli-test-xml/compare/virt-xml-remove-disk-index.xml
@@ -1,6 +1,6 @@
-       <source dev="/dev/null"/>
-       <target dev="hdc" bus="ide"/>
-       <address type="drive" controller="0" bus="1" target="0" unit="0"/>
+         <total_iops_sec>50</total_iops_sec>
+       </iotune>
+       <address type="drive" controller="0" bus="0" target="0" unit="0"/>
 -    </disk>
 -    <disk type="file" device="disk">
 -      <driver name="qemu" type="qcow2" cache="none"/>
@@ -10,8 +10,8 @@
 -      <boot order="1"/>
 -      <address type="drive" controller="9" bus="0" target="0" unit="0"/>
      </disk>
-     <disk type="block" device="cdrom">
-       <target dev="sdb" bus="scsi"/>
+     <controller type="scsi" index="0"/>
+     <controller type="scsi" index="1"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-disk-path.xml b/tests/cli-test-xml/compare/virt-xml-remove-disk-path.xml
index 1e7b5d1ab..7757e6915 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-disk-path.xml
+++ b/tests/cli-test-xml/compare/virt-xml-remove-disk-path.xml
@@ -7,22 +7,9 @@
 -      <boot order="5"/>
 -      <address type="drive" controller="0" bus="0" target="0" unit="0"/>
 -    </disk>
-     <disk type="dir" device="floppy">
-       <source dir="/tmp"/>
-       <target dev="fdb" bus="fdc"/>
-@@
-       <target dev="hdb" bus="ide"/>
-       <readonly/>
-       <address type="drive" controller="0" bus="0" target="0" unit="1"/>
--    </disk>
--    <disk type="block" device="disk">
--      <driver type="raw" cache="none"/>
--      <source dev="/dev/null"/>
--      <target dev="hdc" bus="ide"/>
--      <address type="drive" controller="0" bus="1" target="0" unit="0"/>
-     </disk>
      <disk type="file" device="disk">
-       <driver name="qemu" type="qcow2" cache="none"/>
+       <source file="/tmp/foobar"/>
+       <target dev="hda" bus="ide"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-hostdev-name.xml b/tests/cli-test-xml/compare/virt-xml-remove-hostdev-name.xml
index 247b84bb9..0764d85b5 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-hostdev-name.xml
+++ b/tests/cli-test-xml/compare/virt-xml-remove-hostdev-name.xml
@@ -1,15 +1,15 @@
+     <video>
+       <model type="cirrus" vram="16384" heads="3"/>
      </video>
-     <hostdev mode="subsystem" type="usb" managed="yes">
-       <source>
+-    <hostdev mode="subsystem" type="usb" managed="yes">
+-      <source>
 -        <vendor id="0x04b3"/>
 -        <product id="0x4485"/>
 -      </source>
 -    </hostdev>
--    <hostdev mode="subsystem" type="usb" managed="yes">
--      <source>
-         <address bus="3" device="2"/>
-       </source>
-       <boot order="9"/>
+     <hostdev mode="subsystem" type="pci" managed="yes">
+       <source>
+         <address domain="0x0000" bus="0x00" slot="0x19" function="0x0"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml b/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml
index 28fbe2603..b48818854 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml
+++ b/tests/cli-test-xml/compare/virt-xml-remove-sound-model.xml
@@ -1,4 +1,4 @@
-     </graphics>
+     <graphics type="vnc" port="-1" autoport="yes"/>
      <sound model="sb16"/>
      <sound model="es1370"/>
 -    <sound model="ich6"/>
@@ -6,5 +6,5 @@
        <model type="vmvga" vram="16384" heads="1"/>
      </video>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/cli-test-xml/compare/virt-xml-remove-video-all.xml b/tests/cli-test-xml/compare/virt-xml-remove-video-all.xml
index 866fc143f..420789663 100644
--- a/tests/cli-test-xml/compare/virt-xml-remove-video-all.xml
+++ b/tests/cli-test-xml/compare/virt-xml-remove-video-all.xml
@@ -11,5 +11,5 @@
        <source>
          <vendor id="0x04b3"/>
 
-Domain 'test-many-devices' defined successfully.
+Domain 'test-for-virtxml' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
diff --git a/tests/clitest.py b/tests/clitest.py
index 0d9452f98..3f48c4c07 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -849,10 +849,10 @@ c.add_invalid("test --edit --hostdev driver_name=vfio")  # Guest has no hostdev
 c.add_invalid("test --edit --cpu host-passthrough --boot hd,network")  # Specified more than 1 option
 c.add_invalid("test --edit")  # specified no edit option
 c.add_invalid("test --edit 2 --cpu host-passthrough")  # specifing --edit number where it doesn't make sense
-c.add_invalid("test-many-devices --edit 5 --tpm /dev/tpm")  # device edit out of range
-c.add_invalid("test-many-devices --add-device --host-device 0x0781:0x5151 --update")  # test driver doesn't support attachdevice...
-c.add_invalid("test-many-devices --remove-device --host-device 1 --update")  # test driver doesn't support detachdevice...
-c.add_invalid("test-many-devices --edit --graphics password=foo --update")  # test driver doesn't support updatdevice...
+c.add_invalid("test-for-virtxml --edit 5 --tpm /dev/tpm")  # device edit out of range
+c.add_invalid("test-for-virtxml --add-device --host-device 0x0781:0x5151 --update")  # test driver doesn't support attachdevice...
+c.add_invalid("test-for-virtxml --remove-device --host-device 1 --update")  # test driver doesn't support detachdevice...
+c.add_invalid("test-for-virtxml --edit --graphics password=foo --update")  # test driver doesn't support updatdevice...
 c.add_invalid("--build-xml --memory 10,maxmemory=20")  # building XML for option that doesn't support it
 c.add_compare("test --print-xml --edit --vcpus 7", "print-xml")  # test --print-xml
 c.add_compare("--edit --cpu host-passthrough", "stdin-edit", input_file=(xmldir + "/virtxml-stdin-edit.xml"))  # stdin test
@@ -863,7 +863,7 @@ c.add_compare("--build-xml --idmap uid_start=0,uid_target=1000,uid_count=10,gid_
 c.add_compare("test --edit --boot network,cdrom", "edit-bootorder")
 
 
-c = vixml.add_category("simple edit diff", "test-many-devices --edit --print-diff --define", compare_check=support.SUPPORT_CONN_INPUT_KEYBOARD)
+c = vixml.add_category("simple edit diff", "test-for-virtxml --edit --print-diff --define", compare_check=support.SUPPORT_CONN_INPUT_KEYBOARD)
 c.add_compare("""--metadata name=foo-my-new-name,uuid=12345678-12F4-1234-1234-123456789AFA,description="hey this is my
 new
 very,very=new desc\\\'",title="This is my,funky=new title" """, "edit-simple-metadata")
@@ -899,7 +899,7 @@ c.add_compare("--video cirrus", "edit-simple-video", compare_check=support.SUPPO
 c.add_compare("--sound pcspk", "edit-simple-soundhw")
 c.add_compare("--host-device 0x0781:0x5151,driver_name=vfio", "edit-simple-host-device")
 
-c = vixml.add_category("edit selection", "test-many-devices --print-diff --define", compare_check=support.SUPPORT_CONN_INPUT_KEYBOARD)
+c = vixml.add_category("edit selection", "test-for-virtxml --print-diff --define", compare_check=support.SUPPORT_CONN_INPUT_KEYBOARD)
 c.add_invalid("--edit target=vvv --disk /dev/null")  # no match found
 c.add_compare("--edit 3 --sound pcspk", "edit-pos-num", compare_check=support.SUPPORT_CONN_VIDEO_NEW_RAM_OUTPUT)
 c.add_compare("--edit -1 --video qxl", "edit-neg-num", compare_check=support.SUPPORT_CONN_VIDEO_NEW_RAM_OUTPUT)
@@ -909,13 +909,13 @@ c.add_compare("--edit target=hda --disk /dev/null", "edit-select-disk-target")
 c.add_compare("--edit /tmp/foobar2 --disk shareable=off,readonly=on", "edit-select-disk-path")
 c.add_compare("--edit mac=00:11:7f:33:44:55 --network target=nic55", "edit-select-network-mac")
 
-c = vixml.add_category("edit clear", "test-many-devices --print-diff --define", compare_check=support.SUPPORT_CONN_INPUT_KEYBOARD)
+c = vixml.add_category("edit clear", "test-for-virtxml --print-diff --define", compare_check=support.SUPPORT_CONN_INPUT_KEYBOARD)
 c.add_invalid("--edit --memory 200,clearxml=yes")  # clear isn't wired up for memory
 c.add_invalid("--edit --disk /foo/bar,target=fda,bus=fdc,device=floppy,clearxml=yes")  # clearxml isn't supported for devices
 c.add_compare("--edit --cpu host-passthrough,clearxml=yes", "edit-clear-cpu")
 c.add_compare("--edit --clock offset=utc,clearxml=yes", "edit-clear-clock")
 
-c = vixml.add_category("add/rm devices", "test-many-devices --print-diff --define", compare_check=support.SUPPORT_CONN_INPUT_KEYBOARD)
+c = vixml.add_category("add/rm devices", "test-for-virtxml --print-diff --define", compare_check=support.SUPPORT_CONN_INPUT_KEYBOARD)
 c.add_invalid("--add-device --security foo")  # --add-device without a device
 c.add_invalid("--remove-device --clock utc")  # --remove-device without a dev
 c.add_compare("--add-device --host-device net_00_1c_25_10_b1_e4", "add-host-device")
@@ -924,7 +924,7 @@ c.add_compare("--add-device --disk %(EXISTIMG1)s,bus=virtio,target=vdf", "add-di
 c.add_compare("--add-device --disk %(EXISTIMG1)s", "add-disk-notarget")  # filling in acceptable target
 c.add_compare("--add-device --disk %(NEWIMG1)s,size=.01", "add-disk-create-storage")
 c.add_compare("--remove-device --sound ich6", "remove-sound-model", compare_check=support.SUPPORT_CONN_VIDEO_NEW_RAM_OUTPUT)
-c.add_compare("--remove-device --disk 6", "remove-disk-index")
+c.add_compare("--remove-device --disk 3", "remove-disk-index")
 c.add_compare("--remove-device --disk /dev/null", "remove-disk-path")
 c.add_compare("--remove-device --video all", "remove-video-all", compare_check=support.SUPPORT_CONN_VIDEO_NEW_RAM_OUTPUT)
 c.add_compare("--remove-device --host-device 0x04b3:0x4485", "remove-hostdev-name")
@@ -967,7 +967,7 @@ c.add_valid("--original-xml %(CLONE_DISK_XML)s --file %(NEWCLONEIMG1)s --file %(
 c.add_valid("--original-xml %(CLONE_DISK_XML)s --file %(NEWCLONEIMG1)s --file %(NEWCLONEIMG2)s --force-copy=fda")  # XML w/ disks, force copy a target with no media
 c.add_valid("--original-xml %(CLONE_STORAGE_XML)s --file %(MANAGEDNEW1)s")  # XML w/ managed storage, specify managed path
 c.add_valid("--original-xml %(CLONE_NOEXIST_XML)s --file %(EXISTIMG1)s --preserve")  # XML w/ managed storage, specify managed path across pools# Libvirt test driver doesn't support cloning across pools# XML w/ non-existent storage, with --preserve
-c.add_valid("-o test -n test-many-devices --replace")  # Overwriting existing VM
+c.add_valid("-o test -n test-for-clone --replace")  # Overwriting existing VM
 c.add_invalid("-o test foobar")  # Positional arguments error
 c.add_invalid("-o idontexist")  # Non-existent vm name
 c.add_invalid("-o idontexist --auto-clone")  # Non-existent vm name with auto flag,
diff --git a/tests/testdriver.xml b/tests/testdriver.xml
index 398c7e5b3..cecd63265 100644
--- a/tests/testdriver.xml
+++ b/tests/testdriver.xml
@@ -56,7 +56,7 @@
 
 
 <domain type='test'>
-  <name>test-many-devices</name>
+  <name>test-for-virtxml</name>
   <currentMemory>204800</currentMemory>
   <memory>409600</memory>
   <blkiotune>
@@ -78,8 +78,202 @@
     <uid start='0' target='1000' count='10'/>
     <gid start='0' target='1000' count='10'/>
   </idmap>
-  <description>Foo bar baz &amp;
-    yeah boii &lt; &gt; yeahfoo
+  <description>Test VM for virtxml cli tests
+  </description>
+  <features>
+    <acpi/>
+    <apic eoi='off'/>
+    <hyperv>
+      <relaxed state='on'/>
+      <vapic state='on'/>
+      <spinlocks state='on' retries='12287'/>
+    </hyperv>
+  </features>
+  <clock offset="utc">
+    <timer name="rtc" tickpolicy="catchup"/>
+    <timer name="pit" tickpolicy="delay"/>
+    <timer name="hpet" present="no"/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <vcpu cpuset="1,2,5-9,11,13-14">9</vcpu>
+  <numatune>
+    <memory mode='interleave' placement='auto'/>
+  </numatune>
+  <cpu match="exact">
+    <model>core2duo</model>
+    <vendor>Intel</vendor>
+    <feature policy="require" name="pbe"/>
+    <feature policy="require" name="tm2"/>
+    <feature policy="require" name="est"/>
+    <feature policy="require" name="ss"/>
+    <feature policy="require" name="ht"/>
+    <feature policy="require" name="ds"/>
+    <feature policy="require" name="lahf_lm"/>
+    <feature policy="require" name="tm"/>
+    <feature policy="require" name="cx16"/>
+    <feature policy="require" name="vmx"/>
+    <feature policy="require" name="ds_cpl"/>
+    <feature policy="require" name="xtpr"/>
+    <feature policy="require" name="acpi"/>
+  </cpu>
+
+  <pm>
+    <suspend-to-mem enabled='no'/>
+  </pm>
+
+  <devices>
+    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+
+    <disk type='block' device='floppy'>
+      <source dev='/dev/null'/>
+      <target dev='fda' bus='fdc'/>
+      <boot order='5'/>
+    </disk>
+    <disk type='file' device='disk'>
+      <source file='/tmp/foobar'/>
+      <target dev='hda' bus='ide'/>
+      <iotune>
+        <read_bytes_sec>5242880</read_bytes_sec>
+        <total_iops_sec>50</total_iops_sec>
+      </iotune>
+    </disk>
+    <disk type='file' device='disk'>
+      <driver name="qemu" type="qcow2" cache="none"/>
+      <source file='/tmp/foobar2'/>
+      <target dev='sda' bus='scsi'/>
+      <boot order='1'/>
+      <address type='drive' controller='9'/>
+      <shareable/>
+    </disk>
+
+    <controller type='scsi' index='9' model='virtio-scsi'/>
+
+    <interface type='network'>
+      <source network='default'/>
+      <mac address='22:22:33:54:32:10'/>
+      <model type='e1000'/>
+    </interface>
+    <interface type='bridge'>
+      <source bridge='br0'/>
+      <mac address='22:00:00:44:AA:BF'/>
+      <model type='e1000'/>
+    </interface>
+    <interface type='ethernet'>
+      <mac address='00:11:7f:33:44:55'/>
+      <script path='/etc/qemu-ifup'/>
+      <target dev='nic02'/>
+    </interface>
+
+    <input type='mouse' bus='ps2'/>
+
+    <graphics type='vnc' display=':3.4' xauth='/testdir/.Xauthority' fullscreen='yes'/>
+
+    <sound model='sb16'/>
+    <sound model='es1370'/>
+    <sound model='ich6'/>
+
+    <video>
+      <model type='vmvga'/>
+    </video>
+    <video>
+      <model type='cirrus' vram='10240' heads='3'/>
+    </video>
+
+    <hostdev mode='subsystem' type='usb' managed='yes'>
+      <source>
+        <vendor id='0x04b3'/>
+        <product id='0x4485'/>
+      </source>
+    </hostdev>
+    <hostdev mode='subsystem' type='pci' managed='yes'>
+      <source>
+        <address bus='0x00' slot='0x19' function="0x0"/>
+      </source>
+      <rom bar='off'/>
+    </hostdev>
+
+    <serial type='null'/>
+
+    <parallel type='file'>
+      <source path='/tmp/foo.log'/>
+    </parallel>
+
+    <console type='pty'>
+      <target type='virtio'/>
+    </console>
+
+    <channel type='pipe'>
+      <source path='/tmp/guestfwd'/>
+      <target type='guestfwd' address='10.0.2.1' port='4600'/>
+    </channel>
+
+    <watchdog model='ib700' action='poweroff'/>
+
+    <smartcard mode='host'>
+      <address type='ccid' controller='0' slot='0'/>
+    </smartcard>
+
+    <redirdev bus='usb' type='tcp'>
+      <source mode='connect' host='localhost' service='4000'/>
+      <protocol type='raw'/>
+    </redirdev>
+
+    <filesystem>
+      <driver type='handle'/>
+      <source dir='/foo/bar'/>
+      <target dir='/bar/baz'/>
+    </filesystem>
+
+    <tpm model='tpm-tis'>
+      <backend type='passthrough'>
+        <device path='/dev/tzz'/>
+      </backend>
+    </tpm>
+
+    <rng model='virtio'>
+      <rate period='2000' bytes='1234'/>
+      <backend model='egd' type='tcp'>
+        <source mode='connect' host='1.2.3.4' service='1234'/>
+      </backend>
+    </rng>
+
+    <panic>
+      <address type='isa' iobase='0x505'/>
+    </panic>
+
+    <memballoon model='virtio'/>
+  </devices>
+</domain>
+
+
+<domain type='test'>
+  <name>test-many-devices</name>
+  <currentMemory>204800</currentMemory>
+  <memory>409600</memory>
+  <blkiotune>
+    <weight>100</weight>
+    <device>
+      <path>/dev/sdd</path>
+      <weight>200</weight>
+    </device>
+  </blkiotune>
+  <memoryBacking>
+    <hugepages/>
+  </memoryBacking>
+  <uuid>12345678-12F4-1234-1234-A23456A89012</uuid>
+  <os>
+    <type arch='i686'>hvm</type>
+    <loader>/usr/lib/xen/boot/hvmloader</loader>
+  </os>
+  <idmap>
+    <uid start='0' target='1000' count='10'/>
+    <gid start='0' target='1000' count='10'/>
+  </idmap>
+  <description>Test VM for virt-manager details UI testing
+
+Foo bar baz &amp; yeah boii &lt; &gt; yeahfoo
   </description>
   <features>
     <acpi/>
@@ -245,6 +439,8 @@
 
     <!-- controllers -->
     <controller type='scsi' index='9' model='virtio-scsi'/>
+    <controller type='scsi' model='virtio-scsi'/>
+    <controller type='usb'/>
 
 
     <!-- interfaces -->
@@ -308,9 +504,6 @@
       <channel name="record" mode="insecure"/>
     </graphics>
 
-    <!-- controller devices -->
-    <controller type='scsi' model='virtio-scsi'/>
-    <controller type='usb'/>
 
     <!-- sound devices -->
     <sound model='sb16'/>
@@ -490,6 +683,8 @@
   </devices>
 </domain>
 
+
+
 <domain type='test'>
   <name>test-alternate-devs</name>
   <uuid>4a64cc71-19c4-2fd0-2323-00aa941ea3c3</uuid>
diff --git a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
index 68e9ee20d..7bb9271d2 100644
--- a/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
+++ b/tests/virtconv-files/libvirt_output/vmx2libvirt_test-vmx-zip.libvirt
@@ -25,6 +25,10 @@
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>restart</on_crash>
+  <pm>
+    <suspend-to-mem enabled="no"/>
+    <suspend-to-disk enabled="no"/>
+  </pm>
   <devices>
     <emulator>/usr/bin/qemu-kvm</emulator>
     <disk type="block" device="cdrom">
@@ -52,7 +56,9 @@
       <mac address="00:11:22:33:44:55"/>
     </interface>
     <input type="mouse" bus="ps2"/>
-    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes"/>
+    <graphics type="spice" port="-1" tlsPort="-1" autoport="yes">
+      <image compression="off"/>
+    </graphics>
     <console type="pty"/>
     <channel type="spicevmc">
       <target type="virtio" name="com.redhat.spice.0"/>