#include <palacios/vm_guest_mem.h>
#include <devices/lnx_virtio_pci.h>
#include <palacios/vmm_symmod.h>
+#include <palacios/vmm_hashtable.h>
#include <devices/pci.h>
#define NUM_QUEUES 2
struct sym_config {
+ uint32_t avail_mods;
+ uint32_t loaded_mods;
} __attribute__((packed));
struct vm_device * pci_bus;
struct pci_device * pci_dev;
-
+ struct v3_vm_info * vm;
+ struct v3_symmod_state * symmod_state;
+
#define NOTIFY_QUEUE 0
#define LOADER_QUEUE 1
+struct symmod_cmd {
+#define CMD_INV 0
+#define CMD_LOAD 1
+#define CMD_LIST 2
+ uint32_t cmd;
+ uint32_t num_cmds;
+} __attribute__((packed));
+
+
// structure of the symmod notifier ring structures
struct symmod_hdr {
uint32_t num_bytes;
char name[32];
+ union {
+ uint32_t flags;
+ struct {
+#define V3_SYMMOD_INV (0x00)
+#define V3_SYMMOD_LNX (0x01)
+#define V3_SYMMOD_MOD (0x02)
+#define V3_SYMMOD_SEC (0x03)
+ uint8_t type;
+
+#define V3_SYMMOD_ARCH_INV (0x00)
+#define V3_SYMMOD_ARCH_i386 (0x01)
+#define V3_SYMMOD_ARCH_x86_64 (0x02)
+ uint8_t arch;
+
+#define V3_SYMMOD_ACT_INV (0x00)
+#define V3_SYMMOD_ACT_ADVERTISE (0x01)
+#define V3_SYMMOD_ACT_LOAD (0x02)
+ uint8_t action;
+
+ uint8_t rsvd;
+ } __attribute__((packed));
+ } __attribute__((packed));
} __attribute__((packed));
virtio->queue[1].queue_size = QUEUE_SIZE;
- memset(&(virtio->sym_cfg), 0, sizeof(struct sym_config));
+ virtio->sym_cfg.avail_mods = virtio->symmod_state->num_avail_capsules;
+ virtio->sym_cfg.loaded_mods = virtio->symmod_state->num_loaded_capsules;
return 0;
}
static int handle_xfer_kick(struct guest_info * core, struct virtio_sym_state * sym_state) {
struct virtio_queue * q = sym_state->cur_queue;
- PrintDebug("SYMMOD: VIRTIO SYMMOD Kick on loader queue\n");
+ PrintDebug(core->vm_info, core, "SYMMOD: VIRTIO SYMMOD Kick on loader queue\n");
- while (q->cur_avail_idx < q->avail->index) {
- struct vring_desc * hdr_desc = NULL;
- struct vring_desc * buf_desc = NULL;
- struct vring_desc * status_desc = NULL;
+ while (q->cur_avail_idx != q->avail->index) {
+ struct vring_desc * cmd_desc = NULL;
+ struct symmod_cmd * cmd = NULL;
uint16_t desc_idx = q->avail->ring[q->cur_avail_idx % QUEUE_SIZE];
uint16_t desc_cnt = get_desc_count(q, desc_idx);
- struct symmod_hdr * hdr = NULL;
- int i;
- uint32_t xfer_len = 0;
+ struct vring_desc * status_desc = NULL;
uint8_t status = 0;
uint8_t * status_ptr = NULL;
- struct v3_sym_module * module = NULL;
- uint32_t offset = 0;
-
-
- PrintDebug("Descriptor Count=%d, index=%d\n", desc_cnt, q->cur_avail_idx % QUEUE_SIZE);
+ int i;
+ uint32_t xfer_len = 0;
- if (desc_cnt < 3) {
- PrintError("Symmod loads must include at least 3 descriptors (cnt=%d)\n", desc_cnt);
+ cmd_desc = &(q->desc[desc_idx]);
+
+ if (v3_gpa_to_hva(core, cmd_desc->addr_gpa, (addr_t *)&cmd) == -1) {
+ PrintError(core->vm_info, core, "Could not translate SYMMOD header address\n");
return -1;
}
+
+ desc_idx = cmd_desc->next;
+
+ if (cmd->cmd == CMD_LOAD) {
+ struct vring_desc * name_desc = NULL;
+ struct vring_desc * buf_desc = NULL;
+ char * name = NULL;
+ struct v3_sym_capsule * capsule = NULL;
+ uint32_t offset = 0;
+
+
+ PrintDebug(core->vm_info, core, "Descriptor Count=%d, index=%d\n", desc_cnt, q->cur_avail_idx % QUEUE_SIZE);
+
+ if (desc_cnt < 3) {
+ PrintError(core->vm_info, core, "Symmod loads must include at least 3 descriptors (cnt=%d)\n", desc_cnt);
+ return -1;
+ }
- hdr_desc = &(q->desc[desc_idx]);
+ name_desc = &(q->desc[desc_idx]);
- if (guest_pa_to_host_va(core, hdr_desc->addr_gpa, (addr_t *)&hdr) == -1) {
- PrintError("Could not translate SYMMOD header address\n");
- return -1;
- }
+ if (v3_gpa_to_hva(core, name_desc->addr_gpa, (addr_t *)&name) == -1) {
+ PrintError(core->vm_info, core, "Could not translate SYMMOD header address\n");
+ return -1;
+ }
- desc_idx = hdr_desc->next;
+ desc_idx = name_desc->next;
- module = v3_get_sym_module(core->vm_info, hdr->name);
+ capsule = v3_get_sym_capsule(core->vm_info, name);
- for (i = 0; i < desc_cnt - 2; i++) {
- uint8_t tmp_status = 0;
- uint8_t * buf = NULL;
+ for (i = 0; i < desc_cnt - 3; i++) {
+ uint8_t tmp_status = 0;
+ uint8_t * buf = NULL;
- buf_desc = &(q->desc[desc_idx]);
+ buf_desc = &(q->desc[desc_idx]);
- if (guest_pa_to_host_va(core, buf_desc->addr_gpa, (addr_t *)&(buf)) == -1) {
- PrintError("Could not translate buffer address\n");
- return -1;
- }
+ if (v3_gpa_to_hva(core, buf_desc->addr_gpa, (addr_t *)&(buf)) == -1) {
+ PrintError(core->vm_info, core, "Could not translate buffer address\n");
+ return -1;
+ }
- memcpy(buf, module->data + offset, buf_desc->length);
- PrintDebug("Copying module to virtio buffers: SRC=%p, DST=%p, len=%d\n",
- (void *)(module->data + offset), (void *)buf, buf_desc->length);
+ memcpy(buf, capsule->start_addr + offset, buf_desc->length);
+ PrintDebug(core->vm_info, core, "Copying module to virtio buffers: SRC=%p, DST=%p, len=%d\n",
+ (void *)(capsule->start_addr + offset), (void *)buf, buf_desc->length);
- if (tmp_status != 0) {
- PrintError("Error loading module segment\n");
- status = tmp_status;
- }
+ if (tmp_status != 0) {
+ PrintError(core->vm_info, core, "Error loading module segment\n");
+ status = tmp_status;
+ }
- offset += buf_desc->length;
- xfer_len += buf_desc->length;
- desc_idx = buf_desc->next;
+ offset += buf_desc->length;
+ xfer_len += buf_desc->length;
+ desc_idx = buf_desc->next;
+ }
+ } else {
+ PrintError(core->vm_info, core, "Invalid SYMMOD Loader command\n");
+ return -1;
}
status_desc = &(q->desc[desc_idx]);
- if (guest_pa_to_host_va(core, status_desc->addr_gpa, (addr_t *)&status_ptr) == -1) {
- PrintError("SYMMOD Error could not translate status address\n");
+ if (v3_gpa_to_hva(core, status_desc->addr_gpa, (addr_t *)&status_ptr) == -1) {
+ PrintError(core->vm_info, core, "SYMMOD Error could not translate status address\n");
return -1;
}
xfer_len += status_desc->length;
*status_ptr = status;
- PrintDebug("Transferred %d bytes (xfer_len)\n", xfer_len);
+ PrintDebug(core->vm_info, core, "Transferred %d bytes (xfer_len)\n", xfer_len);
q->used->ring[q->used->index % QUEUE_SIZE].id = q->avail->ring[q->cur_avail_idx % QUEUE_SIZE];
q->used->ring[q->used->index % QUEUE_SIZE].length = xfer_len; // set to total inbound xfer length
q->used->index++;
q->cur_avail_idx++;
+
+ }
+
+
+ if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) {
+ PrintDebug(core->vm_info, core, "Raising IRQ %d\n", sym_state->pci_dev->config_header.intr_line);
+ v3_pci_raise_irq(sym_state->pci_bus, sym_state->pci_dev, 0);
+ sym_state->virtio_cfg.pci_isr = 1;
}
+ return 0;
+}
+
+
+
+
+static int handle_notification_kick(struct guest_info * core, struct virtio_sym_state * sym_state) {
+ // struct virtio_queue * q = sym_state->cur_queue;
+ struct virtio_queue * q = &(sym_state->queue[NOTIFY_QUEUE]);
+ struct hashtable_iter * capsule_iter = NULL;
+
+ PrintDebug(core->vm_info, core, "SYMMOD: VIRTIO SYMMOD Kick on notification queue\n");
+
+ capsule_iter = v3_create_htable_iter(sym_state->symmod_state->capsule_table);
+
+ do {
+ uint16_t desc_idx = q->avail->ring[q->cur_avail_idx % q->queue_size];
+ struct vring_desc * hdr_desc = NULL;
+ struct symmod_hdr * hdr = NULL;
+ struct v3_sym_capsule * capsule = NULL;
+
+
+ capsule = (struct v3_sym_capsule *)v3_htable_get_iter_value(capsule_iter);
+
+
+ PrintDebug(core->vm_info, core, "SYMMOD: Advertising Capsule %s\n", capsule->name);
+
+ if (capsule->type != V3_SYMMOD_LNX) {
+ continue;
+ }
+
+
+
+ if (q->cur_avail_idx == q->avail->index) {
+ PrintError(core->vm_info, core, "Notification Queue Too SMALL\n");
+ return -1;
+ }
+
+ hdr_desc = &(q->desc[desc_idx]);
+
+ if (v3_gpa_to_hva(core, hdr_desc->addr_gpa, (addr_t *)&hdr) == -1) {
+ PrintError(core->vm_info, core, "Could not translate SYMMOD header address\n");
+ return -1;
+ }
+
+ memset(hdr, 0, sizeof(struct symmod_hdr));
+
+
+ memcpy(hdr->name, capsule->name, strlen(capsule->name));
+ hdr->num_bytes = capsule->size;
+ hdr->flags = capsule->flags;
+ hdr->action = V3_SYMMOD_ACT_ADVERTISE;
+
+ q->used->ring[q->used->index % QUEUE_SIZE].id = q->avail->ring[q->cur_avail_idx % QUEUE_SIZE];
+ q->used->ring[q->used->index % QUEUE_SIZE].length = sizeof(struct symmod_hdr) ; // set to total inbound xfer length
+
+ q->used->index++;
+ q->cur_avail_idx++;
+
+ } while (v3_htable_iter_advance(capsule_iter));
+
+
if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) {
- PrintDebug("Raising IRQ %d\n", sym_state->pci_dev->config_header.intr_line);
- v3_pci_raise_irq(sym_state->pci_bus, 0, sym_state->pci_dev);
+ PrintDebug(core->vm_info, core, "Raising IRQ %d\n", sym_state->pci_dev->config_header.intr_line);
+ v3_pci_raise_irq(sym_state->pci_bus, sym_state->pci_dev, 0);
sym_state->virtio_cfg.pci_isr = 1;
}
int port_idx = port % sym_state->io_range_size;
- PrintDebug("SYMMOD: VIRTIO SYMMOD Write for port %d len=%d, value=%x\n",
+ PrintDebug(core->vm_info, core, "SYMMOD: VIRTIO SYMMOD Write for port %d len=%d, value=%x\n",
port, length, *(uint32_t *)src);
- PrintDebug("SYMMOD: port idx=%d\n", port_idx);
+ PrintDebug(core->vm_info, core, "SYMMOD: port idx=%d\n", port_idx);
switch (port_idx) {
case GUEST_FEATURES_PORT:
if (length != 4) {
- PrintError("Illegal write length for guest features\n");
+ PrintError(core->vm_info, core, "Illegal write length for guest features\n");
return -1;
}
// round up to next page boundary.
sym_state->cur_queue->ring_used_addr = (sym_state->cur_queue->ring_used_addr + 0xfff) & ~0xfff;
- if (guest_pa_to_host_va(core, sym_state->cur_queue->ring_desc_addr, (addr_t *)&(sym_state->cur_queue->desc)) == -1) {
- PrintError("Could not translate ring descriptor address\n");
+ if (v3_gpa_to_hva(core, sym_state->cur_queue->ring_desc_addr, (addr_t *)&(sym_state->cur_queue->desc)) == -1) {
+ PrintError(core->vm_info, core, "Could not translate ring descriptor address\n");
return -1;
}
- if (guest_pa_to_host_va(core, sym_state->cur_queue->ring_avail_addr, (addr_t *)&(sym_state->cur_queue->avail)) == -1) {
- PrintError("Could not translate ring available address\n");
+ if (v3_gpa_to_hva(core, sym_state->cur_queue->ring_avail_addr, (addr_t *)&(sym_state->cur_queue->avail)) == -1) {
+ PrintError(core->vm_info, core, "Could not translate ring available address\n");
return -1;
}
- if (guest_pa_to_host_va(core, sym_state->cur_queue->ring_used_addr, (addr_t *)&(sym_state->cur_queue->used)) == -1) {
- PrintError("Could not translate ring used address\n");
+ if (v3_gpa_to_hva(core, sym_state->cur_queue->ring_used_addr, (addr_t *)&(sym_state->cur_queue->used)) == -1) {
+ PrintError(core->vm_info, core, "Could not translate ring used address\n");
return -1;
}
- PrintDebug("SYMMOD: RingDesc_addr=%p, Avail_addr=%p, Used_addr=%p\n",
+ PrintDebug(core->vm_info, core, "SYMMOD: RingDesc_addr=%p, Avail_addr=%p, Used_addr=%p\n",
(void *)(sym_state->cur_queue->ring_desc_addr),
(void *)(sym_state->cur_queue->ring_avail_addr),
(void *)(sym_state->cur_queue->ring_used_addr));
- PrintDebug("SYMMOD: RingDesc=%p, Avail=%p, Used=%p\n",
+ PrintDebug(core->vm_info, core, "SYMMOD: RingDesc=%p, Avail=%p, Used=%p\n",
sym_state->cur_queue->desc, sym_state->cur_queue->avail, sym_state->cur_queue->used);
} else {
- PrintError("Illegal write length for page frame number\n");
+ PrintError(core->vm_info, core, "Illegal write length for page frame number\n");
return -1;
}
break;
sym_state->virtio_cfg.vring_queue_selector = *(uint16_t *)src;
if (sym_state->virtio_cfg.vring_queue_selector > NUM_QUEUES) {
- PrintError("Virtio Symbiotic device has no qeueues. Selected %d\n",
+ PrintError(core->vm_info, core, "Virtio Symbiotic device has no qeueues. Selected %d\n",
sym_state->virtio_cfg.vring_queue_selector);
return -1;
}
break;
case VRING_Q_NOTIFY_PORT: {
uint16_t queue_idx = *(uint16_t *)src;
-
- PrintDebug("SYMMOD: Handling Kick\n");
-
+
+ PrintDebug(core->vm_info, core, "SYMMOD: Handling Kick\n");
+
if (queue_idx == 0) {
+ if (handle_notification_kick(core, sym_state) == -1) {
+ PrintError(core->vm_info, core, "Could not handle Notification Kick\n");
+ return -1;
+ }
+
sym_state->notifier_active = 1;
-
+
} else if (queue_idx == 1) {
if (handle_xfer_kick(core, sym_state) == -1) {
- PrintError("Could not handle Symbiotic Notification\n");
+ PrintError(core->vm_info, core, "Could not handle Symbiotic Notification\n");
return -1;
}
} else {
- PrintError("Kick on invalid queue (%d)\n", queue_idx);
+ PrintError(core->vm_info, core, "Kick on invalid queue (%d)\n", queue_idx);
return -1;
}
-
+
break;
}
case VIRTIO_STATUS_PORT:
sym_state->virtio_cfg.status = *(uint8_t *)src;
if (sym_state->virtio_cfg.status == 0) {
- PrintDebug("SYMMOD: Resetting device\n");
+ PrintDebug(core->vm_info, core, "SYMMOD: Resetting device\n");
virtio_reset(sym_state);
}
int port_idx = port % sym_state->io_range_size;
/*
- PrintDebug("SYMMOD: VIRTIO SYMBIOTIC Read for port %d (index =%d), length=%d\n",
+ PrintDebug(core->vm_info, core, "SYMMOD: 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) {
- PrintError("Illegal read length for host features\n");
+ PrintError(core->vm_info, core, "Illegal read length for host features\n");
return -1;
}
break;
case VRING_PG_NUM_PORT:
if (length != 4) {
- PrintError("Illegal read length for page frame number\n");
+ PrintError(core->vm_info, core, "Illegal read length for page frame number\n");
return -1;
}
break;
case VRING_SIZE_PORT:
if (length != 2) {
- PrintError("Illegal read length for vring size\n");
+ PrintError(core->vm_info, core, "Illegal read length for vring size\n");
return -1;
}
case VIRTIO_STATUS_PORT:
if (length != 1) {
- PrintError("Illegal read length for status\n");
+ PrintError(core->vm_info, core, "Illegal read length for status\n");
return -1;
}
case VIRTIO_ISR_PORT:
*(uint8_t *)dst = sym_state->virtio_cfg.pci_isr;
sym_state->virtio_cfg.pci_isr = 0;
- v3_pci_lower_irq(sym_state->pci_bus, 0, sym_state->pci_dev);
+ v3_pci_lower_irq(sym_state->pci_bus, sym_state->pci_dev, 0);
break;
default:
uint8_t * cfg_ptr = (uint8_t *)&(sym_state->sym_cfg);
memcpy(dst, cfg_ptr + cfg_offset, length);
+
+ V3_Print(core->vm_info, core, "Reading SymConfig at idx %d (val=%x)\n", cfg_offset, *(uint32_t *)cfg_ptr);
} else {
- PrintError("Read of Unhandled Virtio Read\n");
+ PrintError(core->vm_info, core, "Read of Unhandled Virtio Read\n");
return -1;
}
-static int virtio_load_module(struct v3_vm_info * vm, char * name, int mod_size, void * priv_data) {
+static int virtio_load_capsule(struct v3_vm_info * vm, struct v3_sym_capsule * mod, void * priv_data) {
struct virtio_sym_state * virtio = (struct virtio_sym_state *)priv_data;
// struct virtio_queue * q = virtio->cur_queue;
struct virtio_queue * q = &(virtio->queue[NOTIFY_QUEUE]);
- if (strlen(name) >= 32) {
- PrintError("Module name is too long... (%d bytes) limit is 32\n", (uint32_t)strlen(name));
+
+ if (strlen(mod->name) >= 32) {
+ PrintError(vm, VCORE_NONE, "Capsule name is too long... (%d bytes) limit is 32\n", (uint32_t)strlen(mod->name));
return -1;
}
- PrintDebug("SYMMOD: VIRTIO SYMMOD Loader: Loading Module (size=%d)\n", mod_size);
+ PrintDebug(vm, VCORE_NONE, "SYMMOD: VIRTIO SYMMOD Loader: Loading Capsule (size=%d)\n", mod->size);
//queue is not set yet
if (q->ring_avail_addr == 0) {
- PrintError("Queue is not set\n");
+ PrintError(vm, VCORE_NONE, "Queue is not set\n");
return -1;
}
- if (q->cur_avail_idx < q->avail->index) {
+ if (q->cur_avail_idx != q->avail->index) {
uint16_t notifier_idx = q->avail->ring[q->cur_avail_idx % q->queue_size];
struct symmod_hdr * notifier = NULL;
struct vring_desc * notifier_desc = NULL;
- PrintDebug("SYMMOD: Descriptor index=%d\n", q->cur_avail_idx % q->queue_size);
+ PrintDebug(vm, VCORE_NONE, "SYMMOD: Descriptor index=%d\n", q->cur_avail_idx % q->queue_size);
notifier_desc = &(q->desc[notifier_idx]);
- PrintDebug("SYMMOD: Notifier Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d\n", notifier_desc,
- (void *)(notifier_desc->addr_gpa), notifier_desc->length, notifier_desc->flags, notifier_desc->next);
+ PrintDebug(vm, VCORE_NONE, "SYMMOD: Notifier Descriptor (ptr=%p) gpa=%p, len=%d, flags=%x, next=%d\n",
+ notifier_desc, (void *)(addr_t)(notifier_desc->addr_gpa),
+ notifier_desc->length, notifier_desc->flags,
+ notifier_desc->next);
- if (guest_pa_to_host_va(&(vm->cores[0]), notifier_desc->addr_gpa, (addr_t *)&(notifier)) == -1) {
- PrintError("Could not translate receive buffer address\n");
+ if (v3_gpa_to_hva(&(vm->cores[0]), notifier_desc->addr_gpa, (addr_t *)&(notifier)) == -1) {
+ PrintError(vm, VCORE_NONE, "Could not translate receive buffer address\n");
return -1;
}
// clear the notifier
memset(notifier, 0, sizeof(struct symmod_hdr));
- // set the module name
- memcpy(notifier->name, name, strlen(name));
+ // set the capsule name
+ memcpy(notifier->name, mod->name, strlen(mod->name));
- // set module length
- notifier->num_bytes = mod_size;
+ // set capsule length
+ notifier->num_bytes = mod->size;
+ notifier->flags = mod->flags;
+ notifier->action = V3_SYMMOD_ACT_LOAD;
q->used->ring[q->used->index % q->queue_size].id = q->avail->ring[q->cur_avail_idx % q->queue_size];
}
if (!(q->avail->flags & VIRTIO_NO_IRQ_FLAG)) {
- PrintDebug("SYMMOD: Raising IRQ %d\n", virtio->pci_dev->config_header.intr_line);
- v3_pci_raise_irq(virtio->pci_bus, 0, virtio->pci_dev);
+ PrintDebug(vm, VCORE_NONE, "SYMMOD: Raising IRQ %d\n", virtio->pci_dev->config_header.intr_line);
+ v3_pci_raise_irq(virtio->pci_bus, virtio->pci_dev, 0);
virtio->virtio_cfg.pci_isr = 0x1;
}
}
+static int virtio_free(struct virtio_sym_state * virtio_state) {
+ // unregister from PCI
+
+ V3_Free(virtio_state);
+ return 0;
+}
static struct v3_device_ops dev_ops = {
- .free = NULL,
- .reset = NULL,
- .start = NULL,
- .stop = NULL,
+ .free = (int (*)(void *))virtio_free,
};
static struct v3_symmod_loader_ops loader_ops = {
- .load_module = virtio_load_module,
+ .load_capsule = virtio_load_capsule,
};
static int virtio_init(struct v3_vm_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 v3_symmod_state * symmod_state = &(vm->sym_vm_state.symmod_state);
struct pci_device * pci_dev = NULL;
- char * name = v3_cfg_val(cfg, "name");
+ char * dev_id = v3_cfg_val(cfg, "ID");
- PrintDebug("SYMMOD: Initializing VIRTIO Symbiotic Module device\n");
+ PrintDebug(vm, VCORE_NONE, "SYMMOD: Initializing VIRTIO Symbiotic Module device\n");
if (pci_bus == NULL) {
- PrintError("VirtIO devices require a PCI Bus");
+ PrintError(vm, VCORE_NONE, "VirtIO devices require a PCI Bus");
return -1;
}
virtio_state = (struct virtio_sym_state *)V3_Malloc(sizeof(struct virtio_sym_state));
+
+ if (!virtio_state) {
+ PrintError(vm, VCORE_NONE, "Cannot allocate in init\n");
+ return -1;
+ }
+
memset(virtio_state, 0, sizeof(struct virtio_sym_state));
- struct vm_device * dev = v3_allocate_device(name, &dev_ops, virtio_state);
+ virtio_state->vm = vm;
+ virtio_state->symmod_state = symmod_state;
- if (v3_attach_device(vm, dev) == -1) {
- PrintError("Could not attach device %s\n", name);
+
+
+
+ struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, virtio_state);
+
+ if (dev == NULL) {
+ PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id);
+ V3_Free(virtio_state);
return -1;
}
pci_dev = v3_pci_register_device(pci_bus, PCI_STD_DEVICE,
0, PCI_AUTO_DEV_NUM, 0,
"LNX_VIRTIO_SYMMOD", bars,
- NULL, NULL, NULL, virtio_state);
+ NULL, NULL, NULL, NULL, virtio_state);
if (!pci_dev) {
- PrintError("Could not register PCI Device\n");
+ PrintError(vm, VCORE_NONE, "Could not register PCI Device\n");
+ v3_remove_device(dev);
return -1;
}
virtio_state->pci_dev = pci_dev;
virtio_state->pci_bus = pci_bus;
}
+
+
+ V3_Print(vm, VCORE_NONE, "SYMMOD: %d available sym modules\n", virtio_state->sym_cfg.avail_mods);
virtio_reset(virtio_state);
