pci: virtio: use pci id defines (Gerd Hoffman)

Use the defines added by the previous patch in the virtio drivers.
Also remove the pointless vendor and device args from the
virtio_blk_init() function.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5987 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/pc.c b/hw/pc.c
index 20827f2..73dd8bc 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1101,8 +1101,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
         int unit_id = 0;
 
         while ((index = drive_get_index(IF_VIRTIO, 0, unit_id)) != -1) {
-            virtio_blk_init(pci_bus, 0x1AF4, 0x1001,
-                            drives_table[index].bdrv);
+            virtio_blk_init(pci_bus, drives_table[index].bdrv);
             unit_id++;
         }
     }

diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index e668436..0765516 100644 (file)
--- a/hw/virtio-balloon.c
+++ b/hw/virtio-balloon.c
@@ -172,7 +172,8 @@ void *virtio_balloon_init(PCIBus *bus)
     VirtIOBalloon *s;
 
     s = (VirtIOBalloon *)virtio_init_pci(bus, "virtio-balloon",
-                                         6900, 0x1002,
+                                         PCI_VENDOR_ID_REDHAT_QUMRANET,
+                                         PCI_DEVICE_ID_VIRTIO_BALLOON,
                                          0, VIRTIO_ID_BALLOON,
                                          0x05, 0x00, 0x00,
                                          8, sizeof(VirtIOBalloon));

diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index 91b90d2..e654cc5 100644 (file)
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -218,14 +218,15 @@ static int virtio_blk_load(QEMUFile *f, void *opaque, int version_id)
     return 0;
 }
 
-void *virtio_blk_init(PCIBus *bus, uint16_t vendor, uint16_t device,
-                      BlockDriverState *bs)
+void *virtio_blk_init(PCIBus *bus, BlockDriverState *bs)
 {
     VirtIOBlock *s;
     int cylinders, heads, secs;
     static int virtio_blk_id;
 
-    s = (VirtIOBlock *)virtio_init_pci(bus, "virtio-blk", vendor, device,
+    s = (VirtIOBlock *)virtio_init_pci(bus, "virtio-blk",
+                                       PCI_VENDOR_ID_REDHAT_QUMRANET,
+                                       PCI_DEVICE_ID_VIRTIO_BLOCK,
                                        0, VIRTIO_ID_BLOCK,
                                        0x01, 0x80, 0x00,
                                        sizeof(struct virtio_blk_config), sizeof(VirtIOBlock));

diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h
index c6661c0..8c91e1e 100644 (file)
--- a/hw/virtio-blk.h
+++ b/hw/virtio-blk.h
@@ -70,7 +70,6 @@ struct virtio_blk_inhdr
     unsigned char status;
 };
 
-void *virtio_blk_init(PCIBus *bus, uint16_t vendor, uint16_t device,
-                      BlockDriverState *bs);
+void *virtio_blk_init(PCIBus *bus, BlockDriverState *bs);
 
 #endif