|
 |
6ae9ed |
From 44efa3d179e355827796930f8d17862029fb9747 Mon Sep 17 00:00:00 2001
|
|
|
6ae9ed |
Message-Id: <44efa3d179e355827796930f8d17862029fb9747@dist-git>
|
|
|
6ae9ed |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
6ae9ed |
Date: Thu, 21 Jul 2016 15:57:46 +0200
|
|
|
6ae9ed |
Subject: [PATCH] Add USB addresses to qemuhotplug test cases
|
|
|
6ae9ed |
MIME-Version: 1.0
|
|
|
6ae9ed |
Content-Type: text/plain; charset=UTF-8
|
|
|
6ae9ed |
Content-Transfer-Encoding: 8bit
|
|
|
6ae9ed |
|
|
|
6ae9ed |
This test assumes the XML will be the same after formatting.
|
|
|
6ae9ed |
Add USB addresses to it to keep it working when we autoassign them.
|
|
|
6ae9ed |
|
|
|
6ae9ed |
(cherry picked from commit 3681e0a9feb50b54a4097eb11b5c6cfd48522994)
|
|
|
6ae9ed |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
6ae9ed |
|
|
|
6ae9ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1215968
|
|
|
6ae9ed |
---
|
|
|
6ae9ed |
.../qemuhotplug-console-compat-2-live+console-virtio.xml | 1 +
|
|
|
6ae9ed |
tests/qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml | 1 +
|
|
|
6ae9ed |
tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml | 4 +++-
|
|
|
6ae9ed |
3 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
diff --git a/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live+console-virtio.xml b/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live+console-virtio.xml
|
|
|
6ae9ed |
index 3495ee6..7ca36d5 100644
|
|
|
6ae9ed |
--- a/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live+console-virtio.xml
|
|
|
6ae9ed |
+++ b/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live+console-virtio.xml
|
|
|
6ae9ed |
@@ -100,6 +100,7 @@
|
|
|
6ae9ed |
</channel>
|
|
|
6ae9ed |
<input type='tablet' bus='usb'>
|
|
|
6ae9ed |
<alias name='input0'/>
|
|
|
6ae9ed |
+ <address type='usb' bus='0' port='1'/>
|
|
|
6ae9ed |
</input>
|
|
|
6ae9ed |
<input type='mouse' bus='ps2'>
|
|
|
6ae9ed |
<alias name='input1'/>
|
|
|
6ae9ed |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml
|
|
|
6ae9ed |
index b36af27..f300940 100644
|
|
|
6ae9ed |
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml
|
|
|
6ae9ed |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml
|
|
|
6ae9ed |
@@ -95,6 +95,7 @@
|
|
|
6ae9ed |
</channel>
|
|
|
6ae9ed |
<input type='tablet' bus='usb'>
|
|
|
6ae9ed |
<alias name='input0'/>
|
|
|
6ae9ed |
+ <address type='usb' bus='0' port='1'/>
|
|
|
6ae9ed |
</input>
|
|
|
6ae9ed |
<input type='mouse' bus='ps2'>
|
|
|
6ae9ed |
<alias name='input1'/>
|
|
|
6ae9ed |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
|
|
|
6ae9ed |
index 2ae104e..7b35709 100644
|
|
|
6ae9ed |
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
|
|
|
6ae9ed |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml
|
|
|
6ae9ed |
@@ -78,7 +78,9 @@
|
|
|
6ae9ed |
<target type='virtio' name='org.qemu.guest_agent.0'/>
|
|
|
6ae9ed |
<address type='virtio-serial' controller='0' bus='0' port='1'/>
|
|
|
6ae9ed |
</channel>
|
|
|
6ae9ed |
- <input type='tablet' bus='usb'/>
|
|
|
6ae9ed |
+ <input type='tablet' bus='usb'>
|
|
|
6ae9ed |
+ <address type='usb' bus='0' port='1'/>
|
|
|
6ae9ed |
+ </input>
|
|
|
6ae9ed |
<input type='mouse' bus='ps2'/>
|
|
|
6ae9ed |
<input type='keyboard' bus='ps2'/>
|
|
|
6ae9ed |
<graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'>
|
|
|
6ae9ed |
--
|
|
|
6ae9ed |
2.9.2
|
|
|
6ae9ed |
|