From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LRVrx-0006D1-QY
	for qemu-devel@nongnu.org; Mon, 26 Jan 2009 13:07:33 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LRVrx-0006Cf-4M
	for qemu-devel@nongnu.org; Mon, 26 Jan 2009 13:07:33 -0500
Received: from [199.232.76.173] (port=51650 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LRVrw-0006CW-Ug
	for qemu-devel@nongnu.org; Mon, 26 Jan 2009 13:07:33 -0500
Received: from mx20.gnu.org ([199.232.41.8]:51774)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LRV3X-0003pp-F7
	for qemu-devel@nongnu.org; Mon, 26 Jan 2009 12:15:27 -0500
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LRTLL-0005Jl-Jt
	for qemu-devel@nongnu.org; Mon, 26 Jan 2009 10:25:43 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LRTIV-0002PD-4k
	for qemu-devel@nongnu.org; Mon, 26 Jan 2009 15:22:47 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LRTIU-0002P8-So
	for qemu-devel@nongnu.org; Mon, 26 Jan 2009 15:22:47 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LRTIU-0002P8-So@cvs.savannah.gnu.org>
Date: Mon, 26 Jan 2009 15:22:46 +0000
Subject: [Qemu-devel] [6439] Add macro for virtio-console PCI device ID
	(Mark McLoughlin)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6439
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6439
Author:   aliguori
Date:     2009-01-26 15:22:46 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
Add macro for virtio-console PCI device ID (Mark McLoughlin)

Also use the existing macro for the PCI vendor ID

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/hw/pci.h
    trunk/hw/virtio-console.c

Modified: trunk/hw/pci.h
===================================================================
--- trunk/hw/pci.h	2009-01-26 15:22:41 UTC (rev 6438)
+++ trunk/hw/pci.h	2009-01-26 15:22:46 UTC (rev 6439)
@@ -16,6 +16,7 @@
 #define PCI_DEVICE_ID_VIRTIO_NET         0x1000
 #define PCI_DEVICE_ID_VIRTIO_BLOCK       0x1001
 #define PCI_DEVICE_ID_VIRTIO_BALLOON     0x1002
+#define PCI_DEVICE_ID_VIRTIO_CONSOLE     0x1003
 
 typedef void PCIConfigWriteFunc(PCIDevice *pci_dev,
                                 uint32_t address, uint32_t data, int len);

Modified: trunk/hw/virtio-console.c
===================================================================
--- trunk/hw/virtio-console.c	2009-01-26 15:22:41 UTC (rev 6438)
+++ trunk/hw/virtio-console.c	2009-01-26 15:22:46 UTC (rev 6439)
@@ -126,7 +126,8 @@
     VirtIOConsole *s;
 
     s = (VirtIOConsole *)virtio_init_pci(bus, "virtio-console",
-                                         6900, 0x1003,
+                                         PCI_VENDOR_ID_REDHAT_QUMRANET,
+                                         PCI_DEVICE_ID_VIRTIO_CONSOLE,
                                          0, VIRTIO_ID_CONSOLE,
                                          0x03, 0x80, 0x00,
                                          0, sizeof(VirtIOConsole));