summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-09-10 03:04:44 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-09-11 11:10:08 -0500
commit67f0875ebc3197fc28a52fb71092f8ec519471ff (patch)
tree898123f849bcaa62e01d5b2e0ddac2dfd138d6cd
parent3e9e98889b8cac0925dbfd8766c56615a7575338 (diff)
downloadfocaccia-qemu-67f0875ebc3197fc28a52fb71092f8ec519471ff.tar.gz
focaccia-qemu-67f0875ebc3197fc28a52fb71092f8ec519471ff.zip
hpet: it is imposible that qemu_timer field is NULL at this point
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/hpet.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/hw/hpet.c b/hw/hpet.c
index 20df7ef5e8..98a769e70f 100644
--- a/hw/hpet.c
+++ b/hw/hpet.c
@@ -174,9 +174,7 @@ static void hpet_save(QEMUFile *f, void *opaque)
         qemu_put_be64s(f, &s->timer[i].fsb);
         qemu_put_be64s(f, &s->timer[i].period);
         qemu_put_8s(f, &s->timer[i].wrap_flag);
-        if (s->timer[i].qemu_timer) {
-            qemu_put_timer(f, s->timer[i].qemu_timer);
-        }
+        qemu_put_timer(f, s->timer[i].qemu_timer);
     }
 }
 
@@ -201,9 +199,7 @@ static int hpet_load(QEMUFile *f, void *opaque, int version_id)
         qemu_get_be64s(f, &s->timer[i].fsb);
         qemu_get_be64s(f, &s->timer[i].period);
         qemu_get_8s(f, &s->timer[i].wrap_flag);
-        if (s->timer[i].qemu_timer) {
-            qemu_get_timer(f, s->timer[i].qemu_timer);
-        }
+        qemu_get_timer(f, s->timer[i].qemu_timer);
     }
     return 0;
 }