[virt-tools-list] [PATCH virt-manager] tests: fix tests with latest libvirt from git

[Giuseppe Scrivano]

Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
---
 tests/cli-test-xml/compare/virtxml-add-disk-basic.xml          | 8 ++++----
 tests/cli-test-xml/compare/virtxml-add-disk-create-storage.xml | 8 ++++----
 tests/cli-test-xml/compare/virtxml-add-disk-notarget.xml       | 8 ++++----
 tests/cli-test-xml/compare/virtxml-add-host-device.xml         | 8 ++++----
 tests/cli-test-xml/compare/virtxml-add-sound.xml               | 8 ++++----
 tests/cli-test-xml/compare/virtxml-edit-clear-clock.xml        | 6 +++---
 tests/cli-test-xml/compare/virtxml-edit-clear-cpu.xml          | 6 +++---
 tests/cli-test-xml/compare/virtxml-edit-simple-metadata.xml    | 6 +++---
 tests/cli-test-xml/compare/virtxml-edit-simple-security.xml    | 6 +++---
 tests/cli-test-xml/compare/virtxml-remove-disk-index.xml       | 8 ++++----
 10 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/tests/cli-test-xml/compare/virtxml-add-disk-basic.xml b/tests/cli-test-xml/compare/virtxml-add-disk-basic.xml
index 7810872..99fd200 100644
--- a/tests/cli-test-xml/compare/virtxml-add-disk-basic.xml
+++ b/tests/cli-test-xml/compare/virtxml-add-disk-basic.xml
@@ -1,9 +1,9 @@
 --- Original XML
 +++ Altered XML
-@@ -301,5 +301,9 @@
-         <protocol type="raw"/>
-       </backend>
-     </rng>
+@@ -304,5 +304,9 @@
+     <panic>
+       <address type="isa" iobase="0x505"/>
+     </panic>
 +    <disk type="file" device="disk">
 +      <source file="/tmp/__virtinst_cli_exist1.img"/>
 +      <target dev="vdf" bus="virtio"/>
diff --git a/tests/cli-test-xml/compare/virtxml-add-disk-create-storage.xml b/tests/cli-test-xml/compare/virtxml-add-disk-create-storage.xml
index 48bdab5..aedcfc7 100644
--- a/tests/cli-test-xml/compare/virtxml-add-disk-create-storage.xml
+++ b/tests/cli-test-xml/compare/virtxml-add-disk-create-storage.xml
@@ -1,9 +1,9 @@
 --- Original XML
 +++ Altered XML
-@@ -301,5 +301,9 @@
-         <protocol type="raw"/>
-       </backend>
-     </rng>
+@@ -304,5 +304,9 @@
+     <panic>
+       <address type="isa" iobase="0x505"/>
+     </panic>
 +    <disk type="file" device="disk">
 +      <source file="/tmp/__virtinst_cli_new1.img"/>
 +      <target dev="vdd"/>
diff --git a/tests/cli-test-xml/compare/virtxml-add-disk-notarget.xml b/tests/cli-test-xml/compare/virtxml-add-disk-notarget.xml
index c899a91..187f867 100644
--- a/tests/cli-test-xml/compare/virtxml-add-disk-notarget.xml
+++ b/tests/cli-test-xml/compare/virtxml-add-disk-notarget.xml
@@ -1,9 +1,9 @@
 --- Original XML
 +++ Altered XML
-@@ -301,5 +301,9 @@
-         <protocol type="raw"/>
-       </backend>
-     </rng>
+@@ -304,5 +304,9 @@
+     <panic>
+       <address type="isa" iobase="0x505"/>
+     </panic>
 +    <disk type="file" device="disk">
 +      <source file="/tmp/__virtinst_cli_exist1.img"/>
 +      <target dev="vdd"/>
diff --git a/tests/cli-test-xml/compare/virtxml-add-host-device.xml b/tests/cli-test-xml/compare/virtxml-add-host-device.xml
index 09450d9..d01929c 100644
--- a/tests/cli-test-xml/compare/virtxml-add-host-device.xml
+++ b/tests/cli-test-xml/compare/virtxml-add-host-device.xml
@@ -1,9 +1,9 @@
 --- Original XML
 +++ Altered XML
-@@ -301,5 +301,10 @@
-         <protocol type="raw"/>
-       </backend>
-     </rng>
+@@ -304,5 +304,10 @@
+     <panic>
+       <address type="isa" iobase="0x505"/>
+     </panic>
 +    <hostdev mode="subsystem" type="pci" managed="yes">
 +      <source>
 +        <address domain="0" bus="0" slot="25" function="0"/>
diff --git a/tests/cli-test-xml/compare/virtxml-add-sound.xml b/tests/cli-test-xml/compare/virtxml-add-sound.xml
index ba5d226..9953ab1 100644
--- a/tests/cli-test-xml/compare/virtxml-add-sound.xml
+++ b/tests/cli-test-xml/compare/virtxml-add-sound.xml
@@ -1,9 +1,9 @@
 --- Original XML
 +++ Altered XML
-@@ -301,5 +301,6 @@
-         <protocol type="raw"/>
-       </backend>
-     </rng>
+@@ -304,5 +304,6 @@
+     <panic>
+       <address type="isa" iobase="0x505"/>
+     </panic>
 +    <sound model="pcspk"/>
    </devices>
  </domain>
diff --git a/tests/cli-test-xml/compare/virtxml-edit-clear-clock.xml b/tests/cli-test-xml/compare/virtxml-edit-clear-clock.xml
index 8afd169..1935c3d 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-clear-clock.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-clear-clock.xml
@@ -12,9 +12,9 @@
    <on_poweroff>destroy</on_poweroff>
    <on_reboot>restart</on_reboot>
    <on_crash>restart</on_crash>
-@@ -302,4 +297,5 @@
-       </backend>
-     </rng>
+@@ -305,4 +300,5 @@
+       <address type="isa" iobase="0x505"/>
+     </panic>
    </devices>
 +  <clock offset="utc"/>
  </domain>
diff --git a/tests/cli-test-xml/compare/virtxml-edit-clear-cpu.xml b/tests/cli-test-xml/compare/virtxml-edit-clear-cpu.xml
index bb81b15..c0131ba 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-clear-cpu.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-clear-cpu.xml
@@ -24,9 +24,9 @@
    <clock offset="utc">
      <timer name="rtc" tickpolicy="catchup"/>
      <timer name="pit" tickpolicy="delay"/>
-@@ -302,4 +285,7 @@
-       </backend>
-     </rng>
+@@ -305,4 +288,7 @@
+       <address type="isa" iobase="0x505"/>
+     </panic>
    </devices>
 +  <cpu mode="custom" match="exact">
 +    <model>host-passthrough</model>
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-metadata.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-metadata.xml
index 6e6198b..b429b4c 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-metadata.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-metadata.xml
@@ -15,9 +15,9 @@
    <memory unit="KiB">409600</memory>
    <currentMemory unit="KiB">204800</currentMemory>
    <memoryBacking>
-@@ -302,4 +302,5 @@
-       </backend>
-     </rng>
+@@ -305,4 +305,5 @@
+       <address type="isa" iobase="0x505"/>
+     </panic>
    </devices>
 +  <title>This is my,funky=new title</title>
  </domain>
diff --git a/tests/cli-test-xml/compare/virtxml-edit-simple-security.xml b/tests/cli-test-xml/compare/virtxml-edit-simple-security.xml
index e4f38f9..80ca17b 100644
--- a/tests/cli-test-xml/compare/virtxml-edit-simple-security.xml
+++ b/tests/cli-test-xml/compare/virtxml-edit-simple-security.xml
@@ -1,8 +1,8 @@
 --- Original XML
 +++ Altered XML
-@@ -302,4 +302,7 @@
-       </backend>
-     </rng>
+@@ -305,4 +305,7 @@
+       <address type="isa" iobase="0x505"/>
+     </panic>
    </devices>
 +  <seclabel relabel="yes">
 +    <label>foo,bar,baz,UNKNOWN=val</label>
diff --git a/tests/cli-test-xml/compare/virtxml-remove-disk-index.xml b/tests/cli-test-xml/compare/virtxml-remove-disk-index.xml
index ad97a02..fda2d8a 100644
--- a/tests/cli-test-xml/compare/virtxml-remove-disk-index.xml
+++ b/tests/cli-test-xml/compare/virtxml-remove-disk-index.xml
@@ -1,18 +1,18 @@
 --- Original XML
 +++ Altered XML
-@@ -84,12 +84,6 @@
+@@ -83,12 +83,6 @@
+       <target dev="sdb" bus="scsi"/>
        <readonly/>
        <address type="drive" controller="0" bus="0" target="0" unit="1"/>
-     </disk>
+-    </disk>
 -    <disk type="file" device="disk">
 -      <driver name="qemu" type="qcow2" cache="none"/>
 -      <source file="/tmp/foobar2"/>
 -      <target dev="vdc" bus="virtio"/>
 -      <shareable/>
--    </disk>
+     </disk>
      <disk type="block" device="disk">
        <source dev="/dev/default-pool/overlay.img"/>
-       <target dev="sdd" bus="usb"/>
 
 Domain 'test-many-devices' defined successfully.
 Changes will take effect after the next domain shutdown.
\ No newline at end of file
-- 
1.8.5.3