summary refs log tree commit diff stats
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-26 15:22:46 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-26 15:22:46 +0000
commit14d50bef67881716bf750a1ddee9d2bb429e75f1 (patch)
tree04eee3d5bded517b4bd83757c509692a26488471
parenta7c4996b1fd05b4d74758810d0bf0987f22e8712 (diff)
downloadfocaccia-qemu-14d50bef67881716bf750a1ddee9d2bb429e75f1.tar.gz
focaccia-qemu-14d50bef67881716bf750a1ddee9d2bb429e75f1.zip
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>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6439 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--hw/pci.h1
-rw-r--r--hw/virtio-console.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/hw/pci.h b/hw/pci.h
index 867e6fe0c6..a94fd44a57 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -16,6 +16,7 @@ extern target_phys_addr_t pci_mem_base;
 #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);
diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index deae76d0de..ce20c91fd6 100644
--- a/hw/virtio-console.c
+++ b/hw/virtio-console.c
@@ -126,7 +126,8 @@ void *virtio_console_init(PCIBus *bus, CharDriverState *chr)
     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));