From fe38a32acc6d1fb62ed74c351c1cc1d992aa8c50 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Wed, 10 Feb 2010 23:49:59 -0200 Subject: [PATCH] Monitor: Convert do_physical_memory_save() to cmd_new_ret() Signed-off-by: Luiz Capitulino Signed-off-by: Anthony Liguori --- 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 -- 2.7.4