From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2U1s-0002N3-Pw for qemu-devel@nongnu.org; Tue, 28 Feb 2012 15:52:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S2U1X-0000nD-IU for qemu-devel@nongnu.org; Tue, 28 Feb 2012 15:52:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2U1X-0000mr-9f for qemu-devel@nongnu.org; Tue, 28 Feb 2012 15:51:51 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1SKpnS3023400 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 28 Feb 2012 15:51:49 -0500 Date: Tue, 28 Feb 2012 22:51:44 +0200 From: Alon Levy Message-ID: <20120228205144.GC8200@garlic> References: <1330118525-14522-1-git-send-email-alevy@redhat.com> <1330118525-14522-3-git-send-email-alevy@redhat.com> <20120228170113.1a5d59c6@doriath.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120228170113.1a5d59c6@doriath.home> Subject: Re: [Qemu-devel] [PATCH 3/4] monitor, console: add QEVENT_SCREEN_DUMP_COMPLETE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: armbru@redhat.com, qemu-devel@nongnu.org, kraxel@redhat.com On Tue, Feb 28, 2012 at 05:01:13PM -0300, Luiz Capitulino wrote: > On Fri, 24 Feb 2012 23:22:04 +0200 > Alon Levy wrote: > > > 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" } } > > This example is incomplete, a QMP event contains more fields. timestamp, right? > > > 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. > > This comment pertains to the event documentation. Move to documentation, check. > > > + * 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. > > + */ > > I think the above comment is not worth it. This half of the comment? ok. > > > + 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; > > >