#include "boards.h"
#include "monitor.h"
#include "fw_cfg.h"
-#include "virtio-blk.h"
#include "virtio-balloon.h"
#include "virtio-console.h"
#include "hpet_emul.h"
int unit_id = 0;
while ((index = drive_get_index(IF_VIRTIO, 0, unit_id)) != -1) {
- virtio_blk_init(pci_bus, drives_table[index].bdrv);
+ pci_create_simple(pci_bus, -1, "virtio-blk");
unit_id++;
}
}
#include "net.h"
#include "hw.h"
#include "pci.h"
-#include "virtio-blk.h"
#include "virtio-console.h"
#include "boards.h"
#include "sysemu.h"
/* Add virtio block devices. */
while ((i = drive_get_index(IF_VIRTIO, 0, unit_id)) != -1) {
- virtio_blk_init(pcibus, drives_table[i].bdrv);
+ pci_create_simple(pcibus, -1, "virtio-blk");
unit_id++;
}
#include "hw.h"
#include "pc.h"
#include "pci.h"
-#include "virtio-blk.h"
#include "boards.h"
#include "sysemu.h"
#include "kvm.h"
/* Add virtio block devices. */
while ((i = drive_get_index(IF_VIRTIO, 0, unit_id)) != -1) {
- virtio_blk_init(pci_bus, drives_table[i].bdrv);
+ pci_create_simple(pci_bus, -1, "virtio-blk");
unit_id++;
}
return 0;
}
-void *virtio_blk_init(PCIBus *bus, BlockDriverState *bs)
+static void virtio_blk_init(PCIDevice *pci_dev)
{
VirtIOBlock *s;
int cylinders, heads, secs;
static int virtio_blk_id;
- PCIDevice *d;
-
- d = pci_register_device(bus, "virtio-blk", sizeof(VirtIOBlock),
- -1, NULL, NULL);
- if (!d)
- return NULL;
+ BlockDriverState *bs;
- s = (VirtIOBlock *)virtio_init_pci(d, "virtio-blk",
+ s = (VirtIOBlock *)virtio_init_pci(pci_dev, "virtio-blk",
PCI_VENDOR_ID_REDHAT_QUMRANET,
PCI_DEVICE_ID_VIRTIO_BLOCK,
PCI_VENDOR_ID_REDHAT_QUMRANET,
PCI_CLASS_STORAGE_OTHER, 0x00,
sizeof(struct virtio_blk_config));
+ bs = qdev_init_bdrv(&pci_dev->qdev, IF_VIRTIO);
s->vdev.get_config = virtio_blk_update_config;
s->vdev.get_features = virtio_blk_get_features;
s->vdev.reset = virtio_blk_reset;
qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s);
register_savevm("virtio-blk", virtio_blk_id++, 2,
virtio_blk_save, virtio_blk_load, s);
+}
- return s;
+static void virtio_blk_register_devices(void)
+{
+ pci_qdev_register("virtio-blk", sizeof(VirtIOBlock), virtio_blk_init);
}
+
+device_init(virtio_blk_register_devices)