|
 |
9ae3a8 |
From c7936395ecf322b3de37662c7c6b772e36866cc7 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <c7936395ecf322b3de37662c7c6b772e36866cc7.1464449390.git.jen@redhat.com>
|
|
|
9ae3a8 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 13 May 2016 16:09:28 -0400
|
|
|
9ae3a8 |
Subject: [CHANGE 1/3] qxl: allow to specify head limit to qxl driver
|
|
|
9ae3a8 |
MIME-Version: 1.0
|
|
|
9ae3a8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9ae3a8 |
Content-Transfer-Encoding: 8bit
|
|
|
9ae3a8 |
To: rhvirt-patches@redhat.com,
|
|
|
9ae3a8 |
jen@redhat.com
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1463155769-32352-2-git-send-email-kraxel@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 70404
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.3 qemu-kvm PATCH 1/2] qxl: allow to specify head limit to qxl driver
|
|
|
9ae3a8 |
Bugzilla: 1283198
|
|
|
9ae3a8 |
RH-Acked-by: Marc-André Lureau <mlureau@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Frediano Ziglio <fziglio@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
This patch allow to limit number of heads using qxl driver. By default
|
|
|
9ae3a8 |
qxl driver is not limited on any kind on head use so can decide to use
|
|
|
9ae3a8 |
as much heads.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
libvirt has this as a video card parameter (actually set to 1 but not
|
|
|
9ae3a8 |
used). This parameter will allow to limit setting a use can do (which
|
|
|
9ae3a8 |
could be confusing).
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 567161fdd47aeb6987e700702f6bbfef04ae0236)
|
|
|
9ae3a8 |
Signed-off-by: Jeff E. Nelson <jen@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/display/qxl.c | 26 +++++++++++++++++++++-----
|
|
|
9ae3a8 |
hw/display/qxl.h | 3 +++
|
|
|
9ae3a8 |
2 files changed, 24 insertions(+), 5 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
|
|
|
9ae3a8 |
index f11210c..1f6a303 100644
|
|
|
9ae3a8 |
--- a/hw/display/qxl.c
|
|
|
9ae3a8 |
+++ b/hw/display/qxl.c
|
|
|
9ae3a8 |
@@ -266,6 +266,12 @@ static void qxl_spice_monitors_config_async(PCIQXLDevice *qxl, int replay)
|
|
|
9ae3a8 |
QXL_COOKIE_TYPE_POST_LOAD_MONITORS_CONFIG,
|
|
|
9ae3a8 |
0));
|
|
|
9ae3a8 |
} else {
|
|
|
9ae3a8 |
+#if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */
|
|
|
9ae3a8 |
+ if (qxl->max_outputs) {
|
|
|
9ae3a8 |
+ spice_qxl_set_monitors_config_limit(&qxl->ssd.qxl,
|
|
|
9ae3a8 |
+ qxl->max_outputs);
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+#endif
|
|
|
9ae3a8 |
qxl->guest_monitors_config = qxl->ram->monitors_config;
|
|
|
9ae3a8 |
spice_qxl_monitors_config_async(&qxl->ssd.qxl,
|
|
|
9ae3a8 |
qxl->ram->monitors_config,
|
|
|
9ae3a8 |
@@ -991,6 +997,7 @@ static int interface_client_monitors_config(QXLInstance *sin,
|
|
|
9ae3a8 |
PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
|
|
|
9ae3a8 |
QXLRom *rom = memory_region_get_ram_ptr(&qxl->rom_bar);
|
|
|
9ae3a8 |
int i;
|
|
|
9ae3a8 |
+ unsigned max_outputs = ARRAY_SIZE(rom->client_monitors_config.heads);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
if (qxl->revision < 4) {
|
|
|
9ae3a8 |
trace_qxl_client_monitors_config_unsupported_by_device(qxl->id,
|
|
|
9ae3a8 |
@@ -1013,17 +1020,23 @@ static int interface_client_monitors_config(QXLInstance *sin,
|
|
|
9ae3a8 |
if (!monitors_config) {
|
|
|
9ae3a8 |
return 1;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+#if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */
|
|
|
9ae3a8 |
+ /* limit number of outputs based on setting limit */
|
|
|
9ae3a8 |
+ if (qxl->max_outputs && qxl->max_outputs <= max_outputs) {
|
|
|
9ae3a8 |
+ max_outputs = qxl->max_outputs;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+#endif
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
memset(&rom->client_monitors_config, 0,
|
|
|
9ae3a8 |
sizeof(rom->client_monitors_config));
|
|
|
9ae3a8 |
rom->client_monitors_config.count = monitors_config->num_of_monitors;
|
|
|
9ae3a8 |
/* monitors_config->flags ignored */
|
|
|
9ae3a8 |
- if (rom->client_monitors_config.count >=
|
|
|
9ae3a8 |
- ARRAY_SIZE(rom->client_monitors_config.heads)) {
|
|
|
9ae3a8 |
+ if (rom->client_monitors_config.count >= max_outputs) {
|
|
|
9ae3a8 |
trace_qxl_client_monitors_config_capped(qxl->id,
|
|
|
9ae3a8 |
monitors_config->num_of_monitors,
|
|
|
9ae3a8 |
- ARRAY_SIZE(rom->client_monitors_config.heads));
|
|
|
9ae3a8 |
- rom->client_monitors_config.count =
|
|
|
9ae3a8 |
- ARRAY_SIZE(rom->client_monitors_config.heads);
|
|
|
9ae3a8 |
+ max_outputs);
|
|
|
9ae3a8 |
+ rom->client_monitors_config.count = max_outputs;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
for (i = 0 ; i < rom->client_monitors_config.count ; ++i) {
|
|
|
9ae3a8 |
VDAgentMonConfig *monitor = &monitors_config->monitors[i];
|
|
|
9ae3a8 |
@@ -2294,6 +2307,9 @@ static Property qxl_properties[] = {
|
|
|
9ae3a8 |
DEFINE_PROP_UINT32("vram64_size_mb", PCIQXLDevice, vram_size_mb, -1),
|
|
|
9ae3a8 |
DEFINE_PROP_UINT32("vgamem_mb", PCIQXLDevice, vgamem_size_mb, 16),
|
|
|
9ae3a8 |
DEFINE_PROP_INT32("surfaces", PCIQXLDevice, ssd.num_surfaces, 1024),
|
|
|
9ae3a8 |
+#if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */
|
|
|
9ae3a8 |
+ DEFINE_PROP_UINT16("max_outputs", PCIQXLDevice, max_outputs, 0),
|
|
|
9ae3a8 |
+#endif
|
|
|
9ae3a8 |
DEFINE_PROP_END_OF_LIST(),
|
|
|
9ae3a8 |
};
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/display/qxl.h b/hw/display/qxl.h
|
|
|
9ae3a8 |
index 5da33e2..5247ce9 100644
|
|
|
9ae3a8 |
--- a/hw/display/qxl.h
|
|
|
9ae3a8 |
+++ b/hw/display/qxl.h
|
|
|
9ae3a8 |
@@ -95,6 +95,9 @@ typedef struct PCIQXLDevice {
|
|
|
9ae3a8 |
QXLModes *modes;
|
|
|
9ae3a8 |
uint32_t rom_size;
|
|
|
9ae3a8 |
MemoryRegion rom_bar;
|
|
|
9ae3a8 |
+#if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */
|
|
|
9ae3a8 |
+ uint16_t max_outputs;
|
|
|
9ae3a8 |
+#endif
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/* vram pci bar */
|
|
|
9ae3a8 |
uint32_t vram_size;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
2.5.5
|
|
|
9ae3a8 |
|