From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8CWh-0007gE-RX for qemu-devel@nongnu.org; Thu, 15 Mar 2012 11:23:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S8CWE-0006KQ-Md for qemu-devel@nongnu.org; Thu, 15 Mar 2012 11:23:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33857) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8CWE-0006Jw-Dm for qemu-devel@nongnu.org; Thu, 15 Mar 2012 11:23:10 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2FFN9h8012311 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 15 Mar 2012 11:23:09 -0400 Date: Thu, 15 Mar 2012 17:23:01 +0200 From: Alon Levy Message-ID: <20120315152301.GP5895@garlic.tlv.redhat.com> References: <1331765714-26209-1-git-send-email-alevy@redhat.com> <1331765714-26209-4-git-send-email-alevy@redhat.com> <20120315115531.3f63b29a@doriath.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120315115531.3f63b29a@doriath.home> Subject: Re: [Qemu-devel] [PATCH v2 3/5] qapi: convert screendump List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: mlureau@redhat.com, qemu-devel@nongnu.org On Thu, Mar 15, 2012 at 11:55:31AM -0300, Luiz Capitulino wrote: > On Thu, 15 Mar 2012 00:55:12 +0200 > Alon Levy wrote: > > > Signed-off-by: Alon Levy > > --- > > hmp-commands.hx | 3 +-- > > hmp.c | 8 ++++++++ > > hmp.h | 1 + > > monitor.c | 8 -------- > > qapi-schema.json | 13 +++++++++++++ > > qmp-commands.hx | 5 +---- > > qmp.c | 5 +++++ > > 7 files changed, 29 insertions(+), 14 deletions(-) > > > > diff --git a/hmp-commands.hx b/hmp-commands.hx > > index 6980214..d26421a 100644 > > --- a/hmp-commands.hx > > +++ b/hmp-commands.hx > > @@ -194,8 +194,7 @@ ETEXI > > .args_type = "filename:F", > > .params = "filename", > > .help = "save screen into PPM image 'filename'", > > - .user_print = monitor_user_noop, > > - .mhandler.cmd_new = do_screen_dump, > > + .mhandler.cmd = hmp_screendump, > > }, > > > > STEXI > > diff --git a/hmp.c b/hmp.c > > index 290c43d..42dc79a 100644 > > --- a/hmp.c > > +++ b/hmp.c > > @@ -860,3 +860,11 @@ void hmp_block_job_cancel(Monitor *mon, const QDict *qdict) > > > > hmp_handle_error(mon, &error); > > } > > + > > +void hmp_screendump(Monitor *mon, const QDict *qdict) > > +{ > > + Error *err = NULL; > > + > > + qmp_screendump(qdict_get_str(qdict, "filename"), &err); > > + hmp_handle_error(mon, &err); > > +} > > diff --git a/hmp.h b/hmp.h > > index 5409464..25d123f 100644 > > --- a/hmp.h > > +++ b/hmp.h > > @@ -59,5 +59,6 @@ void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict); > > void hmp_block_stream(Monitor *mon, const QDict *qdict); > > void hmp_block_job_set_speed(Monitor *mon, const QDict *qdict); > > void hmp_block_job_cancel(Monitor *mon, const QDict *qdict); > > +void hmp_screendump(Monitor *mon, const QDict *qdict); > > > > #endif > > diff --git a/monitor.c b/monitor.c > > index 79399ab..f79ce9a 100644 > > --- a/monitor.c > > +++ b/monitor.c > > @@ -893,14 +893,6 @@ static int client_migrate_info(Monitor *mon, const QDict *qdict, > > return -1; > > } > > > > -static int do_screen_dump(Monitor *mon, const QDict *qdict, QObject **ret_data) > > -{ > > - Error *errp = NULL; > > - > > - vga_hw_screen_dump(qdict_get_str(qdict, "filename"), &errp); > > - return 0; > > -} > > - > > static void do_logfile(Monitor *mon, const QDict *qdict) > > { > > cpu_set_log_filename(qdict_get_str(qdict, "filename")); > > diff --git a/qapi-schema.json b/qapi-schema.json > > index 04fa84f..4f251ca 100644 > > --- a/qapi-schema.json > > +++ b/qapi-schema.json > > @@ -1663,3 +1663,16 @@ > > { 'command': 'qom-list-types', > > 'data': { '*implements': 'str', '*abstract': 'bool' }, > > 'returns': [ 'ObjectTypeInfo' ] } > > + > > +## > > +# @screendump: > > +# > > +# Write a PPM of the VGA screen to a file. > > +# > > +# @filename: the name of a new PPM file to create to store the image > > +# > > +# Returns: Nothing on success > > Note that you have to document all the _possible_ errors. Look for other > examples in this file. Yes, forgot about that. Another reason to split the other users of qerr_fopen_err then :) > > > +# > > +# Since: 1.1 > > +## > > +{ 'command': 'screendump', 'data': {'filename': 'str'} } > > diff --git a/qmp-commands.hx b/qmp-commands.hx > > index dfe8a5b..5fe57fd 100644 > > --- a/qmp-commands.hx > > +++ b/qmp-commands.hx > > @@ -146,10 +146,7 @@ EQMP > > { > > .name = "screendump", > > .args_type = "filename:F", > > - .params = "filename", > > - .help = "save screen into PPM image 'filename'", > > - .user_print = monitor_user_noop, > > - .mhandler.cmd_new = do_screen_dump, > > + .mhandler.cmd_new = qmp_marshal_input_screendump, > > }, > > > > SQMP > > diff --git a/qmp.c b/qmp.c > > index a182b51..086cec8 100644 > > --- a/qmp.c > > +++ b/qmp.c > > @@ -415,3 +415,8 @@ ObjectTypeInfoList *qmp_qom_list_types(bool has_implements, > > > > return ret; > > } > > + > > +void qmp_screendump(const char *filename, Error **errp) > > +{ > > + vga_hw_screen_dump(filename, errp); > > +} > >