|
 |
9c6c51 |
From 6000c0194fe724e18bc0a61d69ae2899de8fe355 Mon Sep 17 00:00:00 2001
|
|
|
9c6c51 |
Message-Id: <6000c0194fe724e18bc0a61d69ae2899de8fe355@dist-git>
|
|
|
9c6c51 |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
9c6c51 |
Date: Tue, 28 Aug 2018 12:46:43 +0200
|
|
|
9c6c51 |
Subject: [PATCH] tests: qemu: Remove disk from graphics-vnc-tls
|
|
|
9c6c51 |
MIME-Version: 1.0
|
|
|
9c6c51 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9c6c51 |
Content-Transfer-Encoding: 8bit
|
|
|
9c6c51 |
|
|
|
9c6c51 |
The disk command line is tested elsewhere.
|
|
|
9c6c51 |
|
|
|
9c6c51 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
9c6c51 |
(cherry picked from commit a37d832c9179fa7fef2e54f596258fd4712146ab)
|
|
|
9c6c51 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
9c6c51 |
|
|
|
9c6c51 |
https: //bugzilla.redhat.com/show_bug.cgi?id=1598167
|
|
|
9c6c51 |
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
|
|
9c6c51 |
---
|
|
|
9c6c51 |
tests/qemuxml2argvdata/graphics-vnc-tls.args | 2 --
|
|
|
9c6c51 |
tests/qemuxml2argvdata/graphics-vnc-tls.xml | 6 ------
|
|
|
9c6c51 |
tests/qemuxml2xmloutdata/graphics-vnc-tls.xml | 6 ------
|
|
|
9c6c51 |
3 files changed, 14 deletions(-)
|
|
|
9c6c51 |
|
|
|
9c6c51 |
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args b/tests/qemuxml2argvdata/graphics-vnc-tls.args
|
|
|
9c6c51 |
index b87c2116a3..3668fa889d 100644
|
|
|
9c6c51 |
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
|
|
|
9c6c51 |
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args
|
|
|
9c6c51 |
@@ -22,7 +22,5 @@ server,nowait \
|
|
|
9c6c51 |
-no-acpi \
|
|
|
9c6c51 |
-boot c \
|
|
|
9c6c51 |
-usb \
|
|
|
9c6c51 |
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
|
|
|
9c6c51 |
--device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
|
|
|
9c6c51 |
-vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \
|
|
|
9c6c51 |
-vga cirrus
|
|
|
9c6c51 |
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.xml b/tests/qemuxml2argvdata/graphics-vnc-tls.xml
|
|
|
9c6c51 |
index d0729e830d..079f6241c4 100644
|
|
|
9c6c51 |
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.xml
|
|
|
9c6c51 |
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.xml
|
|
|
9c6c51 |
@@ -14,12 +14,6 @@
|
|
|
9c6c51 |
<on_crash>destroy</on_crash>
|
|
|
9c6c51 |
<devices>
|
|
|
9c6c51 |
<emulator>/usr/bin/qemu-system-i686</emulator>
|
|
|
9c6c51 |
- <disk type='block' device='disk'>
|
|
|
9c6c51 |
- <driver name='qemu' type='raw'/>
|
|
|
9c6c51 |
- <source dev='/dev/HostVG/QEMUGuest1'/>
|
|
|
9c6c51 |
- <target dev='hda' bus='ide'/>
|
|
|
9c6c51 |
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
|
|
9c6c51 |
- </disk>
|
|
|
9c6c51 |
<controller type='usb' index='0'/>
|
|
|
9c6c51 |
<controller type='ide' index='0'/>
|
|
|
9c6c51 |
<controller type='pci' index='0' model='pci-root'/>
|
|
|
9c6c51 |
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml b/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
|
|
|
9c6c51 |
index 7b53c2ae1f..dcbc4bcf1d 100644
|
|
|
9c6c51 |
--- a/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
|
|
|
9c6c51 |
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
|
|
|
9c6c51 |
@@ -14,12 +14,6 @@
|
|
|
9c6c51 |
<on_crash>destroy</on_crash>
|
|
|
9c6c51 |
<devices>
|
|
|
9c6c51 |
<emulator>/usr/bin/qemu-system-i686</emulator>
|
|
|
9c6c51 |
- <disk type='block' device='disk'>
|
|
|
9c6c51 |
- <driver name='qemu' type='raw'/>
|
|
|
9c6c51 |
- <source dev='/dev/HostVG/QEMUGuest1'/>
|
|
|
9c6c51 |
- <target dev='hda' bus='ide'/>
|
|
|
9c6c51 |
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
|
|
9c6c51 |
- </disk>
|
|
|
9c6c51 |
<controller type='usb' index='0'>
|
|
|
9c6c51 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
|
|
|
9c6c51 |
</controller>
|
|
|
9c6c51 |
--
|
|
|
9c6c51 |
2.18.0
|
|
|
9c6c51 |
|