From a15c97f5e42324bb7be9c7afbac849b575a6926e Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 17 Oct 2017 13:27:01 +0200
Subject: [PATCH] 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>
---
 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml   | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml  | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.xml  | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml  | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.xml         | 1 -
 6 files changed, 6 deletions(-)

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml
index df41e58326..b4e3311606 100644
--- 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 57049a2665..4e6ca1bad1 100644
--- 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 8a1286cb1d..0eed65672b 100644
--- 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 41b5a89b6d..cd92fe44a8 100644
--- 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 e2cb4a006a..1c3b185b00 100644
--- 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 32fb890a1e..0bc15f0df1 100644
--- 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>