|
 |
d81766 |
From 119cdbaff1348588bd01cf5881157af90580a123 Mon Sep 17 00:00:00 2001
|
|
|
d81766 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d81766 |
Date: Tue, 20 Aug 2013 15:09:46 +0200
|
|
|
d81766 |
Subject: pc: set level/xlevel correctly on 486/qemu32 CPU models for rhel6.x
|
|
|
d81766 |
|
|
|
d81766 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d81766 |
Message-id: <1377011392-9336-2-git-send-email-ehabkost@redhat.com>
|
|
|
d81766 |
Patchwork-id: 53609
|
|
|
d81766 |
O-Subject: [RHEL7 PATCH 1/7] pc: set level/xlevel correctly on 486/qemu32 CPU models for rhel6.x
|
|
|
d81766 |
Bugzilla: 918907
|
|
|
d81766 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
Bugzilla: 918907
|
|
|
d81766 |
Upstream status: not applicable
|
|
|
d81766 |
(Upstream have the new xlevel on all machine-types since v0.13)
|
|
|
d81766 |
|
|
|
d81766 |
Upstream commit 58012d66dc7323f48e9bad3be6d65a50ed3d76bc changed xlevel
|
|
|
d81766 |
on the "qemu32" CPU model and level on "486", but we need to keep a
|
|
|
d81766 |
compatible value on the rhel6.x machine-types.
|
|
|
d81766 |
|
|
|
d81766 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
d81766 |
index b1bc87e..d46dfe5 100644
|
|
|
d81766 |
--- a/hw/i386/pc_piix.c
|
|
|
d81766 |
+++ b/hw/i386/pc_piix.c
|
|
|
d81766 |
@@ -1015,6 +1015,14 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
d81766 |
.driver = "AC97",\
|
|
|
d81766 |
.property = "use_broken_id",\
|
|
|
d81766 |
.value = stringify(1),\
|
|
|
d81766 |
+ },{\
|
|
|
d81766 |
+ .driver = "qemu32-" TYPE_X86_CPU,\
|
|
|
d81766 |
+ .property = "xlevel",\
|
|
|
d81766 |
+ .value = stringify(0),\
|
|
|
d81766 |
+ },{\
|
|
|
d81766 |
+ .driver = "486-" TYPE_X86_CPU,\
|
|
|
d81766 |
+ .property = "level",\
|
|
|
d81766 |
+ .value = stringify(0),\
|
|
|
d81766 |
}
|
|
|
d81766 |
|
|
|
d81766 |
static void pc_init_rhel650(MachineState *machine)
|