From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NKB90-0002Jo-85 for qemu-devel@nongnu.org; Mon, 14 Dec 2009 08:39:22 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NKB8u-0002Ii-Bw for qemu-devel@nongnu.org; Mon, 14 Dec 2009 08:39:21 -0500 Received: from [199.232.76.173] (port=54095 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKB8u-0002Ib-54 for qemu-devel@nongnu.org; Mon, 14 Dec 2009 08:39:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:13467) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NKB8t-0004e6-Qo for qemu-devel@nongnu.org; Mon, 14 Dec 2009 08:39:16 -0500 Date: Mon, 14 Dec 2009 15:36:32 +0200 From: "Michael S. Tsirkin" Message-ID: <20091214133632.GE973@redhat.com> References: <1260794906-30168-1-git-send-email-yamahata@valinux.co.jp> <1260794906-30168-4-git-send-email-yamahata@valinux.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1260794906-30168-4-git-send-email-yamahata@valinux.co.jp> Subject: [Qemu-devel] Re: [PATCH 03/11] pci: s/PCI_SUBVENDOR_ID/PCI_SUBSYSTEM_VENDOR_ID/g List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Isaku Yamahata Cc: qemu-devel@nongnu.org On Mon, Dec 14, 2009 at 09:48:18PM +0900, Isaku Yamahata wrote: > 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 344d72b..fb03ee2 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 d279e3f..0309674 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) */ > -- > 1.6.5.4