From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsUWd-0006Dh-QP for qemu-devel@nongnu.org; Mon, 16 Dec 2013 04:31:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VsUWV-0002BH-5e for qemu-devel@nongnu.org; Mon, 16 Dec 2013 04:31:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48562) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsUWU-0002Ap-Se for qemu-devel@nongnu.org; Mon, 16 Dec 2013 04:31:35 -0500 From: Gerd Hoffmann Date: Mon, 16 Dec 2013 10:31:15 +0100 Message-Id: <1387186277-9573-15-git-send-email-kraxel@redhat.com> In-Reply-To: <1387186277-9573-1-git-send-email-kraxel@redhat.com> References: <1387186277-9573-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 14/16] spice: move qemu_spice_display_*() from spice-graphics to spice-core List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori Signed-off-by: Gerd Hoffmann --- 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