|
 |
07d9f9 |
From bfdde4d94759666c2bd2da5632620e95da8c9214 Mon Sep 17 00:00:00 2001
|
|
|
07d9f9 |
From: Pavel Grunt <pgrunt@redhat.com>
|
|
|
07d9f9 |
Date: Wed, 16 Mar 2016 14:46:51 +0100
|
|
|
07d9f9 |
Subject: [PATCH 1/5] display: Lower level of warning for empty monitor config
|
|
|
07d9f9 |
|
|
|
07d9f9 |
It is a valid case when a guest requests to turn off monitors, eg:
|
|
|
07d9f9 |
xrandr --output Virtual-0 --off
|
|
|
07d9f9 |
|
|
|
07d9f9 |
Related:
|
|
|
07d9f9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1061942
|
|
|
07d9f9 |
|
|
|
07d9f9 |
Acked-by: Frediano Ziglio <fziglio@redhat.com>
|
|
|
07d9f9 |
(cherry picked from commit c0c721bbaae50d3ad1991d22df1c4397f24f7acb)
|
|
|
07d9f9 |
---
|
|
|
07d9f9 |
src/channel-display.c | 6 +++++-
|
|
|
07d9f9 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
07d9f9 |
|
|
|
07d9f9 |
diff --git a/src/channel-display.c b/src/channel-display.c
|
|
|
07d9f9 |
index 442642a..0ae84a0 100644
|
|
|
07d9f9 |
--- a/src/channel-display.c
|
|
|
07d9f9 |
+++ b/src/channel-display.c
|
|
|
07d9f9 |
@@ -1846,7 +1846,11 @@ static void display_handle_monitors_config(SpiceChannel *channel, SpiceMsgIn *in
|
|
|
07d9f9 |
guint i;
|
|
|
07d9f9 |
|
|
|
07d9f9 |
g_return_if_fail(config != NULL);
|
|
|
07d9f9 |
- g_return_if_fail(config->count > 0);
|
|
|
07d9f9 |
+
|
|
|
07d9f9 |
+ if (config->count == 0) {
|
|
|
07d9f9 |
+ CHANNEL_DEBUG(channel, "received empty monitor config");
|
|
|
07d9f9 |
+ return;
|
|
|
07d9f9 |
+ }
|
|
|
07d9f9 |
|
|
|
07d9f9 |
CHANNEL_DEBUG(channel, "received new monitors config from guest: n: %d/%d", config->count, config->max_allowed);
|
|
|
07d9f9 |
|
|
|
07d9f9 |
--
|
|
|
07d9f9 |
2.8.1
|
|
|
07d9f9 |
|