From 19d691eef0c50ecb140c3f380ec29e183605bbab Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Tue, 22 Dec 2009 17:05:58 -0200
Subject: [PATCH 11/16] cpu for x86: don't save new fields if version < 8

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <953941f94320fb5c90e54f31e1ee1c14204e2815.1261501421.git.quintela@redhat.com>
Patchwork-id: 5895
O-Subject: [PATCH 06/11] cpu for x86: don't save new fields if version < 8
Bugzilla: 541731
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
RH-Acked-by: Dor Laor <dlaor@redhat.com>
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
RH-Acked-by: Marcelo Tosatti <mtosatti@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 qemu/target-i386/machine.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/target-i386/machine.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/qemu/target-i386/machine.c b/qemu/target-i386/machine.c
index 8a06799..b894b0a 100644
--- a/qemu/target-i386/machine.c
+++ b/qemu/target-i386/machine.c
@@ -151,8 +151,10 @@ void cpu_save(QEMUFile *f, void *opaque, int version_id)
         qemu_put_be64s(f, &env->tsc);
         qemu_put_be32s(f, &env->mp_state);
     }
-    qemu_put_be64s(f, &env->system_time_msr);
-    qemu_put_be64s(f, &env->wall_clock_msr);
+    if (version_id >= 8) {
+        qemu_put_be64s(f, &env->system_time_msr);
+        qemu_put_be64s(f, &env->wall_clock_msr);
+    }
 }
 
 #ifdef USE_X86LDOUBLE
-- 
1.6.3.rc4.29.g8146