|
 |
218e99 |
From 66543c63c5be389816ab45cdc6eed93094345281 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
Date: Wed, 31 Jul 2013 08:07:32 +0200
|
|
|
218e99 |
Subject: pc: rhel6-compat: enable S3, S4 for 6.1 and lower machine types
|
|
|
218e99 |
|
|
|
218e99 |
Message-id: <1374235471-27096-3-git-send-email-armbru@redhat.com>
|
|
|
218e99 |
Patchwork-id: 52605
|
|
|
218e99 |
O-Subject: [RHEL-7 PATCH qemu-kvm 2/2] pc: rhel6-compat: enable S3, S4 for 6.1 and lower machine types
|
|
|
218e99 |
Bugzilla: 980840
|
|
|
218e99 |
RH-Acked-by: Amit Shah <amit.shah@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Gleb Natapov <gleb@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: Amit Shah <amit.shah@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
We don't advertise S3/S4 support by default since RHEL6.2:
|
|
|
218e99 |
|
|
|
218e99 |
RHEL6.4 has S3/S4 advertisement disabled by default (can be overriden by
|
|
|
218e99 |
the disable_s3 and disable_s4 properties of the PIIX4).
|
|
|
218e99 |
RHEL6.3 and 6.2 had S3/S4 advertisement disabled by default (can be
|
|
|
218e99 |
overriden by using the alternative bios-pm.bin SeaBIOS image).
|
|
|
218e99 |
RHEL6.1 and 6.0 had S3/S4 advertisement enabled by default.
|
|
|
218e99 |
|
|
|
218e99 |
We need to ensure we keep that behaviour, so adjust the 6.1 and 6.0
|
|
|
218e99 |
machine types to allow S3/S4.
|
|
|
218e99 |
|
|
|
218e99 |
As a side note, migrating a RHEL6.0 or RHEL6.1 VM to a RHEL6.2 or 6.3
|
|
|
218e99 |
host would have caused a guest-visible change, but we can do better
|
|
|
218e99 |
starting with 6.4, so let's do the right thing now. This, however, has
|
|
|
218e99 |
the potential to cause two guest-visible changes if a VM is migrated
|
|
|
218e99 |
like this:
|
|
|
218e99 |
|
|
|
218e99 |
RHEL6.1 host --1--> RHEL6.3 host --2--> RHEL6.4 host
|
|
|
218e99 |
|
|
|
218e99 |
After (1) above, guest will stop seeing S3/S4 advertised. After (2),
|
|
|
218e99 |
S3/S4 will be advertised again.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Amit Shah <amit.shah@redhat.com>
|
|
|
218e99 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
218e99 |
(cherry picked from commit ffc7768db990f0587b84e08e06095ed26f095fde)
|
|
|
218e99 |
|
|
|
218e99 |
Picked from qemu-kvm-rhel6.
|
|
|
218e99 |
|
|
|
218e99 |
Conflicts:
|
|
|
218e99 |
hw/pc.c
|
|
|
218e99 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
218e99 |
index 5ca2cc3..23002ce 100644
|
|
|
218e99 |
--- a/hw/i386/pc_piix.c
|
|
|
218e99 |
+++ b/hw/i386/pc_piix.c
|
|
|
218e99 |
@@ -998,6 +998,14 @@ static QEMUMachine pc_machine_rhel620 = {
|
|
|
218e99 |
#define PC_RHEL6_1_COMPAT \
|
|
|
218e99 |
PC_RHEL6_2_COMPAT,\
|
|
|
218e99 |
{\
|
|
|
218e99 |
+ .driver = "PIIX4_PM",\
|
|
|
218e99 |
+ .property = "disable_s3",\
|
|
|
218e99 |
+ .value = "0",\
|
|
|
218e99 |
+ },{\
|
|
|
218e99 |
+ .driver = "PIIX4_PM",\
|
|
|
218e99 |
+ .property = "disable_s4",\
|
|
|
218e99 |
+ .value = "0",\
|
|
|
218e99 |
+ },{\
|
|
|
218e99 |
.driver = "qxl",\
|
|
|
218e99 |
.property = "revision",\
|
|
|
218e99 |
.value = stringify(2),\
|