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: 529821 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 p13Eu6B6007440 for ; Thu, 3 Feb 2011 14:56:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756039Ab1BCOzz (ORCPT ); Thu, 3 Feb 2011 09:55:55 -0500 Received: from david.siemens.de ([192.35.17.14]:20142 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755746Ab1BCOzx (ORCPT ); Thu, 3 Feb 2011 09:55:53 -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 Cc: kvm@vger.kernel.org, Alexander Graf , Gleb Natapov , Avi Kivity , Marcelo Tosatti Subject: [0.14?][PATCH 2/4] ioapic: Save/restore irr 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: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: 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 14:56:06 +0000 (UTC) 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() }