From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LTdUO-0002vw-HH for qemu-devel@nongnu.org; Sun, 01 Feb 2009 09:40:00 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LTdUM-0002vF-M8 for qemu-devel@nongnu.org; Sun, 01 Feb 2009 09:39:59 -0500 Received: from [199.232.76.173] (port=38751 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LTdUM-0002v9-Gk for qemu-devel@nongnu.org; Sun, 01 Feb 2009 09:39:58 -0500 Received: from mail-bw0-f12.google.com ([209.85.218.12]:60547) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LTdUL-0003Ch-Vb for qemu-devel@nongnu.org; Sun, 01 Feb 2009 09:39:58 -0500 Received: by bwz5 with SMTP id 5so876750bwz.10 for ; Sun, 01 Feb 2009 06:39:55 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <20090201132220.GA13663@miranda.arrow> References: <20090201132220.GA13663@miranda.arrow> Date: Sun, 1 Feb 2009 16:39:55 +0200 Message-ID: Subject: Re: [Qemu-devel] [6490] Update #defines for PCI vendor and device IDs from OpenBIOS and Linux From: Blue Swirl Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org On 2/1/09, Stuart Brady wrote: > On Sun, Feb 01, 2009 at 12:01:07PM +0000, Blue Swirl wrote: > > Update #defines for PCI vendor and device IDs from OpenBIOS and Linux > > > Just a few questions... > > > > Modified: trunk/hw/grackle_pci.c > > =================================================================== > > --- trunk/hw/grackle_pci.c 2009-01-30 20:39:41 UTC (rev 6489) > > +++ trunk/hw/grackle_pci.c 2009-02-01 12:01:04 UTC (rev 6490) > > @@ -154,10 +154,8 @@ > > > > #if 0 > > /* PCI2PCI bridge same values as PearPC - check this */ > > - d->config[0x00] = 0x11; // vendor_id > > - d->config[0x01] = 0x10; > > - d->config[0x02] = 0x26; // device_id > > - d->config[0x03] = 0x00; > > + pci_config_set_vendor_id(d->config, PCI_VENDOR_ID_DEC); > > + pci_config_set_device_id(d->config, PCI_DEVICE_ID_DEC_21154); > > > Isn't the DEC 21154 is a Tulip-compatible NIC, and not a PCI bridge? > Yes, 0x1011 is the Vendor ID for DEC, and 0x0026 is the Device ID for > the 21154, but what was actually intended here? I'd rather guess it's a PCI bridge. > > +#define PCI_DEVICE_ID_IBM_OPENPIC2 0xffff > > > +#define PCI_DEVICE_ID_APPLE_343S1201 0x0010 > > +#define PCI_DEVICE_ID_APPLE_UNI_N_I_PCI 0x001e > > +#define PCI_DEVICE_ID_APPLE_UNI_N_PCI 0x001f > > > +#define PCI_DEVICE_ID_APPLE_UNI_N_KEYL 0x0022 > > > +#define PCI_DEVICE_ID_REALTEK_RTL8029 0x8029 > > #define PCI_DEVICE_ID_REALTEK_8139 0x8139 > > > It probably wouldn't hurt to mark IDs without a corresponding definition > in Linux's pci_ids.h with a comment... (Also, RTL8029 vs. 8139?...) That's what ne2k uses (not 8139). > > +#define PCI_VENDOR_ID_QEMU 0x1234 > > +#define PCI_DEVICE_ID_QEMU_VGA 0x1111 > > > I gather 0x1234/0x1111 was originally chosen by Bochs. Unfortunately, > it is apparently allocated to 'Technical Corp.' Would it be possible > to use something less confusing instead? The IDs could be replaced with some real, original VGA compatible PCI card, without any extra features. Bochs extensions should probably be disabled then. Any suggestions?