[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT 7b63034] split do_loadvm() into do_loadvm() and
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT 7b63034] split do_loadvm() into do_loadvm() and load_vmstate() |
Date: |
Fri, 28 Aug 2009 02:19:55 -0000 |
From: Juan Quintela <address@hidden>
do_loadvm() is now called from the monitor.
load_vmstate() is called by do_loadvm() and when -loadvm command line is used.
Command line don't have to play games with vmstop()/vmstart()
Signed-off-by: Juan Quintela <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
diff --git a/savevm.c b/savevm.c
index 4575653..95947a9 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1174,14 +1174,13 @@ void do_savevm(Monitor *mon, const char *name)
vm_start();
}
-void do_loadvm(Monitor *mon, const char *name)
+void load_vmstate(Monitor *mon, const char *name)
{
DriveInfo *dinfo;
BlockDriverState *bs, *bs1;
QEMUSnapshotInfo sn;
QEMUFile *f;
int ret;
- int saved_vm_running;
bs = get_bs_snapshots();
if (!bs) {
@@ -1192,9 +1191,6 @@ void do_loadvm(Monitor *mon, const char *name)
/* Flush all IO requests so they don't interfere with the new state. */
qemu_aio_flush();
- saved_vm_running = vm_running;
- vm_stop(0);
-
TAILQ_FOREACH(dinfo, &drives, next) {
bs1 = dinfo->bdrv;
if (bdrv_has_snapshot(bs1)) {
@@ -1220,7 +1216,7 @@ void do_loadvm(Monitor *mon, const char *name)
}
/* fatal on snapshot block device */
if (bs == bs1)
- goto the_end;
+ return;
}
}
}
@@ -1228,20 +1224,28 @@ void do_loadvm(Monitor *mon, const char *name)
/* Don't even try to load empty VM states */
ret = bdrv_snapshot_find(bs, &sn, name);
if ((ret >= 0) && (sn.vm_state_size == 0))
- goto the_end;
+ return;
/* restore the VM state */
f = qemu_fopen_bdrv(bs, 0);
if (!f) {
monitor_printf(mon, "Could not open VM state file\n");
- goto the_end;
+ return;
}
ret = qemu_loadvm_state(f);
qemu_fclose(f);
if (ret < 0) {
monitor_printf(mon, "Error %d while loading VM state\n", ret);
}
- the_end:
+}
+
+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();
}
diff --git a/sysemu.h b/sysemu.h
index 1df0872..b2fc92e 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -52,6 +52,7 @@ 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);
diff --git a/vl.c b/vl.c
index 3a247ae..95ed511 100644
--- a/vl.c
+++ b/vl.c
@@ -6031,7 +6031,7 @@ int main(int argc, char **argv, char **envp)
}
if (loadvm)
- do_loadvm(cur_mon, loadvm);
+ load_vmstate(cur_mon, loadvm);
if (incoming) {
qemu_start_incoming_migration(incoming);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT 7b63034] split do_loadvm() into do_loadvm() and load_vmstate(),
Anthony Liguori <=