}
-static int virtio_io_write(uint16_t port, void * src, uint_t length, struct vm_device * dev) {
+static int virtio_io_write(uint16_t port, void * src, uint_t length, void * private_data) {
+ struct vm_device * dev = (struct vm_device *)private_data;
struct virtio_sym_state * virtio = (struct virtio_sym_state *)dev->private_data;
int port_idx = port % virtio->io_range_size;
+/*
PrintDebug("VIRTIO SYMBIOTIC Write for port %d (index=%d) len=%d, value=%x\n",
port, port_idx, length, *(uint32_t *)src);
-
+*/
switch (port_idx) {
}
-static int virtio_io_read(uint16_t port, void * dst, uint_t length, struct vm_device * dev) {
+static int virtio_io_read(uint16_t port, void * dst, uint_t length, void * private_data) {
+ struct vm_device * dev = (struct vm_device *)private_data;
struct virtio_sym_state * virtio = (struct virtio_sym_state *)dev->private_data;
int port_idx = port % virtio->io_range_size;
-
+/*
PrintDebug("VIRTIO SYMBIOTIC Read for port %d (index =%d), length=%d\n",
port, port_idx, length);
-
+*/
switch (port_idx) {
case HOST_FEATURES_PORT:
if (length != 4) {
-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");
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;
}
bars[0].io_read = virtio_io_read;
bars[0].io_write = virtio_io_write;
+ bars[0].private_data = dev;
pci_dev = v3_pci_register_device(pci_bus, PCI_STD_DEVICE,
0, PCI_AUTO_DEV_NUM, 0,