From patchwork Thu Feb  3 18:25:18 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Kiszka <jan.kiszka@siemens.com>
X-Patchwork-Id: 530281
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p13IPioT000598
	for <patchwork-kvm@patchwork.kernel.org>; Thu, 3 Feb 2011 18:25:45 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932330Ab1BCSZk (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Thu, 3 Feb 2011 13:25:40 -0500
Received: from david.siemens.de ([192.35.17.14]:19854 "EHLO david.siemens.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S932214Ab1BCSZk (ORCPT <rfc822;kvm@vger.kernel.org>);
	Thu, 3 Feb 2011 13:25:40 -0500
Received: from mail1.siemens.de (localhost [127.0.0.1])
	by david.siemens.de (8.13.6/8.13.6) with ESMTP id p13IPNRe030551;
	Thu, 3 Feb 2011 19:25:23 +0100
Received: from mchn199C.mchp.siemens.de ([139.25.109.49])
	by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p13IPKhb021979;
	Thu, 3 Feb 2011 19:25:23 +0100
From: Jan Kiszka <jan.kiszka@siemens.com>
To: qemu-devel@nongnu.org, Anthony Liguori <aliguori@us.ibm.com>
Cc: kvm@vger.kernel.org, Alexander Graf <agraf@suse.de>,
	Gleb Natapov <gleb@redhat.com>, Avi Kivity <avi@redhat.com>,
	Marcelo Tosatti <mtosatti@redhat.com>, Blue Swirl <blauwirbel@gmail.com>
Subject: [0.14?][PATCH v2 2/4] ioapic: Save/restore irr
Date: Thu,  3 Feb 2011 19:25:18 +0100
Message-Id: 
 <450f6655159ac0682be35b8eb47cd4a92d26737e.1296757518.git.jan.kiszka@siemens.com>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <cover.1296757518.git.jan.kiszka@siemens.com>
References: <cover.1296757518.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1296757518.git.jan.kiszka@siemens.com>
References: <cover.1296757518.git.jan.kiszka@siemens.com>
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.6 (demeter1.kernel.org [140.211.167.41]);
	Thu, 03 Feb 2011 18:25:46 +0000 (UTC)


diff --git a/hw/ioapic.c b/hw/ioapic.c
index 443c579..edf99cc 100644
--- a/hw/ioapic.c
+++ b/hw/ioapic.c
@@ -231,14 +231,27 @@ static void ioapic_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t va
     }
 }
 
+static int ioapic_post_load(void *opaque, int version_id)
+{
+    IOAPICState *s = opaque;
+
+    if (version_id == 1) {
+        /* set sane values */
+        s->irr = 0;
+    }
+    return 0;
+}
+
 static const VMStateDescription vmstate_ioapic = {
     .name = "ioapic",
-    .version_id = 1,
+    .version_id = 2,
+    .post_load = ioapic_post_load,
     .minimum_version_id = 1,
     .minimum_version_id_old = 1,
     .fields      = (VMStateField []) {
         VMSTATE_UINT8(id, IOAPICState),
         VMSTATE_UINT8(ioregsel, IOAPICState),
+        VMSTATE_UINT32_V(irr, IOAPICState, 2),
         VMSTATE_UINT64_ARRAY(ioredtbl, IOAPICState, IOAPIC_NUM_PINS),
         VMSTATE_END_OF_LIST()
     }