From patchwork Mon Apr 1 16:57:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Rogers X-Patchwork-Id: 232784 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D90112C0120 for ; Tue, 2 Apr 2013 04:37:59 +1100 (EST) Received: from localhost ([::1]:49518 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMig9-0008JN-Nc for incoming@patchwork.ozlabs.org; Mon, 01 Apr 2013 13:37:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMifs-0008JA-Pz for qemu-devel@nongnu.org; Mon, 01 Apr 2013 13:37:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UMifr-000439-AV for qemu-devel@nongnu.org; Mon, 01 Apr 2013 13:37:40 -0400 Received: from [137.65.135.21] (port=55908 helo=suse.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMifr-000428-4B; Mon, 01 Apr 2013 13:37:39 -0400 Received: by suse.com (Postfix, from userid 1000) id C023C2F6089; Mon, 1 Apr 2013 10:58:17 -0600 (MDT) From: Bruce Rogers To: qemu-devel@nongnu.org Date: Mon, 1 Apr 2013 10:57:49 -0600 Message-Id: <1364835469-9317-1-git-send-email-brogers@suse.com> X-Mailer: git-send-email 1.7.7 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 137.65.135.21 Cc: Bruce Rogers , qemu-stable@nongnu.org, kraxel@redhat.com Subject: [Qemu-devel] [PATCH] acpi: initialize s4_val used in s4 shutdown X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org While investigating why a 32 bit Windows 2003 guest wasn't able to successfully perform a shutdown /h, it was discovered that commit afafe4bbe0cf7d3318e1ac7b40925561f86a6bd4 inadvertently dropped the initialization of the s4_val used to handle s4 shutdown. Initialize the value as before. Signed-off-by: Bruce Rogers --- hw/acpi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/acpi.c b/hw/acpi.c index 53e47d5..26b67a8 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -474,6 +474,7 @@ static const MemoryRegionOps acpi_pm_cnt_ops = { void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent) { + ar->pm1.cnt.s4_val = 2; ar->wakeup.notify = acpi_notify_wakeup; qemu_register_wakeup_notifier(&ar->wakeup); memory_region_init_io(&ar->pm1.cnt.io, &acpi_pm_cnt_ops, ar, "acpi-cnt", 2);