|
 |
d81766 |
From b0afa7712a01145dd03e286e43b8b3aeeb414b2e Mon Sep 17 00:00:00 2001
|
|
|
d81766 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
d81766 |
Date: Wed, 31 Jul 2013 08:06:56 +0200
|
|
|
d81766 |
Subject: disable s3/s4 by default
|
|
|
d81766 |
|
|
|
d81766 |
Message-id: <1374235471-27096-2-git-send-email-armbru@redhat.com>
|
|
|
d81766 |
Patchwork-id: 52604
|
|
|
d81766 |
O-Subject: [RHEL-7 PATCH qemu-kvm 1/2] disable s3/s4 by default
|
|
|
d81766 |
Bugzilla: 980840
|
|
|
d81766 |
RH-Acked-by: Amit Shah <amit.shah@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Gleb Natapov <gleb@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
From: Gleb Natapov <gleb@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
After the changes proposed in Bug 827503, S3/S4 will be enabled by
|
|
|
d81766 |
default on qemu/seabios, but we want it disabled by default in RHEL6.4
|
|
|
d81766 |
to avoid problems on problematic OSes (it'll be enabled on a
|
|
|
d81766 |
case-by-case basis in the management layer).
|
|
|
d81766 |
|
|
|
d81766 |
Since we want to have it fully supported when enabled, QE should perform
|
|
|
d81766 |
the expected tests (which AFAIK have been run in rhel6.3 already, so
|
|
|
d81766 |
enabling it manually should not be a problem).
|
|
|
d81766 |
|
|
|
d81766 |
Signed-off-by: Gleb Natapov <gleb@redhat.com>
|
|
|
d81766 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d81766 |
(cherry picked from commit 625992f4673989108819db751aa9066b65fc6020)
|
|
|
d81766 |
|
|
|
d81766 |
Picked from qemu-kvm-rhel6.
|
|
|
d81766 |
|
|
|
d81766 |
Conflicts:
|
|
|
d81766 |
hw/acpi.c
|
|
|
d81766 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
|
|
|
d81766 |
index b72b34e..913b2b0 100644
|
|
|
d81766 |
--- a/hw/acpi/piix4.c
|
|
|
d81766 |
+++ b/hw/acpi/piix4.c
|
|
|
d81766 |
@@ -582,8 +582,8 @@ static void piix4_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list)
|
|
|
d81766 |
|
|
|
d81766 |
static Property piix4_pm_properties[] = {
|
|
|
d81766 |
DEFINE_PROP_UINT32("smb_io_base", PIIX4PMState, smb_io_base, 0),
|
|
|
d81766 |
- DEFINE_PROP_UINT8(ACPI_PM_PROP_S3_DISABLED, PIIX4PMState, disable_s3, 0),
|
|
|
d81766 |
- DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_DISABLED, PIIX4PMState, disable_s4, 0),
|
|
|
d81766 |
+ DEFINE_PROP_UINT8(ACPI_PM_PROP_S3_DISABLED, PIIX4PMState, disable_s3, 1),
|
|
|
d81766 |
+ DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_DISABLED, PIIX4PMState, disable_s4, 1),
|
|
|
d81766 |
DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_VAL, PIIX4PMState, s4_val, 2),
|
|
|
d81766 |
DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState,
|
|
|
d81766 |
use_acpi_pci_hotplug, true),
|