[Xen-changelog] [qemu-xen-unstable] qemu_get_timer: always read the 64 bit value from the savefile

[patchbot@xxxxxxx]

commit 244959f65fc67b24a00265110495a555d92f533a
Author: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Date:   Thu Dec 8 16:36:03 2011 +0000

    qemu_get_timer: always read the 64 bit value from the savefile
    
    qemu_get_timer: the 64 bit value needs to be read from the save file
    even when the timer is not initialized otherwise following reads from
    the savefile will read the wrong fields.
    
    [ This fixes a regression in 68af5b51 -iwj. ]
    
    Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
 vl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vl.c b/vl.c
index f3b3d02..9e0a556 100644
--- a/vl.c
+++ b/vl.c
@@ -1276,10 +1276,10 @@ void qemu_get_timer(QEMUFile *f, QEMUTimer *ts)
 {
     uint64_t expire_time;
 
+    expire_time = qemu_get_be64(f);
+
     if (ts == NULL)
         return;
-
-    expire_time = qemu_get_be64(f);
     if (expire_time != -1) {
         qemu_mod_timer(ts, expire_time);
     } else {
--
generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog