From patchwork Tue Dec 15 11:25:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 41176 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 C06FAB6EEF for ; Tue, 15 Dec 2009 22:31:57 +1100 (EST) Received: from localhost ([127.0.0.1]:48497 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKVdC-0002tt-Pp for incoming@patchwork.ozlabs.org; Tue, 15 Dec 2009 06:31:54 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NKVXz-000173-Q0 for qemu-devel@nongnu.org; Tue, 15 Dec 2009 06:26:31 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NKVXs-00012l-VT for qemu-devel@nongnu.org; Tue, 15 Dec 2009 06:26:29 -0500 Received: from [199.232.76.173] (port=43797 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKVXs-00012F-8p for qemu-devel@nongnu.org; Tue, 15 Dec 2009 06:26:24 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:43000) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NKVXq-000589-AS for qemu-devel@nongnu.org; Tue, 15 Dec 2009 06:26: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 71324106A2A; Tue, 15 Dec 2009 20:26:15 +0900 (JST) Received: (nullmailer pid 28231 invoked by uid 1000); Tue, 15 Dec 2009 11:26:07 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org, mst@redhat.com Date: Tue, 15 Dec 2009 20:25:59 +0900 Message-Id: <1260876367-28197-3-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.5.4 In-Reply-To: <1260876367-28197-1-git-send-email-yamahata@valinux.co.jp> References: <1260876367-28197-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 V2 02/10] pci: s/PCI_SUBVENDOR_ID/PCI_SUBSYSTEM_VENDOR_ID/g 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 To match Linux PCI register definition, rename PCI_SUBVENDOR_ID to PCI_SUBSYSTEM_VENDOR_ID. Signed-off-by: Isaku Yamahata Acked-by: Michael S. Tsirkin --- hw/pci.c | 2 +- hw/pci.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index aed3a24..c4688af 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -411,7 +411,7 @@ static int pci_set_default_subsystem_id(PCIDevice *pci_dev) { uint16_t *id; - id = (void*)(&pci_dev->config[PCI_SUBVENDOR_ID]); + id = (void*)(&pci_dev->config[PCI_SUBSYSTEM_VENDOR_ID]); id[0] = cpu_to_le16(pci_default_sub_vendor_id); id[1] = cpu_to_le16(pci_default_sub_device_id); return 0; diff --git a/hw/pci.h b/hw/pci.h index 475b044..3be7a99 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -155,7 +155,7 @@ typedef struct PCIIORegion { #define PCI_CAP_LIST_NEXT 1 /* Next capability in the list */ #define PCI_REVISION 0x08 /* obsolete, use PCI_REVISION_ID */ -#define PCI_SUBVENDOR_ID 0x2c /* obsolete, use PCI_SUBSYSTEM_VENDOR_ID */ +#define PCI_SUBSYSTEM_VENDOR_ID 0x2c #define PCI_SUBDEVICE_ID 0x2e /* obsolete, use PCI_SUBSYSTEM_ID */ /* Bits in the PCI Status Register (PCI 2.3 spec) */