From patchwork Thu Jan 17 07:40:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V4,12/13] hmp: switch snapshot info function to qmp based one Date: Wed, 16 Jan 2013 21:40:09 -0000 From: Wayne Xia X-Patchwork-Id: 213157 Message-Id: <1358408410-22187-13-git-send-email-xiawenc@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, phrdina@redhat.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia This patch using new added function in last commit which retrieve info from qmp for snapshot info. Note: This patch need previous hmp extention patch which enable info sub command take qdict * as paramter. Signed-off-by: Wenchao Xia --- monitor.c | 2 +- savevm.c | 64 ------------------------------------------------------------- 2 files changed, 1 insertions(+), 65 deletions(-) diff --git a/monitor.c b/monitor.c index 20bd19b..4bb80c0 100644 --- a/monitor.c +++ b/monitor.c @@ -2594,7 +2594,7 @@ static mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show the currently saved VM snapshots", - .mhandler.cmd = do_info_snapshots, + .mhandler.cmd = hmp_info_snapshots, }, { .name = "status", diff --git a/savevm.c b/savevm.c index 5607105..549d799 100644 --- a/savevm.c +++ b/savevm.c @@ -2285,70 +2285,6 @@ void do_delvm(Monitor *mon, const QDict *qdict) } } -void do_info_snapshots(Monitor *mon, const QDict *qdict) -{ - BlockDriverState *bs, *bs1; - QEMUSnapshotInfo *sn_tab, *sn, s, *sn_info = &s; - int nb_sns, i, ret, available; - int total; - int *available_snapshots; - char buf[256]; - - bs = bdrv_snapshots(); - if (!bs) { - monitor_printf(mon, "No available block device supports snapshots\n"); - return; - } - - nb_sns = bdrv_snapshot_list(bs, &sn_tab); - if (nb_sns < 0) { - monitor_printf(mon, "bdrv_snapshot_list: error %d\n", nb_sns); - return; - } - - if (nb_sns == 0) { - monitor_printf(mon, "There is no snapshot available.\n"); - return; - } - - available_snapshots = g_malloc0(sizeof(int) * nb_sns); - total = 0; - for (i = 0; i < nb_sns; i++) { - sn = &sn_tab[i]; - available = 1; - bs1 = NULL; - - while ((bs1 = bdrv_next(bs1))) { - if (bdrv_can_snapshot(bs1) && bs1 != bs) { - ret = bdrv_snapshot_find(bs1, sn_info, sn->id_str, NULL); - if (ret < 0) { - available = 0; - break; - } - } - } - - if (available) { - available_snapshots[total] = i; - total++; - } - } - - if (total > 0) { - monitor_printf(mon, "%s\n", bdrv_snapshot_dump(buf, sizeof(buf), NULL)); - for (i = 0; i < total; i++) { - sn = &sn_tab[available_snapshots[i]]; - monitor_printf(mon, "%s\n", bdrv_snapshot_dump(buf, sizeof(buf), sn)); - } - } else { - monitor_printf(mon, "There is no suitable snapshot available\n"); - } - - g_free(sn_tab); - g_free(available_snapshots); - -} - void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev) { qemu_ram_set_idstr(memory_region_get_ram_addr(mr) & TARGET_PAGE_MASK,