[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/23] split do_loadvm() into do_loadvm() and load_v
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 02/23] split do_loadvm() into do_loadvm() and load_vmstate() |
Date: |
Thu, 20 Aug 2009 19:42:20 +0200 |
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>
---
savevm.c | 22 +++++++++++++---------
sysemu.h | 1 +
vl.c | 2 +-
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/savevm.c b/savevm.c
index 570377f..a321136 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1145,14 +1145,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) {
@@ -1163,9 +1162,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)) {
@@ -1191,7 +1187,7 @@ void do_loadvm(Monitor *mon, const char *name)
}
/* fatal on snapshot block device */
if (bs == bs1)
- goto the_end;
+ return;
}
}
}
@@ -1199,20 +1195,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 dffb2f1..a20025d 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 8b2b289..13a2b74 100644
--- a/vl.c
+++ b/vl.c
@@ -6037,7 +6037,7 @@ int main(int argc, char **argv, char **envp)
}
if (loadvm)
- do_loadvm(cur_mon, loadvm);
+ load_vmstate(cur_mon, loadvm);
if (incoming) {
autostart = 0;
--
1.6.2.5
- [Qemu-devel] [PATCH 00/23] New VMState table based load/save infrastructure, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 01/23] move useful type definitons to osdep.h, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 02/23] split do_loadvm() into do_loadvm() and load_vmstate(),
Juan Quintela <=
- [Qemu-devel] [PATCH 03/23] move do_loadvm() to monitor.c, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 04/23] make load_vmstate() return errors, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 06/23] Add vmstate_load() and vmstate_save() functions, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 05/23] Use return value from load_state() call back, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 07/23] New VMstate save/load infrastructure, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 08/23] Add VMState support for pointers, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 09/23] Add VMState support for arrays, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 11/23] Add VMState support for structs, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 10/23] Port apic to new VMState design, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 12/23] Add VMState support for arrays of structs, Juan Quintela, 2009/08/20