From patchwork Wed Jan 26 09:45:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 80496 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 9FF4DB70F9 for ; Wed, 26 Jan 2011 22:02:00 +1100 (EST) Received: from localhost ([127.0.0.1]:53326 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pi38O-0006nh-G3 for incoming@patchwork.ozlabs.org; Wed, 26 Jan 2011 06:01:56 -0500 Received: from [140.186.70.92] (port=57173 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pi1wT-0005Qa-SK for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:45:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pi1wK-0006ln-2A for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:45:33 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:43638) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pi1wJ-0006lZ-LF for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:45:24 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 53296874BF; Wed, 26 Jan 2011 18:45:22 +0900 (JST) Received: (nullmailer pid 10142 invoked by uid 1000); Wed, 26 Jan 2011 09:45:20 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Wed, 26 Jan 2011 18:45:18 +0900 Message-Id: <76163938f7a687e924637b7118b4000d940d6465.1296034717.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) Cc: yamahata@valinux.co.jp, mst@redhat.com Subject: [Qemu-devel] [PATCH 1/3] pci: replace the magic, 256, for the maximum of devfn 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 Introduce symbol PCI_DEVFN_MAX for the maximum of devfn and replace the magic, 256. Signed-off-by: Isaku Yamahata --- hw/pci.h | 2 ++ hw/pci_internals.h | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hw/pci.h b/hw/pci.h index 0d2753f..ffb04e8 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -16,7 +16,9 @@ #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) #define PCI_FUNC(devfn) ((devfn) & 0x07) +#define PCI_SLOT_MAX 32 #define PCI_FUNC_MAX 8 +#define PCI_DEVFN_MAX (PCI_SLOT_MAX * PCI_FUNC_MAX) /* Class, Vendor and Device IDs from Linux's pci_ids.h */ #include "pci_ids.h" diff --git a/hw/pci_internals.h b/hw/pci_internals.h index e3c93a3..f17e681 100644 --- a/hw/pci_internals.h +++ b/hw/pci_internals.h @@ -22,7 +22,7 @@ struct PCIBus { pci_hotplug_fn hotplug; DeviceState *hotplug_qdev; void *irq_opaque; - PCIDevice *devices[256]; + PCIDevice *devices[PCI_DEVFN_MAX]; PCIDevice *parent_dev; target_phys_addr_t mem_base;