From patchwork Tue Jul 27 14:54:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Di Ciurcio Filho X-Patchwork-Id: 60007 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 7AE4F1007D1 for ; Wed, 28 Jul 2010 00:55:47 +1000 (EST) Received: from localhost ([127.0.0.1]:55947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdlWV-0007cV-PX for incoming@patchwork.ozlabs.org; Tue, 27 Jul 2010 10:52:51 -0400 Received: from [140.186.70.92] (port=44574 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdlW3-0007Zj-4Q for qemu-devel@nongnu.org; Tue, 27 Jul 2010 10:52:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OdlVx-0007Fi-GF for qemu-devel@nongnu.org; Tue, 27 Jul 2010 10:52:18 -0400 Received: from mail-gx0-f173.google.com ([209.85.161.173]:34870) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdlVx-0007FS-Cy for qemu-devel@nongnu.org; Tue, 27 Jul 2010 10:52:17 -0400 Received: by gxk19 with SMTP id 19so1457090gxk.4 for ; Tue, 27 Jul 2010 07:52:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=JmuBUFmVzx6Z0PXVlt4UzvGRSSqnlLBMCZv1+CZiRHQ=; b=JuYrkI6VrcHvFzaz2kTUmPcBJQhJG8A98HFmOIqRcJTmH3C3vyXx1/zwo5HohfqGDA 6S5AyNVRojqqypY5ImliG7qg1PCpiKS0YMRhl5NZXbfRBZjrOEg1luvO2QWmyAyMQqvJ 8YWv5rt6ysEahegA0xYVr1VwcT4vxc9ueUVJM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=YfhPT5JWcuIyt3CuOZkZovTiSvJVLKKwd8nq745KpJCIBpTaP2Ov4g83t4m0v8CpHP pul4vsRpKsXPjWCVJp/hHwaC7DNIamWGoQ29HrLxCOT1iBmMmpKOlq+LfpQAFOPYMXOd BxYwb40b9O5suw07a5EmZiHOASjSylui/Z11c= Received: by 10.151.24.12 with SMTP id b12mr10990235ybj.180.1280242331622; Tue, 27 Jul 2010 07:52:11 -0700 (PDT) Received: from localhost.localdomain (quake.ic.unicamp.br [143.106.7.51]) by mx.google.com with ESMTPS id q31sm7130830ybk.13.2010.07.27.07.52.00 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 27 Jul 2010 07:52:04 -0700 (PDT) From: Miguel Di Ciurcio Filho To: qemu-devel@nongnu.org Date: Tue, 27 Jul 2010 11:54:08 -0300 Message-Id: <1280242448-20775-1-git-send-email-miguel.filho@gmail.com> X-Mailer: git-send-email 1.7.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: kwolf@redhat.com, Miguel Di Ciurcio Filho , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH] monitor: make 'info snapshots' show only fully available snapshots 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 The output generated by 'info snapshots' shows only snapshots that exist on the block device that saves the VM state. This output can cause an user to erroneously try to load an snapshot that is not available on all block devices. $ qemu-img snapshot -l xxtest.qcow2 Snapshot list: ID TAG VM SIZE DATE VM CLOCK 1 1.5M 2010-07-26 16:51:52 00:00:08.599 2 1.5M 2010-07-26 16:51:53 00:00:09.719 3 1.5M 2010-07-26 17:26:49 00:00:13.245 4 1.5M 2010-07-26 19:01:00 00:00:46.763 $ qemu-img snapshot -l xxtest2.qcow2 Snapshot list: ID TAG VM SIZE DATE VM CLOCK 3 0 2010-07-26 17:26:49 00:00:13.245 4 0 2010-07-26 19:01:00 00:00:46.763 Current output: $ qemu -hda xxtest.qcow2 -hdb xxtest2.qcow2 -monitor stdio -vnc :0 QEMU 0.12.4 monitor - type 'help' for more information (qemu) info snapshots Snapshot devices: ide0-hd0 Snapshot list (from ide0-hd0): ID TAG VM SIZE DATE VM CLOCK 1 1.5M 2010-07-26 16:51:52 00:00:08.599 2 1.5M 2010-07-26 16:51:53 00:00:09.719 3 1.5M 2010-07-26 17:26:49 00:00:13.245 4 1.5M 2010-07-26 19:01:00 00:00:46.763 Snapshots 1 and 2 do not exist on xxtest2.qcow, but they are displayed anyway. This patch sumarizes the output to only show fully available snapshots. New output: (qemu) info snapshots ID TAG VM SIZE DATE VM CLOCK 3 1.5M 2010-07-26 17:26:49 00:00:13.245 4 1.5M 2010-07-26 19:01:00 00:00:46.763 Signed-off-by: Miguel Di Ciurcio Filho --- savevm.c | 65 ++++++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 45 insertions(+), 20 deletions(-) diff --git a/savevm.c b/savevm.c index 7a1de3c..be83878 100644 --- a/savevm.c +++ b/savevm.c @@ -1997,37 +1997,62 @@ void do_delvm(Monitor *mon, const QDict *qdict) void do_info_snapshots(Monitor *mon) { - BlockDriverState *bs, *bs1; - QEMUSnapshotInfo *sn_tab, *sn; - int nb_sns, i; + BlockDriverState *bs_vm_state, *bs; + 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) { + bs_vm_state = bdrv_snapshots(); + if (!bs_vm_state) { monitor_printf(mon, "No available block device supports snapshots\n"); return; } - monitor_printf(mon, "Snapshot devices:"); - bs1 = NULL; - while ((bs1 = bdrv_next(bs1))) { - if (bdrv_can_snapshot(bs1)) { - if (bs == bs1) - monitor_printf(mon, " %s", bdrv_get_device_name(bs1)); - } - } - monitor_printf(mon, "\n"); - nb_sns = bdrv_snapshot_list(bs, &sn_tab); + nb_sns = bdrv_snapshot_list(bs_vm_state, &sn_tab); if (nb_sns < 0) { monitor_printf(mon, "bdrv_snapshot_list: error %d\n", nb_sns); return; + } else if (nb_sns == 0) { + monitor_printf(mon, "There is no snapshot available.\n"); } - monitor_printf(mon, "Snapshot list (from %s):\n", - bdrv_get_device_name(bs)); - monitor_printf(mon, "%s\n", bdrv_snapshot_dump(buf, sizeof(buf), NULL)); - for(i = 0; i < nb_sns; i++) { + + available_snapshots = qemu_mallocz(sizeof(int) * nb_sns); + total = 0; + for (i = 0; i < nb_sns; i++) { sn = &sn_tab[i]; - monitor_printf(mon, "%s\n", bdrv_snapshot_dump(buf, sizeof(buf), sn)); + available = 1; + bs = NULL; + + while ((bs = bdrv_next(bs))) { + if (bdrv_can_snapshot(bs) && bs != bs_vm_state) { + ret = bdrv_snapshot_find(bs, sn_info, sn->id_str); + 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)); + } + + qemu_free(available_snapshots); + + } else { + monitor_printf(mon, "There is no suitable snapshot available to be loaded.\n"); + } + qemu_free(sn_tab); }