domain_conf: always set primary video device as primary

We always place primary video device at first place, to make it easier
to create a qemu command or format an xml, but we should also set the
primary boolean for primary video device to 'true'.
Signed-off-by: NPavel Hrdina <phrdina@redhat.com>

src/conf/domain_conf.c

@@ -11938,7 +11938,7 @@ virDomainVideoDefParseXML(xmlNodePtr node,
 
                 if ((primary = virXMLPropString(cur, "primary")) != NULL) {
                     if (STREQ(primary, "yes"))
-                        def->primary = 1;
+                        def->primary = true;
                     VIR_FREE(primary);
                 }
 
@@ -16074,6 +16074,10 @@ virDomainDefParseXML(xmlDocPtr xml,
             goto error;
         }
     }
+    /* if not specified by user mark the first video as primary */
+    if (n && !primaryVideo)
+        def->videos[0]->primary = true;
+
     VIR_FREE(nodes);
 
     /* For backwards compatibility, if no <video> tag is set but there

src/qemu/qemu_command.c

@@ -3280,13 +3280,12 @@ qemuBuildSoundCodecStr(virDomainSoundDefPtr sound,
 static char *
 qemuBuildDeviceVideoStr(virDomainDefPtr def,
                         virDomainVideoDefPtr video,
-                        virQEMUCapsPtr qemuCaps,
-                        bool primary)
+                        virQEMUCapsPtr qemuCaps)
 {
     virBuffer buf = VIR_BUFFER_INITIALIZER;
     const char *model;
 
-    if (primary) {
+    if (video->primary) {
         model = qemuDeviceVideoTypeToString(video->type);
         if (!model || STREQ(model, "")) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -3347,8 +3346,10 @@ qemuBuildDeviceVideoStr(virDomainDefPtr def,
             virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024);
         }
 
-        if ((primary && virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGA_VGAMEM)) ||
-            (!primary && virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGAMEM))) {
+        if ((video->primary &&
+             virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGA_VGAMEM)) ||
+            (!video->primary &&
+             virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGAMEM))) {
             /* QEMU accepts mebibytes for vgamem_mb. */
             virBufferAsprintf(&buf, ",vgamem_mb=%u", video->vgamem / 1024);
         }
@@ -8225,7 +8226,8 @@ qemuBuildCommandLine(virConnectPtr conn,
             for (i = 0; i < def->nvideos; i++) {
                 char *str;
                 virCommandAddArg(cmd, "-device");
-                if (!(str = qemuBuildDeviceVideoStr(def, def->videos[i], qemuCaps, !i)))
+                if (!(str = qemuBuildDeviceVideoStr(def, def->videos[i],
+                                                    qemuCaps)))
                     goto error;
 
                 virCommandAddArg(cmd, str);
@@ -8337,7 +8339,8 @@ qemuBuildCommandLine(virConnectPtr conn,
 
                         virCommandAddArg(cmd, "-device");
 
-                        if (!(str = qemuBuildDeviceVideoStr(def, def->videos[i], qemuCaps, false)))
+                        if (!(str = qemuBuildDeviceVideoStr(def, def->videos[i],
+                                                            qemuCaps)))
                             goto error;
 
                         virCommandAddArg(cmd, str);

tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml

@@ -91,7 +91,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>
     <video>
-      <model type='cirrus' vram='16384' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml

@@ -88,7 +88,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>
     <video>
-      <model type='cirrus' vram='16384' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network.xml

@@ -32,7 +32,7 @@
       <listen type='network' network='Bobsnetwork'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='16384' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml

@@ -33,7 +33,7 @@
       <listen type='network' network='Bobsnetwork'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='16384' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-sdl-fullscreen.xml

@@ -31,7 +31,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='sdl' display=':0.1' xauth='/root/.Xauthority' fullscreen='yes'/>
     <video>
-      <model type='cirrus' vram='16384' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='none'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-sdl.xml

@@ -31,7 +31,7 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='sdl' display=':0.1' xauth='/root/.Xauthority'/>
     <video>
-      <model type='vga' vram='16384' heads='1'/>
+      <model type='vga' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='none'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-compression.xml

@@ -37,7 +37,7 @@
       <streaming mode='filter'/>
     </graphics>
     <video>
-      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <video>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-qxl-vga.xml

@@ -34,7 +34,7 @@
       <channel name='inputs' mode='insecure'/>
     </graphics>
     <video>
-      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <video>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml

@@ -82,7 +82,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </sound>
     <video>
-      <model type='vga' vram='16384' heads='1'/>
+      <model type='vga' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice.xml

@@ -41,7 +41,7 @@
       <filetransfer enable='no'/>
     </graphics>
     <video>
-      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <video>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-sasl.xml

@@ -33,7 +33,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='16384' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='none'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-tls.xml

@@ -33,7 +33,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='16384' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='none'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-websocket.xml

@@ -24,7 +24,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='16384' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='none'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc.xml

@@ -33,7 +33,7 @@
       <listen type='address' address='2001:1:2:3:4:5:1234:1234'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='16384' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='none'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-server.xml

@@ -124,7 +124,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>
     <video>
-      <model type='cirrus' vram='16384' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth.xml

@@ -68,7 +68,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </sound>
     <video>
-      <model type='vga' vram='16384' heads='1'/>
+      <model type='vga' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth2.xml

@@ -57,7 +57,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </sound>
     <video>
-      <model type='vga' vram='16384' heads='1'/>
+      <model type='vga' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml

@@ -71,7 +71,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <video>
-      <model type='cirrus' vram='16384' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml

@@ -76,7 +76,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <video>
-      <model type='cirrus' vram='16384' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge.xml

@@ -241,7 +241,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='16384' heads='1'/>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port.xml

@@ -45,7 +45,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <video>
-      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </video>
     <memballoon model='none'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-downstream-port.xml

@@ -83,7 +83,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <video>
-      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </video>
     <memballoon model='none'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-upstream-port.xml

@@ -53,7 +53,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <video>
-      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </video>
     <memballoon model='none'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-q35.xml

@@ -37,7 +37,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <video>
-      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </video>
     <memballoon model='none'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2-multi.xml

@@ -80,7 +80,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <video>
-      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </video>
     <memballoon model='none'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2-reorder.xml

@@ -80,7 +80,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <video>
-      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </video>
     <memballoon model='none'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2.xml

@@ -50,7 +50,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <video>
-      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </video>
     <memballoon model='none'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml

@@ -50,7 +50,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <video>
-      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/>
+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </video>
     <memballoon model='none'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-none-relabel.xml

@@ -42,7 +42,7 @@
       <listen type='address' address='0.0.0.0'/>
     </graphics>
     <video>
-      <model type='cirrus' vram='8192' heads='1'/>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport.xml

@@ -41,7 +41,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='1'/>
+      <model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-device.xml

@@ -30,7 +30,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <video>
-      <model type='virtio' heads='1'/>
+      <model type='virtio' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml

@@ -33,7 +33,7 @@
       <gl enable='yes'/>
     </graphics>
     <video>
-      <model type='virtio' heads='1'>
+      <model type='virtio' heads='1' primary='yes'>
         <acceleration accel3d='yes'/>
       </model>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>

tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-virgl.xml

@@ -30,7 +30,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <video>
-      <model type='virtio' heads='1'>
+      <model type='virtio' heads='1' primary='yes'>
         <acceleration accel3d='yes'/>
       </model>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>