From 4f9c0a4316da750c091af4a1534e104cef598063 Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Tue, 22 Dec 2009 17:06:00 -0200
Subject: [PATCH 13/16] RHEL 5.4.0 don't have kvmclock

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <96181a3cc73476922a4456650bdb45771eae0a2f.1261501421.git.quintela@redhat.com>
Patchwork-id: 5898
O-Subject: [PATCH 08/11] RHEL 5.4.0 don't have kvmclock
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/hw/pc.c        |    1 +
 qemu/qemu-kvm-x86.c |    8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/hw/pc.c        |    1 +
 qemu/qemu-kvm-x86.c |    8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index 2454cc1..9355d55 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -1293,6 +1293,7 @@ QEMUMachine rhel540_machine = {
     .max_cpus = 255,
     .devices = (DeviceVersion []) {
 		{ .name = "cpu", .version_id = 7 },
+		{ .name = "kvmclock", .version_id =  SAVEVM_DISABLED},
 		{ /* Empty */ }
     },
 };
diff --git a/qemu/qemu-kvm-x86.c b/qemu/qemu-kvm-x86.c
index a3e15d6..fcf5a21 100644
--- a/qemu/qemu-kvm-x86.c
+++ b/qemu/qemu-kvm-x86.c
@@ -84,8 +84,12 @@ int kvm_arch_qemu_create_context(void)
 	    kvm_has_msr_star = 1;
 
 #ifdef KVM_CAP_ADJUST_CLOCK
-    if (kvm_can_adjust_clock(kvm_context))
-        register_savevm("kvmclock", 0, 1, kvmclock_save, kvmclock_load, &kvmclock_data);
+    if (kvm_can_adjust_clock(kvm_context)) {
+        int version_id = machine_device_version("kvmclock", 1);
+        if (version_id != SAVEVM_DISABLED)
+            register_savevm("kvmclock", 0, version_id, kvmclock_save,
+                            kvmclock_load, &kvmclock_data);
+    }
 #endif
 	return 0;
 }
-- 
1.6.3.rc4.29.g8146