summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-09-10 03:04:25 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-09-11 10:19:51 -0500
commitb03b2e48cb322cb695ff7a6666b25712140ea3c9 (patch)
treee71a9b10c5e0771b1f8df6c0738deae7866f6807
parentbbfe1408fa5c75835f835d538c37d4e0857db214 (diff)
downloadfocaccia-qemu-b03b2e48cb322cb695ff7a6666b25712140ea3c9.tar.gz
focaccia-qemu-b03b2e48cb322cb695ff7a6666b25712140ea3c9.zip
timers: remove useless check
loadvm_state is called from: vl.c during startup, vmstart() is called after finishing loading.  The other caller do_loadvm() does the call after a vm_stop().  At both places where we can be saving state we are stoped a few lines before

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--vl.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/vl.c b/vl.c
index 1dc3ffa255..0bab568295 100644
--- a/vl.c
+++ b/vl.c
@@ -1067,9 +1067,6 @@ void qemu_get_timer(QEMUFile *f, QEMUTimer *ts)
 
 static void timer_save(QEMUFile *f, void *opaque)
 {
-    if (cpu_ticks_enabled) {
-        hw_error("cannot save state if virtual timers are running");
-    }
     qemu_put_be64(f, cpu_ticks_offset);
     qemu_put_be64(f, ticks_per_sec);
     qemu_put_be64(f, cpu_clock_offset);
@@ -1079,9 +1076,6 @@ static int timer_load(QEMUFile *f, void *opaque, int version_id)
 {
     if (version_id != 1 && version_id != 2)
         return -EINVAL;
-    if (cpu_ticks_enabled) {
-        return -EINVAL;
-    }
     cpu_ticks_offset=qemu_get_be64(f);
     ticks_per_sec=qemu_get_be64(f);
     if (version_id == 2) {