yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
9ae3a8
From 9830eecd6989198882fa2c4ef132665f36ee7abe Mon Sep 17 00:00:00 2001
9ae3a8
From: Miroslav Rezanina <mrezanin@redhat.com>
9ae3a8
Date: Wed, 31 Jul 2013 08:06:56 +0200
9ae3a8
Subject: disable s3/s4 by default
9ae3a8
9ae3a8
Message-id: <1374235471-27096-2-git-send-email-armbru@redhat.com>
9ae3a8
Patchwork-id: 52604
9ae3a8
O-Subject: [RHEL-7 PATCH qemu-kvm 1/2] disable s3/s4 by default
9ae3a8
Bugzilla: 980840
9ae3a8
RH-Acked-by: Amit Shah <amit.shah@redhat.com>
9ae3a8
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
9ae3a8
RH-Acked-by: Bandan Das <bsd@redhat.com>
9ae3a8
RH-Acked-by: Gleb Natapov <gleb@redhat.com>
9ae3a8
9ae3a8
From: Gleb Natapov <gleb@redhat.com>
9ae3a8
9ae3a8
After the changes proposed in Bug 827503, S3/S4 will be enabled by
9ae3a8
default on qemu/seabios, but we want it disabled by default in RHEL6.4
9ae3a8
to avoid problems on problematic OSes (it'll be enabled on a
9ae3a8
case-by-case basis in the management layer).
9ae3a8
9ae3a8
Since we want to have it fully supported when enabled, QE should perform
9ae3a8
the expected tests (which AFAIK have been run in rhel6.3 already, so
9ae3a8
enabling it manually should not be a problem).
9ae3a8
9ae3a8
Signed-off-by: Gleb Natapov <gleb@redhat.com>
9ae3a8
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
9ae3a8
(cherry picked from commit 625992f4673989108819db751aa9066b65fc6020)
9ae3a8
9ae3a8
Picked from qemu-kvm-rhel6.
9ae3a8
9ae3a8
Conflicts:
9ae3a8
        hw/acpi.c
9ae3a8
Signed-off-by: Markus Armbruster <armbru@redhat.com>
9ae3a8
9ae3a8
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
9ae3a8
index c4af1cc..86ff598 100644
9ae3a8
--- a/hw/acpi/piix4.c
9ae3a8
+++ b/hw/acpi/piix4.c
9ae3a8
@@ -475,8 +475,8 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
9ae3a8
 
9ae3a8
 static Property piix4_pm_properties[] = {
9ae3a8
     DEFINE_PROP_UINT32("smb_io_base", PIIX4PMState, smb_io_base, 0),
9ae3a8
-    DEFINE_PROP_UINT8("disable_s3", PIIX4PMState, disable_s3, 0),
9ae3a8
-    DEFINE_PROP_UINT8("disable_s4", PIIX4PMState, disable_s4, 0),
9ae3a8
+    DEFINE_PROP_UINT8("disable_s3", PIIX4PMState, disable_s3, 1),
9ae3a8
+    DEFINE_PROP_UINT8("disable_s4", PIIX4PMState, disable_s4, 1),
9ae3a8
     DEFINE_PROP_UINT8("s4_val", PIIX4PMState, s4_val, 2),
9ae3a8
     DEFINE_PROP_END_OF_LIST(),
9ae3a8
 };