From 9b32d5a5f75b6823940faf2ffa05341608ec5423 Mon Sep 17 00:00:00 2001 From: aliguori Date: Thu, 11 Dec 2008 21:20:03 +0000 Subject: 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 Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5987 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/virtio-blk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'hw/virtio-blk.c') 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)); -- cgit v1.2.3