From 46361ff36a2062a3ce21f53526ad225e04b4ebe6 Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Tue, 22 Dec 2009 17:05:59 -0200
Subject: [PATCH 12/16] RHEL5.4 needs cpu at version 7

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <6262a6a00e37ac8f3b1c356d23dd3e17a3ebd52b.1261501421.git.quintela@redhat.com>
Patchwork-id: 5896
O-Subject: [PATCH 07/11] RHEL5.4 needs cpu at version 7
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/exec.c  |    3 ++-
 qemu/hw/pc.c |    4 ++++
 2 files changed, 6 insertions(+), 1 deletions(-)

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

diff --git a/qemu/exec.c b/qemu/exec.c
index 81b4618..68e9fa8 100644
--- a/qemu/exec.c
+++ b/qemu/exec.c
@@ -566,7 +566,8 @@ void cpu_exec_init(CPUState *env)
 #if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY)
     register_savevm("cpu_common", cpu_index, CPU_COMMON_SAVE_VERSION,
                     cpu_common_save, cpu_common_load, env);
-    register_savevm("cpu", cpu_index, CPU_SAVE_VERSION,
+    register_savevm("cpu", cpu_index,
+                    machine_device_version("cpu", CPU_SAVE_VERSION),
                     cpu_save, cpu_load, env);
 #endif
 }
diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index 69f77df..2454cc1 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -1291,6 +1291,10 @@ QEMUMachine rhel540_machine = {
     .init = pc_init_pci,
     .ram_require = VGA_RAM_SIZE + PC_MAX_BIOS_SIZE,
     .max_cpus = 255,
+    .devices = (DeviceVersion []) {
+		{ .name = "cpu", .version_id = 7 },
+		{ /* Empty */ }
+    },
 };
 
 
-- 
1.6.3.rc4.29.g8146