From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIHgr-0001vK-6M for qemu-devel@nongnu.org; Fri, 15 Aug 2014 09:37:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XIHgg-00066D-3x for qemu-devel@nongnu.org; Fri, 15 Aug 2014 09:37:09 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:42477 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIHgf-00064q-UU for qemu-devel@nongnu.org; Fri, 15 Aug 2014 09:36:58 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Fri, 15 Aug 2014 15:35:47 +0200 Message-Id: <1408109759-1100-16-git-send-email-benoit.canet@nodalink.com> In-Reply-To: <1408109759-1100-1-git-send-email-benoit.canet@nodalink.com> References: <1408109759-1100-1-git-send-email-benoit.canet@nodalink.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 15/26] monitor: Move do_loadvm from monitor.c to monitor-system.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Signed-off-by: Beno=C3=AEt Canet --- monitor-system.c | 12 ++++++++++++ monitor.c | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/monitor-system.c b/monitor-system.c index a87203c..b6f33a7 100644 --- a/monitor-system.c +++ b/monitor-system.c @@ -1400,3 +1400,15 @@ void do_inject_mce(Monitor *mon, const QDict *qdic= t) } } #endif + +void do_loadvm(Monitor *mon, const QDict *qdict) +{ + int saved_vm_running =3D runstate_is_running(); + const char *name =3D qdict_get_str(qdict, "name"); + + vm_stop(RUN_STATE_RESTORE_VM); + + if (load_vmstate(name) =3D=3D 0 && saved_vm_running) { + vm_start(); + } +} diff --git a/monitor.c b/monitor.c index be63688..5017ecf 100644 --- a/monitor.c +++ b/monitor.c @@ -827,18 +827,6 @@ void qmp_closefd(const char *fdname, Error **errp) error_set(errp, QERR_FD_NOT_FOUND, fdname); } =20 -void do_loadvm(Monitor *mon, const QDict *qdict) -{ - int saved_vm_running =3D runstate_is_running(); - const char *name =3D qdict_get_str(qdict, "name"); - - vm_stop(RUN_STATE_RESTORE_VM); - - if (load_vmstate(name) =3D=3D 0 && saved_vm_running) { - vm_start(); - } -} - int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) { mon_fd_t *monfd; --=20 2.1.0.rc1