commit 67f0875ebc3197fc28a52fb71092f8ec519471ff
author Juan Quintela <quintela@redhat.com> Thu Sep 10 03:04:44 2009 +0200
committer Anthony Liguori <aliguori@us.ibm.com> Fri Sep 11 11:10:08 2009 -0500
tree 898123f849bcaa62e01d5b2e0ddac2dfd138d6cd
parent 3e9e98889b8cac0925dbfd8766c56615a7575338

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>

hw/hpet.c

diff --git a/hw/hpet.c b/hw/hpet.c
index 20df7ef..98a769e 100644
--- a/hw/hpet.c
+++ b/hw/hpet.c
@@ -174,9 +174,7 @@
         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 @@
         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;
 }