Misc test case fixes for SPICE

* docs/schemas/domain.rng: Fix merge error which left SPICE channel
  elements under VNC schema.
* tests/qemuhelptest.c: Add SPICE flag to kvm-83 test
* tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml: Add
  <memballoon> element

diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index 5b7ecc2a9f0fa6f23c4636cc6f4e3acc087184a5..890205dead3b6d47e7c6429bada6697653db8193 100644 (file)
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -1093,27 +1093,6 @@
               <text/>
             </attribute>
           </optional>
-          <zeroOrMore>
-            <element name="channel">
-              <attribute name="name">
-                <choice>
-                  <value>main</value>
-                  <value>display</value>
-                  <value>inputs</value>
-                  <value>cursor</value>
-                  <value>playback</value>
-                  <value>record</value>
-                </choice>
-              </attribute>
-              <attribute name="mode">
-                <choice>
-                  <value>any</value>
-                  <value>secure</value>
-                  <value>insecure</value>
-                </choice>
-              </attribute>
-            </element>
-          </zeroOrMore>
         </group>
         <group>
           <attribute name="type">
@@ -1152,6 +1131,28 @@
               <text/>
             </attribute>
           </optional>
+          <zeroOrMore>
+            <element name="channel">
+              <attribute name="name">
+                <choice>
+                  <value>main</value>
+                  <value>display</value>
+                  <value>inputs</value>
+                  <value>cursor</value>
+                  <value>playback</value>
+                  <value>record</value>
+                </choice>
+              </attribute>
+              <attribute name="mode">
+                <choice>
+                  <value>any</value>
+                  <value>secure</value>
+                  <value>insecure</value>
+                </choice>
+              </attribute>
+             <empty/>
+            </element>
+          </zeroOrMore>
         </group>
         <group>
           <attribute name="type">

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 912f6075b0593960b96a0f0e505414958cf4876e..5339ec85eaede317b389acf634f5ac865fb71c45 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -153,7 +153,8 @@ mymain(int argc, char **argv)
             QEMUD_CMD_FLAG_NO_KVM_PIT |
             QEMUD_CMD_FLAG_TDF |
             QEMUD_CMD_FLAG_DRIVE_READONLY |
-            QEMUD_CMD_FLAG_SMBIOS_TYPE,
+            QEMUD_CMD_FLAG_SMBIOS_TYPE |
+            QEMUD_CMD_FLAG_SPICE,
             9001, 1,  83);
     DO_TEST("qemu-0.10.5",
             QEMUD_CMD_FLAG_KQEMU |

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
index bdce04b3771c0bbd866aa832d564b1f0d7f8ea08..15a22f30696366952fe4a1b89894b42746e84f38 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
@@ -31,5 +31,6 @@
     <video>
       <model type='qxl' vram='65536' heads='1'/>
     </video>
+    <memballoon model='virtio'/>
   </devices>
 </domain>