|
 |
34b321 |
From ac053d6013f7fab73f66db60462c388bea21b714 Mon Sep 17 00:00:00 2001
|
|
|
34b321 |
Message-Id: <ac053d6013f7fab73f66db60462c388bea21b714.1464449390.git.jen@redhat.com>
|
|
|
34b321 |
In-Reply-To: <c7936395ecf322b3de37662c7c6b772e36866cc7.1464449390.git.jen@redhat.com>
|
|
|
34b321 |
References: <c7936395ecf322b3de37662c7c6b772e36866cc7.1464449390.git.jen@redhat.com>
|
|
|
34b321 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
34b321 |
Date: Fri, 13 May 2016 16:09:29 -0400
|
|
|
34b321 |
Subject: [CHANGE 2/3] qxl: Fix new function name for spice-server library
|
|
|
34b321 |
MIME-Version: 1.0
|
|
|
34b321 |
Content-Type: text/plain; charset=UTF-8
|
|
|
34b321 |
Content-Transfer-Encoding: 8bit
|
|
|
34b321 |
To: rhvirt-patches@redhat.com,
|
|
|
34b321 |
jen@redhat.com
|
|
|
34b321 |
|
|
|
34b321 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
34b321 |
Message-id: <1463155769-32352-3-git-send-email-kraxel@redhat.com>
|
|
|
34b321 |
Patchwork-id: 70403
|
|
|
34b321 |
O-Subject: [RHEL-7.3 qemu-kvm PATCH 2/2] qxl: Fix new function name for spice-server library
|
|
|
34b321 |
Bugzilla: 1283198
|
|
|
34b321 |
RH-Acked-by: Marc-André Lureau <mlureau@redhat.com>
|
|
|
34b321 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
34b321 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
34b321 |
|
|
|
34b321 |
From: Frediano Ziglio <fziglio@redhat.com>
|
|
|
34b321 |
|
|
|
34b321 |
The new spice-server function to limit the number of monitors (0.12.6)
|
|
|
34b321 |
changed while development from spice_qxl_set_monitors_config_limit to
|
|
|
34b321 |
spice_qxl_max_monitors (accepted upstream).
|
|
|
34b321 |
By mistake I post patch with former name.
|
|
|
34b321 |
This patch fix the function name.
|
|
|
34b321 |
|
|
|
34b321 |
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
|
|
|
34b321 |
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
|
|
|
34b321 |
Acked-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
34b321 |
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
34b321 |
(cherry picked from commit a52b2cbf218d52f9e357961acb271a98a2bdff71)
|
|
|
34b321 |
Signed-off-by: Jeff E. Nelson <jen@redhat.com>
|
|
|
34b321 |
---
|
|
|
34b321 |
hw/display/qxl.c | 3 +--
|
|
|
34b321 |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
34b321 |
|
|
|
34b321 |
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
|
|
|
34b321 |
index 1f6a303..748dfce 100644
|
|
|
34b321 |
--- a/hw/display/qxl.c
|
|
|
34b321 |
+++ b/hw/display/qxl.c
|
|
|
34b321 |
@@ -268,8 +268,7 @@ static void qxl_spice_monitors_config_async(PCIQXLDevice *qxl, int replay)
|
|
|
34b321 |
} else {
|
|
|
34b321 |
#if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */
|
|
|
34b321 |
if (qxl->max_outputs) {
|
|
|
34b321 |
- spice_qxl_set_monitors_config_limit(&qxl->ssd.qxl,
|
|
|
34b321 |
- qxl->max_outputs);
|
|
|
34b321 |
+ spice_qxl_set_max_monitors(&qxl->ssd.qxl, qxl->max_outputs);
|
|
|
34b321 |
}
|
|
|
34b321 |
#endif
|
|
|
34b321 |
qxl->guest_monitors_config = qxl->ram->monitors_config;
|
|
|
34b321 |
--
|
|
|
34b321 |
2.5.5
|
|
|
34b321 |
|