From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nx4HD-0006GQ-IQ for qemu-devel@nongnu.org; Wed, 31 Mar 2010 16:12:35 -0400 Received: from [140.186.70.92] (port=58115 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nx4HC-0006GC-90 for qemu-devel@nongnu.org; Wed, 31 Mar 2010 16:12:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nx4HA-00072m-O9 for qemu-devel@nongnu.org; Wed, 31 Mar 2010 16:12:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40256) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nx4HA-00072c-Go for qemu-devel@nongnu.org; Wed, 31 Mar 2010 16:12:32 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2VKCVAh005503 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 31 Mar 2010 16:12:31 -0400 Date: Wed, 31 Mar 2010 17:12:26 -0300 From: Luiz Capitulino Message-ID: <20100331171226.11f8e3c2@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] Monitor: Convert do_screen_dump() to QObject List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lmr@redhat.com Trivial, as it never fails, doesn't have output nor return any data. Note that it's also available under QMP, as kvm-autotest needs this. Signed-off-by: Luiz Capitulino --- monitor.c | 3 ++- qemu-monitor.hx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/monitor.c b/monitor.c index 389485d..d2d2504 100644 --- a/monitor.c +++ b/monitor.c @@ -1163,9 +1163,10 @@ static int do_change(Monitor *mon, const QDict *qdict, QObject **ret_data) return ret; } -static void do_screen_dump(Monitor *mon, const QDict *qdict) +static int do_screen_dump(Monitor *mon, const QDict *qdict, QObject **ret_data) { vga_hw_screen_dump(qdict_get_str(qdict, "filename")); + return 0; } static void do_logfile(Monitor *mon, const QDict *qdict) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 62fa346..5ea5748 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -199,7 +199,8 @@ ETEXI .args_type = "filename:F", .params = "filename", .help = "save screen into PPM image 'filename'", - .mhandler.cmd = do_screen_dump, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_screen_dump, }, STEXI -- 1.7.0.3.291.g5e4f6