conf: Fix incorrect spice graphic XML format on compression options

If spice graphics has no <channel> elements, the output graphics XML
is messed up. To prevent this, we need to end the <graphics> element
just before adding any compression selecting elements.

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 77ab1e5343ffc2753dfeb5f0c18c33c075b69e97..b40620208ecc301eebd5e3886daafcba96432632 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8998,6 +8998,12 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
                               virDomainGraphicsSpiceChannelNameTypeToString(i),
                               virDomainGraphicsSpiceChannelModeTypeToString(mode));
         }
+        if (!children && (def->data.spice.image || def->data.spice.jpeg ||
+                          def->data.spice.zlib || def->data.spice.playback ||
+                          def->data.spice.streaming)) {
+            virBufferAddLit(buf, ">\n");
+            children = 1;
+        }
         if (def->data.spice.image)
             virBufferAsprintf(buf, "      <image compression='%s'/>\n",
                               virDomainGraphicsSpiceImageCompressionTypeToString(def->data.spice.image));