|
 |
958e1b |
From 79928996c2bf6ebb143564faf371433489ae5da4 Mon Sep 17 00:00:00 2001
|
|
|
958e1b |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
958e1b |
Date: Fri, 5 Sep 2014 12:30:35 +0200
|
|
|
958e1b |
Subject: [PATCH 01/12] spice: move qemu_spice_display_*() from spice-graphics to spice-core
|
|
|
958e1b |
|
|
|
958e1b |
Message-id: <1409920238-9070-2-git-send-email-kraxel@redhat.com>
|
|
|
958e1b |
Patchwork-id: 60875
|
|
|
958e1b |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 1/4] spice: move qemu_spice_display_*() from spice-graphics to spice-core
|
|
|
958e1b |
Bugzilla: 1054077
|
|
|
958e1b |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
958e1b |
(cherry picked from commit 7cc6a25fe94b430cb5a041bcb19d7d854b4e99a7)
|
|
|
958e1b |
---
|
|
|
958e1b |
ui/spice-core.c | 16 ++++++++++++++++
|
|
|
958e1b |
ui/spice-display.c | 17 -----------------
|
|
|
958e1b |
2 files changed, 16 insertions(+), 17 deletions(-)
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
958e1b |
---
|
|
|
958e1b |
ui/spice-core.c | 16 ++++++++++++++++
|
|
|
958e1b |
ui/spice-display.c | 17 -----------------
|
|
|
958e1b |
2 files changed, 16 insertions(+), 17 deletions(-)
|
|
|
958e1b |
|
|
|
958e1b |
diff --git a/ui/spice-core.c b/ui/spice-core.c
|
|
|
958e1b |
index d67449e..6a7c86f 100644
|
|
|
958e1b |
--- a/ui/spice-core.c
|
|
|
958e1b |
+++ b/ui/spice-core.c
|
|
|
958e1b |
@@ -47,6 +47,7 @@ static const char *auth = "spice";
|
|
|
958e1b |
static char *auth_passwd;
|
|
|
958e1b |
static time_t auth_expires = TIME_MAX;
|
|
|
958e1b |
static int spice_migration_completed;
|
|
|
958e1b |
+static int spice_display_is_running;
|
|
|
958e1b |
int using_spice = 0;
|
|
|
958e1b |
int spice_displays;
|
|
|
958e1b |
|
|
|
958e1b |
@@ -873,6 +874,21 @@ int qemu_spice_display_add_client(int csock, int skipauth, int tls)
|
|
|
958e1b |
}
|
|
|
958e1b |
}
|
|
|
958e1b |
|
|
|
958e1b |
+void qemu_spice_display_start(void)
|
|
|
958e1b |
+{
|
|
|
958e1b |
+ spice_display_is_running = true;
|
|
|
958e1b |
+}
|
|
|
958e1b |
+
|
|
|
958e1b |
+void qemu_spice_display_stop(void)
|
|
|
958e1b |
+{
|
|
|
958e1b |
+ spice_display_is_running = false;
|
|
|
958e1b |
+}
|
|
|
958e1b |
+
|
|
|
958e1b |
+int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd)
|
|
|
958e1b |
+{
|
|
|
958e1b |
+ return spice_display_is_running;
|
|
|
958e1b |
+}
|
|
|
958e1b |
+
|
|
|
958e1b |
static void spice_register_config(void)
|
|
|
958e1b |
{
|
|
|
958e1b |
qemu_add_opts(&qemu_spice_opts);
|
|
|
958e1b |
diff --git a/ui/spice-display.c b/ui/spice-display.c
|
|
|
958e1b |
index 82d8b9f..f0f95c8 100644
|
|
|
958e1b |
--- a/ui/spice-display.c
|
|
|
958e1b |
+++ b/ui/spice-display.c
|
|
|
958e1b |
@@ -126,23 +126,6 @@ void qemu_spice_wakeup(SimpleSpiceDisplay *ssd)
|
|
|
958e1b |
ssd->worker->wakeup(ssd->worker);
|
|
|
958e1b |
}
|
|
|
958e1b |
|
|
|
958e1b |
-static int spice_display_is_running;
|
|
|
958e1b |
-
|
|
|
958e1b |
-void qemu_spice_display_start(void)
|
|
|
958e1b |
-{
|
|
|
958e1b |
- spice_display_is_running = true;
|
|
|
958e1b |
-}
|
|
|
958e1b |
-
|
|
|
958e1b |
-void qemu_spice_display_stop(void)
|
|
|
958e1b |
-{
|
|
|
958e1b |
- spice_display_is_running = false;
|
|
|
958e1b |
-}
|
|
|
958e1b |
-
|
|
|
958e1b |
-int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd)
|
|
|
958e1b |
-{
|
|
|
958e1b |
- return spice_display_is_running;
|
|
|
958e1b |
-}
|
|
|
958e1b |
-
|
|
|
958e1b |
static void qemu_spice_create_one_update(SimpleSpiceDisplay *ssd,
|
|
|
958e1b |
QXLRect *rect)
|
|
|
958e1b |
{
|
|
|
958e1b |
--
|
|
|
958e1b |
1.7.1
|
|
|
958e1b |
|