move do_loadvm() to monitor.c

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/monitor.c b/monitor.c
index 967171bcc69600a50e12c9171990efd6ac8d2fbf..57ce68b6d13e9243b93a3c6c8ea4ef3201b235e3 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -1721,6 +1721,17 @@ static void do_closefd(Monitor *mon, const char *fdname)
                    fdname);
 }
 
+static void do_loadvm(Monitor *mon, const char *name)
+{
+    int saved_vm_running  = vm_running;
+
+    vm_stop(0);
+
+    load_vmstate(mon, name);
+    if (saved_vm_running)
+        vm_start();
+}
+
 int monitor_get_fd(Monitor *mon, const char *fdname)
 {
     mon_fd_t *monfd;

diff --git a/savevm.c b/savevm.c
index 95947a9495992c3a4d481d3eb832ed13a6db67b5..f14487cad265bfe020abc8a8f209fb1647a633d5 100644 (file)
--- a/savevm.c
+++ b/savevm.c
@@ -1239,17 +1239,6 @@ void load_vmstate(Monitor *mon, const char *name)
     }
 }
 
-void do_loadvm(Monitor *mon, const char *name)
-{
-    int saved_vm_running  = vm_running;
-
-    vm_stop(0);
-
-    load_vmstate(mon, name);
-    if (saved_vm_running)
-        vm_start();
-}
-
 void do_delvm(Monitor *mon, const char *name)
 {
     DriveInfo *dinfo;

diff --git a/sysemu.h b/sysemu.h
index b2fc92efcf74448c8e486e69cebdaab6a9ede113..cabe79d36b8ff5dc5de4f72da0da110fb36330d1 100644 (file)
--- a/sysemu.h
+++ b/sysemu.h
@@ -51,7 +51,6 @@ extern qemu_irq qemu_system_powerdown;
 void qemu_system_reset(void);
 
 void do_savevm(Monitor *mon, const char *name);
-void do_loadvm(Monitor *mon, const char *name);
 void load_vmstate(Monitor *mon, const char *name);
 void do_delvm(Monitor *mon, const char *name);
 void do_info_snapshots(Monitor *mon);