diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-11 21:20:03 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-11 21:20:03 +0000 |
| commit | 9b32d5a5f75b6823940faf2ffa05341608ec5423 (patch) | |
| tree | c4f5d6455ca4f1ea18e5ba0c1f233dfa0ef51d77 | |
| parent | d350d97d196a632b6c7493acf07a061017fc6f7d (diff) | |
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
| -rw-r--r-- | hw/pc.c | 3 | ||||
| -rw-r--r-- | hw/virtio-balloon.c | 3 | ||||
| -rw-r--r-- | hw/virtio-blk.c | 7 | ||||
| -rw-r--r-- | hw/virtio-blk.h | 3 |
4 files changed, 8 insertions, 8 deletions
@@ -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 e668436ca1..07655168db 100644 --- 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 91b90d2030..e654cc58a0 100644 --- 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 c6661c0ad7..8c91e1ece6 100644 --- 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 |