From patchwork Thu Feb 3 14:55:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 81669 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A3F3DB7103 for ; Fri, 4 Feb 2011 01:59:35 +1100 (EST) Received: from localhost ([127.0.0.1]:39739 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl0ei-00079C-9Y for incoming@patchwork.ozlabs.org; Thu, 03 Feb 2011 09:59:32 -0500 Received: from [140.186.70.92] (port=57699 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl0ay-0005cO-VR for qemu-devel@nongnu.org; Thu, 03 Feb 2011 09:55:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pl0ax-0000xL-DX for qemu-devel@nongnu.org; Thu, 03 Feb 2011 09:55:40 -0500 Received: from david.siemens.de ([192.35.17.14]:22696) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pl0ax-0000wy-0X for qemu-devel@nongnu.org; Thu, 03 Feb 2011 09:55:39 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id p13Eta6q001968; Thu, 3 Feb 2011 15:55:36 +0100 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p13Eta0v010597; Thu, 3 Feb 2011 15:55:36 +0100 From: Jan Kiszka To: qemu-devel@nongnu.org, Anthony Liguori Date: Thu, 3 Feb 2011 15:55:33 +0100 Message-Id: <1772d57a70b2634f0af11ee6809ebcb85a5ac9b3.1296744934.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.14 Cc: Gleb Natapov , Marcelo Tosatti , Alexander Graf , kvm@vger.kernel.org, Avi Kivity Subject: [Qemu-devel] [0.14?][PATCH 2/4] ioapic: Save/restore irr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is a guest modifiable state that must be saved/restored properly. Signed-off-by: Jan Kiszka --- hw/ioapic.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/hw/ioapic.c b/hw/ioapic.c index 443c579..c7019f5 100644 --- a/hw/ioapic.c +++ b/hw/ioapic.c @@ -231,14 +231,25 @@ static void ioapic_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t va } } +static int ioapic_pre_load(void *opaque) +{ + IOAPICState *s = opaque; + + /* in case we are loading version 1, set these to sane values */ + s->irr = 0; + return 0; +} + static const VMStateDescription vmstate_ioapic = { .name = "ioapic", - .version_id = 1, + .version_id = 2, + .pre_load = ioapic_pre_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() }