Revision 9b32d5a5

b/hw/pc.c
1101 1101
        int unit_id = 0;
1102 1102

  
1103 1103
        while ((index = drive_get_index(IF_VIRTIO, 0, unit_id)) != -1) {
1104
            virtio_blk_init(pci_bus, 0x1AF4, 0x1001,
1105
                            drives_table[index].bdrv);
1104
            virtio_blk_init(pci_bus, drives_table[index].bdrv);
1106 1105
            unit_id++;
1107 1106
        }
1108 1107
    }
b/hw/virtio-balloon.c
172 172
    VirtIOBalloon *s;
173 173

  
174 174
    s = (VirtIOBalloon *)virtio_init_pci(bus, "virtio-balloon",
175
                                         6900, 0x1002,
175
                                         PCI_VENDOR_ID_REDHAT_QUMRANET,
176
                                         PCI_DEVICE_ID_VIRTIO_BALLOON,
176 177
                                         0, VIRTIO_ID_BALLOON,
177 178
                                         0x05, 0x00, 0x00,
178 179
                                         8, sizeof(VirtIOBalloon));
b/hw/virtio-blk.c
218 218
    return 0;
219 219
}
220 220

  
221
void *virtio_blk_init(PCIBus *bus, uint16_t vendor, uint16_t device,
222
                      BlockDriverState *bs)
221
void *virtio_blk_init(PCIBus *bus, BlockDriverState *bs)
223 222
{
224 223
    VirtIOBlock *s;
225 224
    int cylinders, heads, secs;
226 225
    static int virtio_blk_id;
227 226

  
228
    s = (VirtIOBlock *)virtio_init_pci(bus, "virtio-blk", vendor, device,
227
    s = (VirtIOBlock *)virtio_init_pci(bus, "virtio-blk",
228
                                       PCI_VENDOR_ID_REDHAT_QUMRANET,
229
                                       PCI_DEVICE_ID_VIRTIO_BLOCK,
229 230
                                       0, VIRTIO_ID_BLOCK,
230 231
                                       0x01, 0x80, 0x00,
231 232
                                       sizeof(struct virtio_blk_config), sizeof(VirtIOBlock));
b/hw/virtio-blk.h
70 70
    unsigned char status;
71 71
};
72 72

  
73
void *virtio_blk_init(PCIBus *bus, uint16_t vendor, uint16_t device,
74
                      BlockDriverState *bs);
73
void *virtio_blk_init(PCIBus *bus, BlockDriverState *bs);
75 74

  
76 75
#endif

Also available in: Unified diff