X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_sym.c;h=d27429b1224280fc0cab58d2a45c6b27d772b771;hb=798ebfe9dc90f8981881a31737230328a193b333;hp=ad5cbbd7e453890c84edc518fdf84e1b6f6665f1;hpb=3a4e54ec208ea3589963b410d2d73292bbc4a8fe;p=palacios.releases.git diff --git a/palacios/src/devices/lnx_virtio_sym.c b/palacios/src/devices/lnx_virtio_sym.c index ad5cbbd..d27429b 100644 --- a/palacios/src/devices/lnx_virtio_sym.c +++ b/palacios/src/devices/lnx_virtio_sym.c @@ -351,10 +351,11 @@ static struct v3_device_ops dev_ops = { -static int virtio_init(struct guest_info * vm, void * cfg_data) { - struct vm_device * pci_bus = v3_find_dev(vm, (char *)cfg_data); +static int virtio_init(struct guest_info * vm, v3_cfg_tree_t * cfg) { + struct vm_device * pci_bus = v3_find_dev(vm, v3_cfg_val(cfg, "bus")); struct virtio_sym_state * virtio_state = NULL; struct pci_device * pci_dev = NULL; + char * name = v3_cfg_val(cfg, "name"); PrintDebug("Initializing VIRTIO Symbiotic device\n"); @@ -368,9 +369,9 @@ static int virtio_init(struct guest_info * vm, void * cfg_data) { memset(virtio_state, 0, sizeof(struct virtio_sym_state)); - struct vm_device * dev = v3_allocate_device("LNX_VIRTIO_SYM", &dev_ops, virtio_state); + struct vm_device * dev = v3_allocate_device(name, &dev_ops, virtio_state); if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", "LNX_VIRTIO_SYM"); + PrintError("Could not attach device %s\n", name); return -1; } @@ -414,7 +415,7 @@ static int virtio_init(struct guest_info * vm, void * cfg_data) { pci_dev = v3_pci_register_device(pci_bus, PCI_STD_DEVICE, 0, PCI_AUTO_DEV_NUM, 0, "LNX_VIRTIO_SYM", bars, - NULL, NULL, NULL, dev, NULL); + NULL, NULL, NULL, dev); if (!pci_dev) { PrintError("Could not register PCI Device\n");