From patchwork Mon Jun 14 20:28:19 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Alex Williamson <alex.williamson@redhat.com>
X-Patchwork-Id: 106036
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5EKSdSB005790
	for <patchwork-kvm@patchwork.kernel.org>;
	Mon, 14 Jun 2010 20:28:41 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756266Ab0FNU2Y (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Mon, 14 Jun 2010 16:28:24 -0400
Received: from qmta15.emeryville.ca.mail.comcast.net ([76.96.27.228]:59792
	"EHLO qmta15.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1756265Ab0FNU2V (ORCPT
	<rfc822;kvm@vger.kernel.org>); Mon, 14 Jun 2010 16:28:21 -0400
Received: from omta22.emeryville.ca.mail.comcast.net ([76.96.30.89])
	by qmta15.emeryville.ca.mail.comcast.net with comcast
	id VuW51e0061vN32cAFwUMK0; Mon, 14 Jun 2010 20:28:21 +0000
Received: from localhost.localdomain ([75.71.122.219])
	by omta22.emeryville.ca.mail.comcast.net with comcast
	id VwUK1e00S4k7Kz78iwUL7B; Mon, 14 Jun 2010 20:28:20 +0000
From: Alex Williamson <alex.williamson@redhat.com>
Subject: [RESEND PATCH] acpi_piix4: save gpe and pci hotplug slot status
To: qemu-devel@nongnu.org, anthony@codemonkey.ws, blauwirbel@gmail.com
Cc: kvm@vger.kernel.org, quintela@redhat.com, alex.williamson@redhat.com
Date: Mon, 14 Jun 2010 14:28:19 -0600
Message-ID: <20100614202803.5259.85808.stgit@localhost.localdomain>
User-Agent: StGIT/0.14.3
MIME-Version: 1.0
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Mon, 14 Jun 2010 20:28:41 +0000 (UTC)


diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index a87286b..8d1a628 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -283,9 +283,33 @@ static int vmstate_acpi_post_load(void *opaque, int version_id)
     return 0;
 }
 
+static const VMStateDescription vmstate_gpe = {
+    .name = "gpe",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .minimum_version_id_old = 1,
+    .fields      = (VMStateField []) {
+        VMSTATE_UINT16(sts, struct gpe_regs),
+        VMSTATE_UINT16(en, struct gpe_regs),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
+static const VMStateDescription vmstate_pci_status = {
+    .name = "pci_status",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .minimum_version_id_old = 1,
+    .fields      = (VMStateField []) {
+        VMSTATE_UINT32(up, struct pci_status),
+        VMSTATE_UINT32(down, struct pci_status),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
 static const VMStateDescription vmstate_acpi = {
     .name = "piix4_pm",
-    .version_id = 1,
+    .version_id = 2,
     .minimum_version_id = 1,
     .minimum_version_id_old = 1,
     .post_load = vmstate_acpi_post_load,
@@ -297,6 +321,9 @@ static const VMStateDescription vmstate_acpi = {
         VMSTATE_STRUCT(apm, PIIX4PMState, 0, vmstate_apm, APMState),
         VMSTATE_TIMER(tmr_timer, PIIX4PMState),
         VMSTATE_INT64(tmr_overflow_time, PIIX4PMState),
+        VMSTATE_STRUCT(gpe, PIIX4PMState, 2, vmstate_gpe, struct gpe_regs),
+        VMSTATE_STRUCT(pci0_status, PIIX4PMState, 2, vmstate_pci_status,
+                       struct pci_status),
         VMSTATE_END_OF_LIST()
     }
 };