From 6000c0194fe724e18bc0a61d69ae2899de8fe355 Mon Sep 17 00:00:00 2001
Message-Id: <6000c0194fe724e18bc0a61d69ae2899de8fe355@dist-git>
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Tue, 28 Aug 2018 12:46:43 +0200
Subject: [PATCH] tests: qemu: Remove disk from graphics-vnc-tls
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The disk command line is tested elsewhere.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit a37d832c9179fa7fef2e54f596258fd4712146ab)
Signed-off-by: Ján Tomko <jtomko@redhat.com>

https: //bugzilla.redhat.com/show_bug.cgi?id=1598167
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---
 tests/qemuxml2argvdata/graphics-vnc-tls.args  | 2 --
 tests/qemuxml2argvdata/graphics-vnc-tls.xml   | 6 ------
 tests/qemuxml2xmloutdata/graphics-vnc-tls.xml | 6 ------
 3 files changed, 14 deletions(-)

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args b/tests/qemuxml2argvdata/graphics-vnc-tls.args
index b87c2116a3..3668fa889d 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args
@@ -22,7 +22,5 @@ server,nowait \
 -no-acpi \
 -boot c \
 -usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
--device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
 -vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \
 -vga cirrus
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.xml b/tests/qemuxml2argvdata/graphics-vnc-tls.xml
index d0729e830d..079f6241c4 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.xml
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.xml
@@ -14,12 +14,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-i686</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
     <controller type='usb' index='0'/>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml b/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
index 7b53c2ae1f..dcbc4bcf1d 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
@@ -14,12 +14,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-i686</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
-- 
2.18.0