From patchwork Tue Apr 20 21:09:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 50592 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 E64C1B7D0C for ; Wed, 21 Apr 2010 07:52:47 +1000 (EST) Received: from localhost ([127.0.0.1]:35443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4LLP-0001ZV-Uu for incoming@patchwork.ozlabs.org; Tue, 20 Apr 2010 17:50:59 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4KiQ-0007Kj-Av for qemu-devel@nongnu.org; Tue, 20 Apr 2010 17:10:42 -0400 Received: from [140.186.70.92] (port=37534 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4KiO-0007JY-LO for qemu-devel@nongnu.org; Tue, 20 Apr 2010 17:10:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4KiL-00042K-Jo for qemu-devel@nongnu.org; Tue, 20 Apr 2010 17:10:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49961) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4KiK-00042A-Mf for qemu-devel@nongnu.org; Tue, 20 Apr 2010 17:10:37 -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.13.8/8.13.8) with ESMTP id o3KLAZNR018389 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 20 Apr 2010 17:10:36 -0400 Received: from localhost (vpn-9-57.rdu.redhat.com [10.11.9.57]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3KLAYF7031360; Tue, 20 Apr 2010 17:10:35 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org, armbru@redhat.com, quintela@redhat.com, kwolf@redhat.com Date: Tue, 20 Apr 2010 18:09:47 -0300 Message-Id: <1271797792-24571-18-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1271797792-24571-1-git-send-email-lcapitulino@redhat.com> References: <1271797792-24571-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH 17/22] savevm: delete_snapshot(): Remove unused parameter 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 parameter 'mon' is unused after the conversion to QError, done by the previous commit. Signed-off-by: Luiz Capitulino --- savevm.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/savevm.c b/savevm.c index 55cf848..643273e 100644 --- a/savevm.c +++ b/savevm.c @@ -1619,8 +1619,7 @@ static int bdrv_snapshot_find(BlockDriverState *bs, QEMUSnapshotInfo *sn_info, return ret; } -static int delete_snapshot(Monitor *mon, BlockDriverState *bs, - const char *name) +static int delete_snapshot(BlockDriverState *bs, const char *name) { int ret; @@ -1643,7 +1642,7 @@ static int delete_snapshot(Monitor *mon, BlockDriverState *bs, /* * Deletes snapshots of a given name in all opened images. */ -static int del_existing_snapshots(Monitor *mon, const char *name) +static int del_existing_snapshots(const char *name) { BlockDriverState *bs; DriveInfo *dinfo; @@ -1655,7 +1654,7 @@ static int del_existing_snapshots(Monitor *mon, const char *name) if (bdrv_can_snapshot(bs) && bdrv_snapshot_find(bs, snapshot, name) >= 0) { - ret = delete_snapshot(mon, bs, name); + ret = delete_snapshot(bs, name); if (ret < 0) { return -1; } @@ -1717,7 +1716,7 @@ void do_savevm(Monitor *mon, const QDict *qdict) sn->vm_clock_nsec = qemu_get_clock(vm_clock); /* Delete old snapshots of the same name */ - if (name && del_existing_snapshots(mon, name) < 0) { + if (name && del_existing_snapshots(name) < 0) { goto the_end; } @@ -1831,7 +1830,7 @@ void do_delvm(Monitor *mon, const QDict *qdict) QTAILQ_FOREACH(dinfo, &drives, next) { bs1 = dinfo->bdrv; if (bdrv_has_snapshot(bs1)) { - delete_snapshot(mon, bs1, name); + delete_snapshot(bs1, name); } } }