From patchwork Fri Feb 24 21:22:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 142975 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2D73BB6F9F for ; Sat, 25 Feb 2012 08:22:33 +1100 (EST) Received: from localhost ([::1]:32861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S12ax-0004rL-CS for incoming@patchwork.ozlabs.org; Fri, 24 Feb 2012 16:22:27 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S12an-0004b8-DE for qemu-devel@nongnu.org; Fri, 24 Feb 2012 16:22:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S12al-0005if-3s for qemu-devel@nongnu.org; Fri, 24 Feb 2012 16:22:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23562) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S12ak-0005iV-Rv for qemu-devel@nongnu.org; Fri, 24 Feb 2012 16:22:15 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1OLMEgi017138 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 24 Feb 2012 16:22:14 -0500 Received: from garlic.redhat.com (vpn-200-49.tlv.redhat.com [10.35.200.49]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q1OLM6m8029513; Fri, 24 Feb 2012 16:22:12 -0500 From: Alon Levy To: qemu-devel@nongnu.org, lcapitulino@redhat.com, kraxel@redhat.com, armbru@redhat.com Date: Fri, 24 Feb 2012 23:22:04 +0200 Message-Id: <1330118525-14522-3-git-send-email-alevy@redhat.com> In-Reply-To: <1330118525-14522-1-git-send-email-alevy@redhat.com> References: <1330118525-14522-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/4] monitor, console: add QEVENT_SCREEN_DUMP_COMPLETE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Alon Levy --- QMP/qmp-events.txt | 14 ++++++++++++++ console.c | 18 ++++++++++++++++++ console.h | 1 + monitor.c | 2 ++ monitor.h | 1 + 5 files changed, 36 insertions(+), 0 deletions(-) diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt index 9286af5..0d1c9f4 100644 --- a/QMP/qmp-events.txt +++ b/QMP/qmp-events.txt @@ -335,3 +335,17 @@ Example: "len": 10737418240, "offset": 134217728, "speed": 0 }, "timestamp": { "seconds": 1267061043, "microseconds": 959568 } } + +SCREEN_DUMP_COMPLETE +-------------------- + +Emitted when screen-dump-async completes. + +Data: + +- "filename": Name of file containing screen dump (json-string) + +Example: + +{ "event": "SCREEN_DUMP_COMPLETE", + "data": { "filename": "/tmp/a.ppm" } } diff --git a/console.c b/console.c index 6a463f5..6750538 100644 --- a/console.c +++ b/console.c @@ -24,6 +24,8 @@ #include "qemu-common.h" #include "console.h" #include "qemu-timer.h" +#include "qjson.h" +#include "monitor.h" //#define DEBUG_CONSOLE #define DEFAULT_BACKSCROLL 512 @@ -1707,3 +1709,19 @@ PixelFormat qemu_default_pixelformat(int bpp) } return pf; } + +void monitor_protocol_screen_dump_complete_event(const char *filename) +{ + QObject *event_data; + /* + * TODO: Only good for a single user, or a very aware user + * that changes the filename to distinguish between different + * screendumps. + * Should include support for different monitors on the same device, + * and for different devices. Got stuck trying to figure a canonical string + * represnetation of a device. + */ + event_data = qobject_from_jsonf("{ 'filename': %s }", filename); + monitor_protocol_event(QEVENT_SCREEN_DUMP_COMPLETE, event_data); + qobject_decref(event_data); +} diff --git a/console.h b/console.h index a95b581..c22803c 100644 --- a/console.h +++ b/console.h @@ -353,6 +353,7 @@ void vga_hw_update(void); void vga_hw_invalidate(void); void vga_hw_screen_dump(const char *filename); void vga_hw_text_update(console_ch_t *chardata); +void monitor_protocol_screen_dump_complete_event(const char *filename); int is_graphic_console(void); int is_fixedsize_console(void); diff --git a/monitor.c b/monitor.c index 953e748..1a65c41 100644 --- a/monitor.c +++ b/monitor.c @@ -493,6 +493,8 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) break; case QEVENT_WAKEUP: event_name = "WAKEUP"; + case QEVENT_SCREEN_DUMP_COMPLETE: + event_name = "SCREEN_DUMP_COMPLETE"; break; default: abort(); diff --git a/monitor.h b/monitor.h index 0d49800..227ebf2 100644 --- a/monitor.h +++ b/monitor.h @@ -41,6 +41,7 @@ typedef enum MonitorEvent { QEVENT_DEVICE_TRAY_MOVED, QEVENT_SUSPEND, QEVENT_WAKEUP, + QEVENT_SCREEN_DUMP_COMPLETE, QEVENT_MAX, } MonitorEvent;