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