[v1] qemu: Pass the number of heads even with -vga qxl

[libvirt] [PATCH] qemu: Pass the number of heads even with -vga qxl

Posted by Martin Kletzander 6 years, 10 months ago

When added in multiple previous commits, it was used only with -device
qxl(-vga), but for some QEMUs (< 1.6) we need to add this
functionality when using -vga qxl as well.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1283207

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---
 src/qemu/qemu_command.c                            |  8 ++++
 .../qemuxml2argv-video-vga-qxl-heads.args          | 30 ++++++++++++++
 .../qemuxml2argv-video-vga-qxl-heads.xml           | 47 ++++++++++++++++++++++
 tests/qemuxml2argvtest.c                           |  3 ++
 4 files changed, 88 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 3e1552a1b593..9687d367a6d4 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4613,6 +4613,14 @@ qemuBuildVgaVideoCommand(virCommandPtr cmd,
             virCommandAddArgFormat(cmd, "%s.vgamem_mb=%u",
                                    dev, vgamem / 1024);
         }
+
+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_MAX_OUTPUTS))
+            video->heads = 0;
+        if (video->heads) {
+            virCommandAddArg(cmd, "-global");
+            virCommandAddArgFormat(cmd, "%s.max_outputs=%u",
+                                   dev, video->heads);
+        }
     }

     if (video->vram &&
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args
new file mode 100644
index 000000000000..411a2eedbc4b
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args
@@ -0,0 +1,30 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-i686 \
+-name QEMUGuest1 \
+-S \
+-M pc \
+-m 214 \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-nographic \
+-nodefaults \
+-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
+-no-acpi \
+-boot c \
+-usb \
+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
+-vga qxl \
+-global qxl-vga.ram_size=67108864 \
+-global qxl-vga.vram_size=67108864 \
+-global qxl-vga.max_outputs=1 \
+-device qxl,id=video1,ram_size=67108864,vram_size=33554432,max_outputs=3,\
+bus=pci.0,addr=0x4 \
+-device qxl,id=video2,ram_size=67108864,vram_size=67108864,max_outputs=7,\
+bus=pci.0,addr=0x5 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml
new file mode 100644
index 000000000000..d878ddcd6d2e
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml
@@ -0,0 +1,47 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219136</memory>
+  <currentMemory unit='KiB'>219136</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='ide' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <video>
+      <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='3'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+    </video>
+    <video>
+      <model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='7'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+    </video>
+    <video>
+      <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'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 43d3f1bd3973..ea8403122feb 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1734,6 +1734,9 @@ mymain(void)
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_DEVICE_QXL,
             QEMU_CAPS_QXL_MAX_OUTPUTS);
+    DO_TEST("video-vga-qxl-heads",
+            QEMU_CAPS_DEVICE_QXL,
+            QEMU_CAPS_QXL_MAX_OUTPUTS);
     DO_TEST("video-qxl-noheads",
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_DEVICE_QXL,
--
2.13.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] qemu: Pass the number of heads even with -vga qxl

Posted by Ján Tomko 6 years, 10 months ago

On Wed, Jun 14, 2017 at 03:56:15PM +0200, Martin Kletzander wrote:
>When added in multiple previous commits, it was used only with -device
>qxl(-vga), but for some QEMUs (< 1.6) we need to add this
>functionality when using -vga qxl as well.
>
>Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1283207
>
>Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
>---
> src/qemu/qemu_command.c                            |  8 ++++
> .../qemuxml2argv-video-vga-qxl-heads.args          | 30 ++++++++++++++
> .../qemuxml2argv-video-vga-qxl-heads.xml           | 47 ++++++++++++++++++++++
> tests/qemuxml2argvtest.c                           |  3 ++
> 4 files changed, 88 insertions(+)
> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args
> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml
>
>diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
>index 3e1552a1b593..9687d367a6d4 100644
>--- a/src/qemu/qemu_command.c
>+++ b/src/qemu/qemu_command.c
>@@ -4613,6 +4613,14 @@ qemuBuildVgaVideoCommand(virCommandPtr cmd,
>             virCommandAddArgFormat(cmd, "%s.vgamem_mb=%u",
>                                    dev, vgamem / 1024);
>         }
>+
>+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_MAX_OUTPUTS))
>+            video->heads = 0;

I would expect a qemuBuild.*Command function to build the command line,
not alter the domain definition.

Also, this goes against commit ef11e770
  qemu_command: don't modify heads for graphics device

Jan
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] qemu: Pass the number of heads even with -vga qxl

Posted by Martin Kletzander 6 years, 10 months ago

On Wed, Jun 14, 2017 at 04:48:10PM +0200, Ján Tomko wrote:
>On Wed, Jun 14, 2017 at 03:56:15PM +0200, Martin Kletzander wrote:
>>When added in multiple previous commits, it was used only with -device
>>qxl(-vga), but for some QEMUs (< 1.6) we need to add this
>>functionality when using -vga qxl as well.
>>
>>Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1283207
>>
>>Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
>>---
>> src/qemu/qemu_command.c                            |  8 ++++
>> .../qemuxml2argv-video-vga-qxl-heads.args          | 30 ++++++++++++++
>> .../qemuxml2argv-video-vga-qxl-heads.xml           | 47 ++++++++++++++++++++++
>> tests/qemuxml2argvtest.c                           |  3 ++
>> 4 files changed, 88 insertions(+)
>> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args
>> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml
>>
>>diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
>>index 3e1552a1b593..9687d367a6d4 100644
>>--- a/src/qemu/qemu_command.c
>>+++ b/src/qemu/qemu_command.c
>>@@ -4613,6 +4613,14 @@ qemuBuildVgaVideoCommand(virCommandPtr cmd,
>>             virCommandAddArgFormat(cmd, "%s.vgamem_mb=%u",
>>                                    dev, vgamem / 1024);
>>         }
>>+
>>+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_MAX_OUTPUTS))
>>+            video->heads = 0;
>
>I would expect a qemuBuild.*Command function to build the command line,
>not alter the domain definition.
>
>Also, this goes against commit ef11e770
>  qemu_command: don't modify heads for graphics device
>

I, actually think that patch should've not made it in, but I must've
missed that it was posted.  The setting merely updates the XML so that
it is visible whether or not the setting was applied.  It then also
works when migrating to a newer qemu, so that it doesn't reset the
limitation.  But I'll leave this to other time and will post a v2
without that.

>Jan
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list