From patchwork Fri Apr 1 11:43:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 89249 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 7163CB6F91 for ; Fri, 1 Apr 2011 22:44:58 +1100 (EST) Received: from localhost ([127.0.0.1]:48289 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5cmc-0002BL-Pa for incoming@patchwork.ozlabs.org; Fri, 01 Apr 2011 07:44:54 -0400 Received: from [140.186.70.92] (port=42939 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5clK-00029k-3N for qemu-devel@nongnu.org; Fri, 01 Apr 2011 07:43:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q5clG-0004vQ-3k for qemu-devel@nongnu.org; Fri, 01 Apr 2011 07:43:33 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:52010) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q5clF-0004ud-Jj for qemu-devel@nongnu.org; Fri, 01 Apr 2011 07:43:30 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 1126618929; Fri, 1 Apr 2011 20:43:25 +0900 (JST) Received: (nullmailer pid 20788 invoked by uid 1000); Fri, 01 Apr 2011 11:43:24 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Fri, 1 Apr 2011 20:43:22 +0900 Message-Id: <896f16b966f5b20599d59554b0623198dbe1df4a.1301657711.git.yamahata@valinux.co.jp> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 210.128.90.3 Cc: yamahata@valinux.co.jp, Juan Quintela , mst@redhat.com Subject: [Qemu-devel] [PATCH v7 2/4] piix_pci: eliminate PIIX3State::pci_irq_levels 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 PIIX3State::pci_irq_levels are redundant which is already tracked by PCIBus layer. So eliminate them. Cc: Juan Quintela Cc: Michael S. Tsirkin Signed-off-by: Isaku Yamahata --- Changes v3 -> v4: - use PCI_NUM_PINS instead of magic number 4 Changes v2 -> v3: - rename member s/dummy_for_save_load_compat/pci_irq_levels_vmstate/g --- hw/piix_pci.c | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 358da58..35e420c 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -37,10 +37,14 @@ typedef PCIHostState I440FXState; +#define PIIX_NUM_PIRQS 4ULL /* PIRQ[A-D] */ + typedef struct PIIX3State { PCIDevice dev; - int pci_irq_levels[4]; qemu_irq *pic; + + /* This member isn't used. Just for save/load compatibility */ + int32_t pci_irq_levels_vmstate[PIIX_NUM_PIRQS]; } PIIX3State; struct PCII440FXState { @@ -162,9 +166,11 @@ static int i440fx_load_old(QEMUFile* f, void *opaque, int version_id) i440fx_update_memory_mappings(d); qemu_get_8s(f, &d->smm_enabled); - if (version_id == 2) - for (i = 0; i < 4; i++) - d->piix3->pci_irq_levels[i] = qemu_get_be32(f); + if (version_id == 2) { + for (i = 0; i < PIIX_NUM_PIRQS; i++) { + qemu_get_be32(f); /* dummy load for compatibility */ + } + } return 0; } @@ -236,7 +242,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn, qemu_irq * piix3 = DO_UPCAST(PIIX3State, dev, pci_create_simple_multifunction(b, -1, true, "PIIX3")); piix3->pic = pic; - pci_bus_irqs(b, piix3_set_irq, pci_slot_get_pirq, piix3, 4); + pci_bus_irqs(b, piix3_set_irq, pci_slot_get_pirq, piix3, PIIX_NUM_PIRQS); (*pi440fx_state)->piix3 = piix3; *piix3_devfn = piix3->dev.devfn; @@ -256,8 +262,6 @@ static void piix3_set_irq(void *opaque, int irq_num, int level) int i, pic_irq, pic_level; PIIX3State *piix3 = opaque; - piix3->pci_irq_levels[irq_num] = level; - /* now we change the pic irq level according to the piix irq mappings */ /* XXX: optimize */ pic_irq = piix3->dev.config[0x60 + irq_num]; @@ -266,8 +270,9 @@ static void piix3_set_irq(void *opaque, int irq_num, int level) to it */ pic_level = 0; for (i = 0; i < 4; i++) { - if (pic_irq == piix3->dev.config[0x60 + i]) - pic_level |= piix3->pci_irq_levels[i]; + if (pic_irq == piix3->dev.config[0x60 + i]) { + pic_level |= pci_bus_get_irq_level(piix3->dev.bus, i); + } } qemu_set_irq(piix3->pic[pic_irq], pic_level); } @@ -309,8 +314,17 @@ static void piix3_reset(void *opaque) pci_conf[0xab] = 0x00; pci_conf[0xac] = 0x00; pci_conf[0xae] = 0x00; +} - memset(d->pci_irq_levels, 0, sizeof(d->pci_irq_levels)); +static void piix3_pre_save(void *opaque) +{ + int i; + PIIX3State *piix3 = opaque; + + for (i = 0; i < ARRAY_SIZE(piix3->pci_irq_levels_vmstate); i++) { + piix3->pci_irq_levels_vmstate[i] = + pci_bus_get_irq_level(piix3->dev.bus, i); + } } static const VMStateDescription vmstate_piix3 = { @@ -318,9 +332,11 @@ static const VMStateDescription vmstate_piix3 = { .version_id = 3, .minimum_version_id = 2, .minimum_version_id_old = 2, + .pre_save = piix3_pre_save, .fields = (VMStateField []) { VMSTATE_PCI_DEVICE(dev, PIIX3State), - VMSTATE_INT32_ARRAY_V(pci_irq_levels, PIIX3State, 4, 3), + VMSTATE_INT32_ARRAY_V(pci_irq_levels_vmstate, PIIX3State, + PIIX_NUM_PIRQS, 3), VMSTATE_END_OF_LIST() } };