From patchwork Wed Apr 24 15:32:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Hrdina X-Patchwork-Id: 239246 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 968FB2C010F for ; Thu, 25 Apr 2013 01:50:43 +1000 (EST) Received: from localhost ([::1]:47161 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UV1is-0001yC-GY for incoming@patchwork.ozlabs.org; Wed, 24 Apr 2013 11:35:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UV1gu-0007X3-4n for qemu-devel@nongnu.org; Wed, 24 Apr 2013 11:33:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UV1gs-0004A7-NY for qemu-devel@nongnu.org; Wed, 24 Apr 2013 11:33:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12960) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UV1gs-0004A2-FL for qemu-devel@nongnu.org; Wed, 24 Apr 2013 11:33:02 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3OFWdCW030255 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 24 Apr 2013 11:32:39 -0400 Received: from localhost.localdomain.com (dhcp-27-230.brq.redhat.com [10.34.27.230]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r3OFWDGT029227; Wed, 24 Apr 2013 11:32:37 -0400 From: Pavel Hrdina To: qemu-devel@nongnu.org Date: Wed, 24 Apr 2013 17:32:10 +0200 Message-Id: <4005dc5b85b72baf5eda7258f65d2c5f2ad33cad.1366817130.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, phrdina@redhat.com, armbru@redhat.com, lcapitulino@redhat.com, xiawenc@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v2 12/12] savevm: remove backward compatibility from bdrv_snapshot_find() 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: Pavel Hrdina --- savevm.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/savevm.c b/savevm.c index 2e849b8..45d46c6 100644 --- a/savevm.c +++ b/savevm.c @@ -2263,8 +2263,7 @@ out: } static bool bdrv_snapshot_find(BlockDriverState *bs, QEMUSnapshotInfo *sn_info, - const char *name, const char *id, Error **errp, - bool old_match) + const char *name, const char *id, Error **errp) { QEMUSnapshotInfo *sn_tab, *sn; Error *local_err = NULL; @@ -2293,20 +2292,10 @@ static bool bdrv_snapshot_find(BlockDriverState *bs, QEMUSnapshotInfo *sn_info, break; } } else if (name) { - /* for compatibility for old bdrv_snapshot_find call - * will be removed */ - if (old_match) { - if (!strcmp(sn->id_str, name) || !strcmp(sn->name, name)) { - *sn_info = *sn; - found = true; - break; - } - } else { - if (!strcmp(sn->name, name)) { - *sn_info = *sn; - found = true; - break; - } + if (!strcmp(sn->name, name)) { + *sn_info = *sn; + found = true; + break; } } else if (id) { if (!strcmp(sn->id_str, id)) { @@ -2369,7 +2358,7 @@ SnapshotInfo *qmp_vm_snapshot_save(const char *name, Error **errp) sn->date_nsec = tv.tv_usec * 1000; sn->vm_clock_nsec = qemu_get_clock_ns(vm_clock); - if (bdrv_snapshot_find(bs, old_sn, name, NULL, NULL, false)) { + if (bdrv_snapshot_find(bs, old_sn, name, NULL, NULL)) { error_setg(errp, "Snapshot '%s' exists", name); goto the_end; } else { @@ -2478,7 +2467,7 @@ SnapshotInfo *qmp_vm_snapshot_load(bool has_name, const char *name, } /* Don't even try to load empty VM states */ - if (!bdrv_snapshot_find(bs_vm_state, &sn, name, id, &local_err, false)) { + if (!bdrv_snapshot_find(bs_vm_state, &sn, name, id, &local_err)) { error_setg(errp, "Snapshot doesn't exist: %s", error_get_pretty(local_err)); error_free(local_err); @@ -2506,7 +2495,7 @@ SnapshotInfo *qmp_vm_snapshot_load(bool has_name, const char *name, return NULL; } - if (!bdrv_snapshot_find(bs, &sn, name, id, &local_err, false)) { + if (!bdrv_snapshot_find(bs, &sn, name, id, &local_err)) { error_setg(errp, "Snapshot doesn't exist for device '%s': %s", bdrv_get_device_name(bs), error_get_pretty(local_err)); error_free(local_err); @@ -2599,7 +2588,7 @@ SnapshotInfo *qmp_vm_snapshot_delete(const bool has_name, const char *name, return NULL; } - if (!bdrv_snapshot_find(bs, &sn, name, id, &local_err, false)) { + if (!bdrv_snapshot_find(bs, &sn, name, id, &local_err)) { error_propagate(errp, local_err); return NULL; } @@ -2616,7 +2605,7 @@ SnapshotInfo *qmp_vm_snapshot_delete(const bool has_name, const char *name, bs = NULL; while ((bs = bdrv_next(bs))) { if (bdrv_can_snapshot(bs) && - bdrv_snapshot_find(bs, &sn, name, id, NULL, false)) { + bdrv_snapshot_find(bs, &sn, name, id, NULL)) { /* Small hack to ensure that proper snapshot is deleted for every * block driver. This will be fixed soon. */ if (!strcmp(bs->drv->format_name, "rbd")) { @@ -2678,8 +2667,8 @@ void do_info_snapshots(Monitor *mon, const QDict *qdict) while ((bs1 = bdrv_next(bs1))) { if (bdrv_can_snapshot(bs1) && bs1 != bs) { - if (!bdrv_snapshot_find(bs1, sn_info, sn->id_str, NULL, NULL, - true)) { + if (!bdrv_snapshot_find(bs1, sn_info, sn->name, sn->id_str, + NULL)) { available = 0; break; }