From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Anthony Liguori <aliguori@amazon.com>
Subject: [Qemu-devel] [PATCH 14/16] spice: move qemu_spice_display_*() from spice-graphics to spice-core
Date: Mon, 16 Dec 2013 10:31:15 +0100 [thread overview]
Message-ID: <1387186277-9573-15-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1387186277-9573-1-git-send-email-kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/spice-core.c | 16 ++++++++++++++++
ui/spice-display.c | 17 -----------------
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 9fb9544..0c48156 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -47,6 +47,7 @@ static const char *auth = "spice";
static char *auth_passwd;
static time_t auth_expires = TIME_MAX;
static int spice_migration_completed;
+static int spice_display_is_running;
int using_spice = 0;
static QemuThread me;
@@ -904,6 +905,21 @@ int qemu_spice_display_add_client(int csock, int skipauth, int tls)
}
}
+void qemu_spice_display_start(void)
+{
+ spice_display_is_running = true;
+}
+
+void qemu_spice_display_stop(void)
+{
+ spice_display_is_running = false;
+}
+
+int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd)
+{
+ return spice_display_is_running;
+}
+
static void spice_register_config(void)
{
qemu_add_opts(&qemu_spice_opts);
diff --git a/ui/spice-display.c b/ui/spice-display.c
index f23a318..9bb42f1 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -126,23 +126,6 @@ void qemu_spice_wakeup(SimpleSpiceDisplay *ssd)
spice_qxl_wakeup(&ssd->qxl);
}
-static int spice_display_is_running;
-
-void qemu_spice_display_start(void)
-{
- spice_display_is_running = true;
-}
-
-void qemu_spice_display_stop(void)
-{
- spice_display_is_running = false;
-}
-
-int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd)
-{
- return spice_display_is_running;
-}
-
static void qemu_spice_create_one_update(SimpleSpiceDisplay *ssd,
QXLRect *rect)
{
--
1.8.3.1
next prev parent reply other threads:[~2013-12-16 9:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-16 9:31 [Qemu-devel] [PULL 00/16] spice patch queue Gerd Hoffmann
2013-12-16 9:31 ` [Qemu-devel] [PATCH 01/16] spice: flip streaming video mode to off by default Gerd Hoffmann
2013-12-16 9:31 ` [Qemu-devel] [PATCH 02/16] vscclient: do not add a socket watch if there is not data to send Gerd Hoffmann
2013-12-16 9:31 ` [Qemu-devel] [PATCH 03/16] spice-char: remove unused field Gerd Hoffmann
2013-12-16 9:31 ` [Qemu-devel] [PATCH 04/16] qmp_change_blockdev() remove unused has_format Gerd Hoffmann
2013-12-16 9:31 ` [Qemu-devel] [PATCH 05/16] include: add missing config-host.h include Gerd Hoffmann
2013-12-16 9:31 ` [Qemu-devel] [PATCH 06/16] char: add qemu_chr_fe_event() Gerd Hoffmann
2013-12-16 9:31 ` [Qemu-devel] [PATCH 07/16] spice-char: implement chardev port event Gerd Hoffmann
2013-12-16 9:31 ` [Qemu-devel] [PATCH 08/16] Split nbd block client code Gerd Hoffmann
2013-12-16 9:31 ` [Qemu-devel] [PATCH 09/16] nbd: don't change socket block during negotiate Gerd Hoffmann
2013-12-16 9:31 ` [Qemu-devel] [PATCH 10/16] nbd: pass export name as init argument Gerd Hoffmann
2013-12-16 9:31 ` [Qemu-devel] [PATCH 11/16] nbd: make nbd_client_session_close() idempotent Gerd Hoffmann
2013-12-16 9:31 ` [Qemu-devel] [PATCH 12/16] nbd: finish any pending coroutine Gerd Hoffmann
2013-12-16 9:31 ` [Qemu-devel] [PATCH 13/16] nbd: avoid uninitialized warnings Gerd Hoffmann
2013-12-16 9:31 ` Gerd Hoffmann [this message]
2013-12-16 9:31 ` [Qemu-devel] [PATCH 15/16] spice: move spice_server_vm_{start, stop} calls into qemu_spice_display_*() Gerd Hoffmann
2013-12-16 9:31 ` [Qemu-devel] [PATCH 16/16] spice: stop server for qxl hard reset Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387186277-9573-15-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=aliguori@amazon.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).