From patchwork Thu Feb 11 01:49:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 45094 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 376E1B7C33 for ; Thu, 11 Feb 2010 13:17:08 +1100 (EST) Received: from localhost ([127.0.0.1]:34701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfOas-0007Mn-J9 for incoming@patchwork.ozlabs.org; Wed, 10 Feb 2010 21:15:50 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NfOCi-000773-Ie for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:52 -0500 Received: from [199.232.76.173] (port=57747 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfOCi-00076U-7P for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:52 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NfOCg-0001Ja-Vt for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54077) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NfOCg-0001JW-Ky for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:50 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1B1onPs006570 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Feb 2010 20:50:49 -0500 Received: from localhost (vpn-10-105.rdu.redhat.com [10.11.10.105]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o1B1okSg017206; Wed, 10 Feb 2010 20:50:47 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 10 Feb 2010 23:49:59 -0200 Message-Id: <1265853007-27300-14-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1265853007-27300-1-git-send-email-lcapitulino@redhat.com> References: <1265853007-27300-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: armbru@redhat.com Subject: [Qemu-devel] [PATCH 13/21] Monitor: Convert do_physical_memory_save() to cmd_new_ret() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Luiz Capitulino --- monitor.c | 9 +++++++-- qemu-monitor.hx | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 7747449..3470b0b 100644 --- a/monitor.c +++ b/monitor.c @@ -1466,7 +1466,7 @@ exit: return ret; } -static void do_physical_memory_save(Monitor *mon, const QDict *qdict, +static int do_physical_memory_save(Monitor *mon, const QDict *qdict, QObject **ret_data) { FILE *f; @@ -1475,11 +1475,12 @@ static void do_physical_memory_save(Monitor *mon, const QDict *qdict, uint32_t size = qdict_get_int(qdict, "size"); const char *filename = qdict_get_str(qdict, "filename"); target_phys_addr_t addr = qdict_get_int(qdict, "val"); + int ret = -1; f = fopen(filename, "wb"); if (!f) { qemu_error_new(QERR_OPEN_FILE_FAILED, filename); - return; + return -1; } while (size != 0) { l = sizeof(buf); @@ -1494,8 +1495,12 @@ static void do_physical_memory_save(Monitor *mon, const QDict *qdict, addr += l; size -= l; } + + ret = 0; + exit: fclose(f); + return ret; } static void do_sum(Monitor *mon, const QDict *qdict) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 5995cef..5ae1969 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -720,7 +720,7 @@ ETEXI .params = "addr size file", .help = "save to disk physical memory dump starting at 'addr' of size 'size'", .user_print = monitor_user_noop, - .mhandler.cmd_new = do_physical_memory_save, + .cmd_new_ret = do_physical_memory_save, }, STEXI