From patchwork Fri Oct 2 20:15:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 34889 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 12609B7BE3 for ; Sat, 3 Oct 2009 06:32:14 +1000 (EST) Received: from localhost ([127.0.0.1]:50708 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtonT-0002dS-4s for incoming@patchwork.ozlabs.org; Fri, 02 Oct 2009 16:32:11 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MtoZs-0004PN-MF for qemu-devel@nongnu.org; Fri, 02 Oct 2009 16:18:09 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MtoZl-0004Lc-MF for qemu-devel@nongnu.org; Fri, 02 Oct 2009 16:18:05 -0400 Received: from [199.232.76.173] (port=46073 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtoZl-0004LG-Ar for qemu-devel@nongnu.org; Fri, 02 Oct 2009 16:18:01 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:43774) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MtoZk-0000hk-9z for qemu-devel@nongnu.org; Fri, 02 Oct 2009 16:18:00 -0400 Received: from nm.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with ESMTP id D4E9F49D0E; Sat, 3 Oct 2009 05:17:55 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1MtoY6-00038W-EK; Sat, 03 Oct 2009 05:16:18 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, anthony@codemonkey.ws Date: Sat, 3 Oct 2009 05:15:58 +0900 Message-Id: <1254514577-11896-7-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1254514577-11896-1-git-send-email-yamahata@valinux.co.jp> References: <1254514577-11896-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH 06/25] pci: define a constant to represent a unmapped bar and use it. 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 define a constant to represent a unmapped bar instead of -1 and use it. Signed-off-by: Isaku Yamahata Acked-by: Michael S. Tsirkin --- hw/cirrus_vga.c | 2 +- hw/pci.c | 18 +++++++++--------- hw/pci.h | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 7e95f10..fd2367a 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -3206,7 +3206,7 @@ static void pci_cirrus_write_config(PCIDevice *d, CirrusVGAState *s = &pvs->cirrus_vga; pci_default_write_config(d, address, val, len); - if (s->vga.map_addr && d->io_regions[0].addr == -1) + if (s->vga.map_addr && d->io_regions[0].addr == PCI_BAR_UNMAPPED) s->vga.map_addr = 0; cirrus_update_memory_access(s); } diff --git a/hw/pci.c b/hw/pci.c index 3bbc7e3..39791d0 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -366,7 +366,7 @@ static void pci_unregister_io_regions(PCIDevice *pci_dev) for(i = 0; i < PCI_NUM_REGIONS; i++) { r = &pci_dev->io_regions[i]; - if (!r->size || r->addr == -1) + if (!r->size || r->addr == PCI_BAR_UNMAPPED) continue; if (r->type == PCI_ADDRESS_SPACE_IO) { isa_unassign_ioport(r->addr, r->size); @@ -413,7 +413,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, } r = &pci_dev->io_regions[region_num]; - r->addr = -1; + r->addr = PCI_BAR_UNMAPPED; r->size = size; r->type = type; r->map_func = map_func; @@ -455,10 +455,10 @@ static void pci_update_mappings(PCIDevice *d) /* NOTE: we have only 64K ioports on PC */ if (last_addr <= new_addr || new_addr == 0 || last_addr >= 0x10000) { - new_addr = -1; + new_addr = PCI_BAR_UNMAPPED; } } else { - new_addr = -1; + new_addr = PCI_BAR_UNMAPPED; } } else { if (cmd & PCI_COMMAND_MEMORY) { @@ -474,17 +474,17 @@ static void pci_update_mappings(PCIDevice *d) mappings, we handle specific values as invalid mappings. */ if (last_addr <= new_addr || new_addr == 0 || - last_addr == -1) { - new_addr = -1; + last_addr == PCI_BAR_UNMAPPED) { + new_addr = PCI_BAR_UNMAPPED; } } else { no_mem_map: - new_addr = -1; + new_addr = PCI_BAR_UNMAPPED; } } /* now do the real mapping */ if (new_addr != r->addr) { - if (r->addr != -1) { + if (r->addr != PCI_BAR_UNMAPPED) { if (r->type & PCI_ADDRESS_SPACE_IO) { int class; /* NOTE: specific hack for IDE in PC case: @@ -503,7 +503,7 @@ static void pci_update_mappings(PCIDevice *d) } } r->addr = new_addr; - if (r->addr != -1) { + if (r->addr != PCI_BAR_UNMAPPED) { r->map_func(d, i, r->addr, r->size, r->type); } } diff --git a/hw/pci.h b/hw/pci.h index def45ae..00c8947 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -85,6 +85,7 @@ typedef int PCIUnregisterFunc(PCIDevice *pci_dev); typedef struct PCIIORegion { uint32_t addr; /* current PCI mapping address. -1 means not mapped */ +#define PCI_BAR_UNMAPPED (~(uint32_t)0) uint32_t size; uint8_t type; PCIMapIORegionFunc *map_func;