From patchwork Tue Apr 20 21:09:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 50595 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 AFA2AB7D0B for ; Wed, 21 Apr 2010 08:01:37 +1000 (EST) Received: from localhost ([127.0.0.1]:49175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4LVe-0006Iw-8R for incoming@patchwork.ozlabs.org; Tue, 20 Apr 2010 18:01:34 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4Kic-0007Rv-PN for qemu-devel@nongnu.org; Tue, 20 Apr 2010 17:10:54 -0400 Received: from [140.186.70.92] (port=37625 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4Kib-0007RJ-Ej for qemu-devel@nongnu.org; Tue, 20 Apr 2010 17:10:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4KiZ-00045T-3h for qemu-devel@nongnu.org; Tue, 20 Apr 2010 17:10:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18860) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4KiY-00045F-Ob for qemu-devel@nongnu.org; Tue, 20 Apr 2010 17:10:51 -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 o3KLAnL0017672 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 20 Apr 2010 17:10:49 -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 o3KLAkdB031383; Tue, 20 Apr 2010 17:10:47 -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:52 -0300 Message-Id: <1271797792-24571-23-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 22/22] savevm: Convert do_loadvm() 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 --- monitor.c | 7 +++++-- qemu-monitor.hx | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 542c858..32f0396 100644 --- a/monitor.c +++ b/monitor.c @@ -2465,18 +2465,21 @@ static int do_closefd(Monitor *mon, const QDict *qdict, QObject **ret_data) return -1; } -static void do_loadvm(Monitor *mon, const QDict *qdict) +static int do_loadvm(Monitor *mon, const QDict *qdict, QObject **ret_data) { + int ret; int saved_vm_running = vm_running; const char *name = qdict_get_str(qdict, "name"); vm_stop(0); - load_vmstate(name); + ret = load_vmstate(name); if (saved_vm_running) { vm_start(); } + + return (ret < 0 ? -1 : 0); } int monitor_get_fd(Monitor *mon, const char *fdname) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 9a699d4..d1d02b0 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -260,7 +260,8 @@ ETEXI .args_type = "name:s", .params = "tag|id", .help = "restore a VM snapshot from its tag or id", - .mhandler.cmd = do_loadvm, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_loadvm, }, STEXI