From patchwork Tue Apr 20 21:09:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 50599 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 5D878B7D0C for ; Wed, 21 Apr 2010 08:10:01 +1000 (EST) Received: from localhost ([127.0.0.1]:32947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4LSR-0005Qu-7U for incoming@patchwork.ozlabs.org; Tue, 20 Apr 2010 17:58:15 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4KiU-0007Mz-Kq for qemu-devel@nongnu.org; Tue, 20 Apr 2010 17:10:46 -0400 Received: from [140.186.70.92] (port=37574 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4KiT-0007MI-ED for qemu-devel@nongnu.org; Tue, 20 Apr 2010 17:10:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4KiR-00043e-NB for qemu-devel@nongnu.org; Tue, 20 Apr 2010 17:10:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25288) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4KiR-00043U-5J for qemu-devel@nongnu.org; Tue, 20 Apr 2010 17:10:43 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3KLAgZr018395 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 20 Apr 2010 17:10:42 -0400 Received: from localhost (vpn-9-57.rdu.redhat.com [10.11.9.57]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3KLAfmX021703; Tue, 20 Apr 2010 17:10:41 -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:50 -0300 Message-Id: <1271797792-24571-21-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.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH 20/22] savevm: Convert do_savevm() to QObject 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 Signed-off-by: Luiz Capitulino --- qemu-monitor.hx | 3 ++- savevm.c | 7 +++++-- sysemu.h | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 71cb1a2..9a699d4 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -242,7 +242,8 @@ ETEXI .args_type = "name:s?", .params = "[tag|id]", .help = "save a VM snapshot. If no tag or id are provided, a new snapshot is created", - .mhandler.cmd = do_savevm, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_savevm, }, STEXI diff --git a/savevm.c b/savevm.c index 8a9e9d1..39a935d 100644 --- a/savevm.c +++ b/savevm.c @@ -1664,7 +1664,7 @@ static int del_existing_snapshots(const char *name) return 0; } -void do_savevm(Monitor *mon, const QDict *qdict) +int do_savevm(Monitor *mon, const QDict *qdict, QObject **ret_data) { DriveInfo *dinfo; BlockDriverState *bs, *bs1; @@ -1683,7 +1683,7 @@ void do_savevm(Monitor *mon, const QDict *qdict) bs = get_bs_snapshots(); if (!bs) { qerror_report(QERR_SNAPSHOT_NO_DEVICE); - return; + return -1; } /* ??? Should this occur after vm_stop? */ @@ -1717,6 +1717,7 @@ void do_savevm(Monitor *mon, const QDict *qdict) /* Delete old snapshots of the same name */ if (name && del_existing_snapshots(name) < 0) { + ret = -1; goto the_end; } @@ -1739,6 +1740,7 @@ void do_savevm(Monitor *mon, const QDict *qdict) sn->vm_state_size = (bs == bs1 ? vm_state_size : 0); ret = bdrv_snapshot_create(bs1, sn); if (ret < 0) { + /* FIXME: will report multiple failures in QMP */ qerror_report(QERR_SNAPSHOT_CREATE_FAILED, bdrv_get_device_name(bs1), get_errno_string(ret)); } @@ -1748,6 +1750,7 @@ void do_savevm(Monitor *mon, const QDict *qdict) the_end: if (saved_vm_running) vm_start(); + return (ret < 0 ? -1 : 0); } int load_vmstate(const char *name) diff --git a/sysemu.h b/sysemu.h index ee14b8c..8d8bb64 100644 --- a/sysemu.h +++ b/sysemu.h @@ -53,7 +53,7 @@ int qemu_exit_requested(void); extern qemu_irq qemu_system_powerdown; void qemu_system_reset(void); -void do_savevm(Monitor *mon, const QDict *qdict); +int do_savevm(Monitor *mon, const QDict *qdict, QObject **ret_data); int load_vmstate(const char *name); int do_delvm(Monitor *mon, const QDict *qdict, QObject **ret_data); void do_info_snapshots(Monitor *mon);