From patchwork Mon Dec 5 20:00:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 129406 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 4761E1007D5 for ; Tue, 6 Dec 2011 07:01:17 +1100 (EST) Received: from localhost ([::1]:37432 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXeiw-0003As-JD for incoming@patchwork.ozlabs.org; Mon, 05 Dec 2011 15:01:14 -0500 Received: from eggs.gnu.org ([140.186.70.92]:41719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXeiX-0002dA-Ex for qemu-devel@nongnu.org; Mon, 05 Dec 2011 15:00:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXeiR-0005yy-Po for qemu-devel@nongnu.org; Mon, 05 Dec 2011 15:00:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXeiR-0005yi-GT for qemu-devel@nongnu.org; Mon, 05 Dec 2011 15:00:43 -0500 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 pB5K0fFa018203 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Dec 2011 15:00:41 -0500 Received: from localhost (ovpn-113-50.phx2.redhat.com [10.3.113.50]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pB5K0eF0012257; Mon, 5 Dec 2011 15:00:40 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 5 Dec 2011 18:00:15 -0200 Message-Id: <1323115226-16817-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1323115226-16817-1-git-send-email-lcapitulino@redhat.com> References: <1323115226-16817-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 05/16] qapi: Convert pmemsave 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: Anthony Liguori Signed-off-by: Luiz Capitulino --- cpus.c | 30 ++++++++++++++++++++++++++++++ hmp-commands.hx | 3 +-- hmp.c | 11 +++++++++++ hmp.h | 1 + monitor.c | 37 ------------------------------------- qapi-schema.json | 22 ++++++++++++++++++++++ qmp-commands.hx | 5 +---- 7 files changed, 66 insertions(+), 43 deletions(-) diff --git a/cpus.c b/cpus.c index 0f2ce60..e916137 100644 --- a/cpus.c +++ b/cpus.c @@ -1183,3 +1183,33 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename, exit: fclose(f); } + +void qmp_pmemsave(int64_t addr, int64_t size, const char *filename, + Error **errp) +{ + FILE *f; + uint32_t l; + uint8_t buf[1024]; + + f = fopen(filename, "wb"); + if (!f) { + error_set(errp, QERR_OPEN_FILE_FAILED, filename); + return; + } + + while (size != 0) { + l = sizeof(buf); + if (l > size) + l = size; + cpu_physical_memory_rw(addr, buf, l, 0); + if (fwrite(buf, 1, l, f) != l) { + error_set(errp, QERR_IO_ERROR); + goto exit; + } + addr += l; + size -= l; + } + +exit: + fclose(f); +} diff --git a/hmp-commands.hx b/hmp-commands.hx index dac0b47..0a721cc 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -703,8 +703,7 @@ ETEXI .args_type = "val:l,size:i,filename:s", .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, + .mhandler.cmd = hmp_pmemsave, }, STEXI diff --git a/hmp.c b/hmp.c index 67b3eb3..96e3ce1 100644 --- a/hmp.c +++ b/hmp.c @@ -550,3 +550,14 @@ void hmp_memsave(Monitor *mon, const QDict *qdict) qmp_memsave(addr, size, filename, true, monitor_get_cpu_index(), &errp); hmp_handle_error(mon, &errp); } + +void hmp_pmemsave(Monitor *mon, const QDict *qdict) +{ + uint32_t size = qdict_get_int(qdict, "size"); + const char *filename = qdict_get_str(qdict, "filename"); + uint64_t addr = qdict_get_int(qdict, "val"); + Error *errp = NULL; + + qmp_pmemsave(addr, size, filename, &errp); + hmp_handle_error(mon, &errp); +} diff --git a/hmp.h b/hmp.h index dd8ad0c..4882bea 100644 --- a/hmp.h +++ b/hmp.h @@ -38,5 +38,6 @@ void hmp_system_reset(Monitor *mon, const QDict *qdict); void hmp_system_powerdown(Monitor *mon, const QDict *qdict); void hmp_cpu(Monitor *mon, const QDict *qdict); void hmp_memsave(Monitor *mon, const QDict *qdict); +void hmp_pmemsave(Monitor *mon, const QDict *qdict); #endif diff --git a/monitor.c b/monitor.c index 7272014..a1b46b3 100644 --- a/monitor.c +++ b/monitor.c @@ -1370,43 +1370,6 @@ static void do_print(Monitor *mon, const QDict *qdict) monitor_printf(mon, "\n"); } -static int do_physical_memory_save(Monitor *mon, const QDict *qdict, - QObject **ret_data) -{ - FILE *f; - uint32_t l; - uint8_t buf[1024]; - 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) { - qerror_report(QERR_OPEN_FILE_FAILED, filename); - return -1; - } - while (size != 0) { - l = sizeof(buf); - if (l > size) - l = size; - cpu_physical_memory_read(addr, buf, l); - if (fwrite(buf, 1, l, f) != l) { - monitor_printf(mon, "fwrite() error in do_physical_memory_save\n"); - goto exit; - } - fflush(f); - addr += l; - size -= l; - } - - ret = 0; - -exit: - fclose(f); - return ret; -} - static void do_sum(Monitor *mon, const QDict *qdict) { uint32_t addr; diff --git a/qapi-schema.json b/qapi-schema.json index dbf6170..7f9aa94 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -927,3 +927,25 @@ ## { 'command': 'memsave', 'data': {'val': 'int', 'size': 'int', 'filename': 'str', '*cpu-index': 'int'} } + +## +# @pmemsave: +# +# Save a portion of guest physical memory to a file. +# +# @val: the physical address of the guest to start from +# +# @size: the size of memory region to save +# +# @filename: the file to save the memory to as binary data +# +# Returns: Nothing on success +# If @filename cannot be opened, OpenFileFailed +# If an I/O error occurs while writing the file, IOError +# +# Since: 0.14.0 +# +# Notes: Errors were not reliably returned until 1.1 +## +{ 'command': 'pmemsave', + 'data': {'val': 'int', 'size': 'int', 'filename': 'str'} } diff --git a/qmp-commands.hx b/qmp-commands.hx index 0e2f392..5093ac9 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -382,10 +382,7 @@ EQMP { .name = "pmemsave", .args_type = "val:l,size:i,filename:s", - .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, + .mhandler.cmd_new = qmp_marshal_input_pmemsave, }, SQMP