cryptospore / rpms / qemu-kvm

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