From patchwork Mon Feb 7 11:59:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 537841 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 p17C00Tj014144 for ; Mon, 7 Feb 2011 12:00:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754026Ab1BGL7r (ORCPT ); Mon, 7 Feb 2011 06:59:47 -0500 Received: from goliath.siemens.de ([192.35.17.28]:33874 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751934Ab1BGL7q (ORCPT ); Mon, 7 Feb 2011 06:59:46 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p17BxZa9012484; Mon, 7 Feb 2011 12:59:35 +0100 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p17BxYVg005544; Mon, 7 Feb 2011 12:59:34 +0100 Message-ID: <4D4FDEA6.1010101@siemens.com> Date: Mon, 07 Feb 2011 12:59:34 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti CC: kvm Subject: [PATCH] qemu-kvm: Prepare IOAPIC for upstream merge 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]); Mon, 07 Feb 2011 12:00:01 +0000 (UTC) diff --git a/hw/ioapic.c b/hw/ioapic.c index aeb3653..bbc0488 100644 --- a/hw/ioapic.c +++ b/hw/ioapic.c @@ -40,7 +40,6 @@ #define DPRINTF(fmt, ...) #endif -#define IOAPIC_DEFAULT_BASE_ADDRESS 0xfec00000 #define IOAPIC_LVT_MASKED (1<<16) #define IOAPIC_TRIGGER_EDGE 0 @@ -61,8 +60,6 @@ struct IOAPICState { SysBusDevice busdev; uint8_t id; uint8_t ioregsel; - uint64_t base_address; - uint32_t irr; uint64_t ioredtbl[IOAPIC_NUM_PINS]; }; @@ -219,7 +216,6 @@ static void kvm_kernel_ioapic_save_to_user(IOAPICState *s) s->id = kioapic->id; s->ioregsel = kioapic->ioregsel; - s->base_address = kioapic->base_address; s->irr = kioapic->irr; for (i = 0; i < IOAPIC_NUM_PINS; i++) { s->ioredtbl[i] = kioapic->redirtbl[i].bits; @@ -239,7 +235,7 @@ static void kvm_kernel_ioapic_load_from_user(IOAPICState *s) kioapic->id = s->id; kioapic->ioregsel = s->ioregsel; - kioapic->base_address = s->base_address; + kioapic->base_address = s->busdev.mmio[0].addr; kioapic->irr = s->irr; for (i = 0; i < IOAPIC_NUM_PINS; i++) { kioapic->redirtbl[i].bits = s->ioredtbl[i]; @@ -258,16 +254,6 @@ static void ioapic_pre_save(void *opaque) } } -static int ioapic_pre_load(void *opaque) -{ - IOAPICState *s = opaque; - - /* in case we are doing version 1, we just set these to sane values */ - s->base_address = IOAPIC_DEFAULT_BASE_ADDRESS; - s->irr = 0; - return 0; -} - static int ioapic_post_load(void *opaque, int version_id) { IOAPICState *s = opaque; @@ -275,21 +261,24 @@ static int ioapic_post_load(void *opaque, int version_id) if (kvm_enabled() && kvm_irqchip_in_kernel()) { kvm_kernel_ioapic_load_from_user(s); } + if (version_id == 1) { + /* set sane value */ + s->irr = 0; + } return 0; } static const VMStateDescription vmstate_ioapic = { .name = "ioapic", - .version_id = 2, + .version_id = 3, .minimum_version_id = 1, .minimum_version_id_old = 1, - .pre_load = ioapic_pre_load, .post_load = ioapic_post_load, .pre_save = ioapic_pre_save, .fields = (VMStateField []) { VMSTATE_UINT8(id, IOAPICState), VMSTATE_UINT8(ioregsel, IOAPICState), - VMSTATE_UINT64_V(base_address, IOAPICState, 2), + VMSTATE_UNUSED_V(2, 8), /* to account for qemu-kvm's v2 format */ VMSTATE_UINT32_V(irr, IOAPICState, 2), VMSTATE_UINT64_ARRAY(ioredtbl, IOAPICState, IOAPIC_NUM_PINS), VMSTATE_END_OF_LIST() @@ -301,7 +290,6 @@ static void ioapic_reset(DeviceState *d) IOAPICState *s = DO_UPCAST(IOAPICState, busdev.qdev, d); int i; - s->base_address = IOAPIC_DEFAULT_BASE_ADDRESS; s->id = 0; s->ioregsel = 0; s->irr = 0;