qemuxml2argvdata: Drop device aliases

The qemuxml2argvtest expects the domain XMLs to be inactive ones.
Therefore we should pass inactive XMLs.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml
index df41e583264d762019d5ced1c4633e8c594b8341..b4e3311606932ba67d5dfee5cf82f6db54802951 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml
@@ -26,7 +26,6 @@
       </source>
       <target dev='hdc' bus='ide'/>
       <readonly/>
-      <alias name='ide0-1-0'/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <controller type='usb' index='0'/>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml
index 57049a26658e2a344f155959cd326bfb0b6514e8..4e6ca1bad10d4212a6f275ac4e9ce53e57b2b1f1 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml
@@ -26,7 +26,6 @@
       </source>
       <target dev='hdc' bus='ide'/>
       <readonly/>
-      <alias name='ide0-1-0'/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <controller type='usb' index='0'/>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.xml
index 8a1286cb1d7abdf6fd2b42e1bcbd309dab646f5e..0eed65672b26f0d15b61d151a7163d4dec6ff305 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.xml
@@ -26,7 +26,6 @@
       </source>
       <target dev='hdc' bus='ide'/>
       <readonly/>
-      <alias name='ide0-1-0'/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <controller type='usb' index='0'/>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml
index 41b5a89b6d4486e7bbc57da7ce8612d04847bbf2..cd92fe44a84c7d7f9f35e36b88126413d8db0d27 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml
@@ -26,7 +26,6 @@
       </source>
       <target dev='hdc' bus='ide'/>
       <readonly/>
-      <alias name='ide0-1-0'/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <controller type='usb' index='0'/>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml
index e2cb4a006a29676619a1bb48d003a7d885be7985..1c3b185b00f1a94e58ab5b69cf2daf2a490e9603 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml
@@ -26,7 +26,6 @@
       </source>
       <target dev='hdc' bus='ide'/>
       <readonly/>
-      <alias name='ide0-1-0'/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
     <controller type='usb' index='0'/>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.xml
index 32fb890a1e4af81d072efa7463b0b70b27b62591..0bc15f0df19b9d411f85c08c650122fa65853874 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.xml
@@ -33,7 +33,6 @@
       <address type='usb' bus='0' port='4'/>
     </redirdev>
     <redirdev bus='usb' type='spicevmc'>
-      <alias name='redir1'/>
       <address type='usb' bus='0' port='5'/>
     </redirdev>
     <redirfilter>