#include <palacios/vmm.h>
#include <palacios/vmm_decoder.h>
+#ifdef V3_CONFIG_CHECKPOINT
+#include <palacios/vmm_checkpoint.h>
-#ifndef CONFIG_DEBUG_DEV_MGR
+#define V3_MAX_DEVICE_NAME 32
+
+#endif
+
+
+#ifndef V3_CONFIG_DEBUG_DEV_MGR
#undef PrintDebug
#define PrintDebug(fmt, args...)
#endif
}
-int v3_init_devices() {
+int V3_init_devices() {
extern struct v3_device_info __start__v3_devices[];
extern struct v3_device_info __stop__v3_devices[];
struct v3_device_info * tmp_dev = __start__v3_devices;
int i = 0;
-#ifdef CONFIG_DEBUG_DEV_MGR
+#ifdef V3_CONFIG_DEBUG_DEV_MGR
{
int num_devices = (__stop__v3_devices - __start__v3_devices) / sizeof(struct v3_device_info);
- PrintDebug("%d Virtual devices registered with Palacios\n", num_devices);
+ PrintDebug(VM_NONE, VCORE_NONE, "%d Virtual devices registered with Palacios\n", num_devices);
}
#endif
- PrintDebug("Start addres=%p, Stop address=%p\n", __start__v3_devices, __stop__v3_devices);
+ PrintDebug(VM_NONE, VCORE_NONE, "Start addres=%p, Stop address=%p\n", __start__v3_devices, __stop__v3_devices);
master_dev_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
while (tmp_dev != __stop__v3_devices) {
- PrintDebug("Device: %s\n", tmp_dev->name);
+ V3_Print(VM_NONE, VCORE_NONE, "Registering Device: %s\n", tmp_dev->name);
if (v3_htable_search(master_dev_table, (addr_t)(tmp_dev->name))) {
- PrintError("Multiple instance of device (%s)\n", tmp_dev->name);
+ PrintError(VM_NONE, VCORE_NONE, "Multiple instance of device (%s)\n", tmp_dev->name);
return -1;
}
if (v3_htable_insert(master_dev_table,
(addr_t)(tmp_dev->name),
(addr_t)(tmp_dev->init)) == 0) {
- PrintError("Could not add device %s to master list\n", tmp_dev->name);
+ PrintError(VM_NONE, VCORE_NONE, "Could not add device %s to master list\n", tmp_dev->name);
return -1;
}
}
-int v3_init_dev_mgr(struct guest_info * info) {
- struct vmm_dev_mgr * mgr = &(info->dev_mgr);
+int V3_deinit_devices() {
+ if (master_dev_table) {
+ v3_free_htable(master_dev_table, 0, 0);
+ master_dev_table=0;
+ }
+ return 0;
+}
+
+
+int v3_init_dev_mgr(struct v3_vm_info * vm) {
+ struct vmm_dev_mgr * mgr = &(vm->dev_mgr);
INIT_LIST_HEAD(&(mgr->dev_list));
mgr->num_devs = 0;
INIT_LIST_HEAD(&(mgr->blk_list));
INIT_LIST_HEAD(&(mgr->net_list));
- INIT_LIST_HEAD(&(mgr->console_list));
+ INIT_LIST_HEAD(&(mgr->char_list));
+ INIT_LIST_HEAD(&(mgr->cons_list));
mgr->blk_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
mgr->net_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
- mgr->console_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
-
+ mgr->char_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
+ mgr->cons_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn);
+
+ mgr->inited = 1;
+
return 0;
}
-int v3_dev_mgr_deinit(struct guest_info * info) {
+int v3_free_vm_devices(struct v3_vm_info * vm) {
+ struct vmm_dev_mgr * mgr = &(vm->dev_mgr);
struct vm_device * dev;
- struct vmm_dev_mgr * mgr = &(info->dev_mgr);
struct vm_device * tmp;
- list_for_each_entry_safe(dev, tmp, &(mgr->dev_list), dev_link) {
- v3_detach_device(dev);
- v3_free_device(dev);
+ if (mgr && mgr->num_devs > 0) {
+ list_for_each_entry_safe(dev, tmp, &(mgr->dev_list), dev_link) {
+ v3_remove_device(dev);
+ }
}
return 0;
}
+#ifdef V3_CONFIG_CHECKPOINT
+int v3_save_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt) {
+ struct vmm_dev_mgr * mgr = &(vm->dev_mgr);
+ struct vm_device * dev;
+ struct v3_chkpt_ctx * dev_mgr_ctx = NULL;
-int v3_create_device(struct guest_info * info, const char * dev_name, v3_cfg_tree_t * cfg) {
- int (*dev_init)(struct guest_info * info, void * cfg_data);
+ uint32_t num_saved_devs = 0;
+ uint32_t table_len = mgr->num_devs * V3_MAX_DEVICE_NAME;
+ char * name_table = NULL;
+ uint32_t tbl_offset = 0;
+
+ name_table = V3_Malloc(table_len);
- dev_init = (void *)v3_htable_search(master_dev_table, (addr_t)dev_name);
+ if (!name_table) {
+ PrintError(vm, VCORE_NONE, "Unable to allocate space in device manager save\n");
+ return -1;
+ }
- if (dev_init == NULL) {
- PrintError("Could not find device %s in master device table\n", dev_name);
+ memset(name_table, 0, table_len);
+
+ dev_mgr_ctx = v3_chkpt_open_ctx(chkpt, "devices");
+
+ if (!dev_mgr_ctx) {
+ PrintError(vm, VCORE_NONE,"Unable to open device manager context\n");
+ V3_Free(name_table);
return -1;
}
+ list_for_each_entry(dev, &(mgr->dev_list), dev_link) {
+ if (dev->ops->save) {
+ strncpy(name_table + tbl_offset, dev->name, V3_MAX_DEVICE_NAME);
+ tbl_offset += V3_MAX_DEVICE_NAME;
+ num_saved_devs++;
+ } else {
+ PrintDebug(vm, VCORE_NONE, "Skipping device %s\n", dev->name);
+ }
+ }
- if (dev_init(info, cfg) == -1) {
- PrintError("Could not initialize Device %s\n", dev_name);
+ if (v3_chkpt_save(dev_mgr_ctx, "num_devs", 4, &num_saved_devs) == -1) {
+ PrintError(vm, VCORE_NONE,"Unable to store num_devs\n");
+ v3_chkpt_close_ctx(dev_mgr_ctx);
+ V3_Free(name_table);
return -1;
}
+ if (v3_chkpt_save(dev_mgr_ctx, "names", num_saved_devs*V3_MAX_DEVICE_NAME, name_table) == -1) {
+ PrintError(vm, VCORE_NONE,"Unable to store names of devices\n");
+ v3_chkpt_close_ctx(dev_mgr_ctx);
+ V3_Free(name_table);
+ return -1;
+ }
+
+ v3_chkpt_close_ctx(dev_mgr_ctx);
+
+ V3_Free(name_table);
+
+ list_for_each_entry(dev, &(mgr->dev_list), dev_link) {
+
+ if (dev->ops->save_extended) {
+
+ V3_Print(vm, VCORE_NONE,"Saving state for device (%s) using extended interface\n",dev->name);
+
+ if (dev->ops->save_extended(chkpt,dev->name,dev->private_data)) {
+ PrintError(vm, VCORE_NONE,"Unable to save device %s\n",dev->name);
+ return -1;
+ }
+
+ } else if (dev->ops->save) {
+
+ struct v3_chkpt_ctx * dev_ctx = NULL;
+
+ V3_Print(vm, VCORE_NONE,"Saving state for device (%s)\n", dev->name);
+
+ dev_ctx = v3_chkpt_open_ctx(chkpt, dev->name);
+
+ if (!dev_ctx) {
+ PrintError(vm, VCORE_NONE,"Unable to open context for device %s\n",dev->name);
+ return -1;
+ }
+
+ if (dev->ops->save(dev_ctx, dev->private_data)) {
+ PrintError(vm, VCORE_NONE,"Unable t save device %s\n",dev->name);
+ v3_chkpt_close_ctx(dev_ctx);
+ return -1;
+ }
+
+ v3_chkpt_close_ctx(dev_ctx);
+
+ } else {
+ PrintError(vm, VCORE_NONE,"Error: %s save() not implemented\n", dev->name);
+ }
+ }
+
return 0;
}
-void v3_free_device(struct vm_device * dev) {
- V3_Free(dev);
+int v3_load_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt) {
+ struct vm_device * dev;
+ struct v3_chkpt_ctx * dev_mgr_ctx = NULL;
+ uint32_t num_devs = 0;
+ char * name_table = NULL;
+ int i = 0;
+
+ dev_mgr_ctx = v3_chkpt_open_ctx(chkpt, "devices");
+
+ if (!dev_mgr_ctx) {
+ PrintError(vm, VCORE_NONE,"Unable to open devices for load\n");
+ return -1;
+ }
+
+ if (v3_chkpt_load(dev_mgr_ctx, "num_devs", 4, &num_devs) == -1) {
+ PrintError(vm, VCORE_NONE,"Unable to load num_devs\n");
+ v3_chkpt_close_ctx(dev_mgr_ctx);
+ return -1;
+ }
+
+ V3_Print(vm, VCORE_NONE,"Loading State for %d devices\n", num_devs);
+
+ name_table = V3_Malloc(V3_MAX_DEVICE_NAME * num_devs);
+
+ if (!name_table) {
+ PrintError(vm, VCORE_NONE,"Unable to allocate space for device table\n");
+ v3_chkpt_close_ctx(dev_mgr_ctx);
+ return -1;
+ }
+
+ if (v3_chkpt_load(dev_mgr_ctx, "names", V3_MAX_DEVICE_NAME * num_devs, name_table) == -1) {
+ PrintError(vm, VCORE_NONE,"Unable to load device name table\n");
+ v3_chkpt_close_ctx(dev_mgr_ctx);
+ V3_Free(name_table);
+ }
+
+ v3_chkpt_close_ctx(dev_mgr_ctx);
+
+ for (i = 0; i < num_devs; i++) {
+ char * name = &(name_table[i * V3_MAX_DEVICE_NAME]);
+ struct v3_chkpt_ctx * dev_ctx = NULL;
+ dev = v3_find_dev(vm, name);
+
+ if (!dev) {
+ PrintError(vm, VCORE_NONE,"Tried to load state into non existant device: %s\n", name);
+ return -1;
+ }
+
+ if (dev->ops->load_extended) {
+
+ V3_Print(vm, VCORE_NONE,"Loading state for device (%s) using extended interface\n",name);
+
+ if (dev->ops->load_extended(chkpt,name,dev->private_data)) {
+ PrintError(vm, VCORE_NONE,"Load of device %s failed\n",name);
+ return -1;
+ }
+
+ } else if (dev->ops->load) {
+
+ dev_ctx = v3_chkpt_open_ctx(chkpt, name);
+
+ if (!dev_ctx) {
+ PrintError(vm, VCORE_NONE,"Error missing device context (%s)\n", name);
+ return -1;
+ }
+
+ if (dev->ops->load(dev_ctx, dev->private_data)) {
+ PrintError(vm, VCORE_NONE,"Load of device %s failed\n",name);
+ v3_chkpt_close_ctx(dev_ctx);
+ return -1;
+ }
+
+ // should close context regardless of whether load was successful
+ v3_chkpt_close_ctx(dev_ctx);
+
+ } else {
+ PrintError(vm, VCORE_NONE,"Error Device (%s) does not support load operation\n", name);
+ // this is OK
+ }
+ }
+
+ V3_Free(name_table);
+
+ return 0;
+}
+
+
+#endif
+
+static int free_frontends(struct v3_vm_info * vm, struct vmm_dev_mgr * mgr);
+
+int v3_deinit_dev_mgr(struct v3_vm_info * vm) {
+ struct vmm_dev_mgr * mgr=0;
+
+ if (vm) {
+ mgr = &(vm->dev_mgr);
+ if (!mgr->inited) {
+ return 0;
+ }
+ } else {
+ return 0;
+ }
+
+ // clear frontend lists
+
+ free_frontends(vm, mgr);
+
+ if (mgr->dev_table) {
+ v3_free_htable(mgr->dev_table, 0, 0);
+ mgr->dev_table=0;
+ }
+
+ return 0;
+}
+
+
+
+int v3_create_device(struct v3_vm_info * vm, const char * dev_name, v3_cfg_tree_t * cfg) {
+ int (*dev_init)(struct v3_vm_info * vm, void * cfg_data);
+
+ dev_init = (void *)v3_htable_search(master_dev_table, (addr_t)dev_name);
+
+ if (dev_init == NULL) {
+ PrintError(vm, VCORE_NONE,"Could not find device %s in master device table\n", dev_name);
+ return -1;
+ }
+
+
+ if (dev_init(vm, cfg) == -1) {
+ PrintError(vm, VCORE_NONE,"Could not initialize Device %s\n", dev_name);
+ return -1;
+ }
+
+ return 0;
}
-struct vm_device * v3_find_dev(struct guest_info * info, const char * dev_name) {
- struct vmm_dev_mgr * mgr = &(info->dev_mgr);
+
+struct vm_device * v3_find_dev(struct v3_vm_info * vm, const char * dev_name) {
+ struct vmm_dev_mgr * mgr = &(vm->dev_mgr);
if (!dev_name) {
return NULL;
/* The remaining functions are called by the devices themselves */
/****************************************************************/
-/* IO HOOKS */
+typedef enum {DEV_IO_HOOK, DEV_MSR_HOOK, DEV_CPUID_HOOK, DEV_MEM_HOOK, DEV_HCALL_HOOK} dev_rsrc_type_t;
+
+struct dev_rsrc {
+ dev_rsrc_type_t type;
+ uint64_t rsrc;
+
+ struct list_head node;
+};
+
+
+
+static int add_resource(struct vm_device * dev, dev_rsrc_type_t type, uint64_t rsrc_id) {
+ struct dev_rsrc * resource = NULL;
+
+ resource = V3_Malloc(sizeof(struct dev_rsrc));
+
+ if (resource == NULL) {
+ PrintError(VM_NONE, VCORE_NONE,"Error: Could not allocate device resource\n");
+ return -1;
+ }
+
+ resource->rsrc = rsrc_id;
+ resource->type = type;
+
+ list_add(&(resource->node), &(dev->res_hooks));
+ return 0;
+}
+
+static int free_resource(struct vm_device * dev, dev_rsrc_type_t type, uint64_t rsrc_id) {
+ struct dev_rsrc * resource = NULL;
+ struct dev_rsrc * tmp;
+
+ list_for_each_entry_safe(resource, tmp, &(dev->res_hooks), node) {
+ if ((resource->type == type) &&
+ (resource->rsrc == rsrc_id)) {
+
+ list_del(&(resource->node));
+ V3_Free(resource);
+
+ return 0;
+ }
+ }
+
+ return -1;
+}
+
+
int v3_dev_hook_io(struct vm_device * dev, uint16_t port,
- int (*read)(uint16_t port, void * dst, uint_t length, struct vm_device * dev),
- int (*write)(uint16_t port, void * src, uint_t length, struct vm_device * dev)) {
- return v3_hook_io_port(dev->vm, port,
- (int (*)(ushort_t, void *, uint_t, void *))read,
- (int (*)(ushort_t, void *, uint_t, void *))write,
- (void *)dev);
+ int (*read)(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * priv_data),
+ int (*write)(struct guest_info * core, uint16_t port, void * src, uint_t length, void * priv_data)) {
+ int ret = 0;
+
+ ret = v3_hook_io_port(dev->vm, port,
+ (int (*)(struct guest_info * core, uint16_t, void *, uint_t, void *))read,
+ (int (*)(struct guest_info * core, uint16_t, void *, uint_t, void *))write,
+ (void *)dev->private_data);
+
+ if (ret == -1) {
+ return -1;
+ }
+
+ if (add_resource(dev, DEV_IO_HOOK, port) == -1) {
+ v3_unhook_io_port(dev->vm, port);
+ PrintError(dev->vm, VCORE_NONE,"Could not allocate io hook dev state\n");
+ return -1;
+ }
+
+ return 0;
}
int v3_dev_unhook_io(struct vm_device * dev, uint16_t port) {
- return v3_unhook_io_port(dev->vm, port);
+ if (free_resource(dev, DEV_IO_HOOK, port) == 0) {
+ return v3_unhook_io_port(dev->vm, port);
+ }
+
+ return -1;
+}
+
+
+int v3_dev_hook_msr(struct vm_device * dev, uint32_t msr,
+ int (*read)(struct guest_info * core, uint32_t msr, struct v3_msr * dst, void * priv_data),
+ int (*write)(struct guest_info * core, uint32_t msr, struct v3_msr src, void * priv_data)) {
+ int ret = 0;
+
+ ret = v3_hook_msr(dev->vm, msr, read, write, dev->private_data);
+
+ if (ret == -1) {
+ return -1;
+ }
+
+ if (add_resource(dev, DEV_MSR_HOOK, msr) == -1) {
+ v3_unhook_msr(dev->vm, msr);
+ return -1;
+ }
+
+ return 0;
+}
+
+int v3_dev_unhook_msr(struct vm_device * dev, uint32_t msr) {
+ if (free_resource(dev, DEV_MSR_HOOK, msr) == 0) {
+ return v3_unhook_msr(dev->vm, msr);
+ }
+
+ return -1;
}
-int v3_detach_device(struct vm_device * dev) {
+
+int v3_remove_device(struct vm_device * dev) {
struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
+ struct dev_rsrc * resource = NULL;
+ struct dev_rsrc * tmp;
+
+ list_for_each_entry_safe(resource, tmp, &(dev->res_hooks), node) {
+ if (resource->type == DEV_IO_HOOK) {
+ v3_unhook_io_port(dev->vm, (uint16_t)(resource->rsrc));
+ } else if (resource->type == DEV_MSR_HOOK) {
+ v3_unhook_msr(dev->vm, (uint32_t)(resource->rsrc));
+ }
+
+ list_del(&(resource->node));
+ V3_Free(resource);
+ }
- dev->ops->free(dev);
+ if (dev->ops->free) {
+ dev->ops->free(dev->private_data);
+ } else {
+ PrintError(VM_NONE, VCORE_NONE,"Error: %s free() not implemented\n", dev->name);
+ }
list_del(&(dev->dev_link));
mgr->num_devs--;
dev->vm = NULL;
+ V3_Free(dev);
return -1;
}
-struct vm_device * v3_allocate_device(char * name,
- struct v3_device_ops * ops,
- void * private_data) {
+struct vm_device * v3_add_device(struct v3_vm_info * vm,
+ char * name,
+ struct v3_device_ops * ops,
+ void * private_data) {
+ struct vmm_dev_mgr * mgr = &(vm->dev_mgr);
struct vm_device * dev = NULL;
- dev = (struct vm_device*)V3_Malloc(sizeof(struct vm_device));
- strncpy(dev->name, name, 32);
- dev->ops = ops;
- dev->private_data = private_data;
+ // Check if we already registered a device of the same name
+ if (v3_htable_search(mgr->dev_table, (addr_t)name) != (addr_t)NULL) {
+ PrintError(vm, VCORE_NONE,"Device with name (%s) already registered with VM\n", name);
+ return NULL;
+ }
- dev->vm = NULL;
+ dev = (struct vm_device *)V3_Malloc(sizeof(struct vm_device));
- return dev;
-}
+ if (dev == NULL) {
+ PrintError(vm, VCORE_NONE,"Cannot allocate in adding a device\n");
+ return NULL;
+ }
+ INIT_LIST_HEAD(&(dev->res_hooks));
-int v3_attach_device(struct guest_info * vm, struct vm_device * dev ) {
- struct vmm_dev_mgr * mgr = &(vm->dev_mgr);
+ strncpy(dev->name, name, 32);
+ dev->ops = ops;
+ dev->private_data = private_data;
dev->vm = vm;
list_add(&(dev->dev_link), &(mgr->dev_list));
mgr->num_devs++;
-
v3_htable_insert(mgr->dev_table, (addr_t)(dev->name), (addr_t)dev);
- return 0;
+ return dev;
}
-
-void v3_print_dev_mgr(struct guest_info * info) {
- struct vmm_dev_mgr * mgr = &(info->dev_mgr);
+void v3_print_dev_mgr(struct v3_vm_info * vm) {
+ struct vmm_dev_mgr * mgr = &(vm->dev_mgr);
struct vm_device * dev;
- V3_Print("%d devices registered with manager\n", mgr->num_devs);
+ V3_Print(vm, VCORE_NONE,"%d devices registered with manager\n", mgr->num_devs);
list_for_each_entry(dev, &(mgr->dev_list), dev_link) {
- V3_Print("Device: %s\n", dev->name);
+ V3_Print(vm, VCORE_NONE,"Device: %s\n", dev->name);
}
return;
struct blk_frontend {
- int (*connect)(struct guest_info * info,
+ int (*connect)(struct v3_vm_info * vm,
void * frontend_data,
struct v3_dev_blk_ops * ops,
v3_cfg_tree_t * cfg,
-int v3_dev_add_blk_frontend(struct guest_info * info,
+int v3_dev_add_blk_frontend(struct v3_vm_info * vm,
char * name,
- int (*connect)(struct guest_info * info,
+ int (*connect)(struct v3_vm_info * vm,
void * frontend_data,
struct v3_dev_blk_ops * ops,
v3_cfg_tree_t * cfg,
struct blk_frontend * frontend = NULL;
frontend = (struct blk_frontend *)V3_Malloc(sizeof(struct blk_frontend));
+
+ if (!frontend) {
+ PrintError(vm, VCORE_NONE,"Cannot allocate in adding a block front end\n");
+ return -1;
+ }
+
memset(frontend, 0, sizeof(struct blk_frontend));
frontend->connect = connect;
frontend->priv_data = priv_data;
- list_add(&(frontend->blk_node), &(info->dev_mgr.blk_list));
- v3_htable_insert(info->dev_mgr.blk_table, (addr_t)(name), (addr_t)frontend);
+ list_add(&(frontend->blk_node), &(vm->dev_mgr.blk_list));
+ v3_htable_insert(vm->dev_mgr.blk_table, (addr_t)(name), (addr_t)frontend);
return 0;
}
-int v3_dev_connect_blk(struct guest_info * info,
+int v3_dev_connect_blk(struct v3_vm_info * vm,
char * frontend_name,
struct v3_dev_blk_ops * ops,
v3_cfg_tree_t * cfg,
struct blk_frontend * frontend = NULL;
- frontend = (struct blk_frontend *)v3_htable_search(info->dev_mgr.blk_table,
+ frontend = (struct blk_frontend *)v3_htable_search(vm->dev_mgr.blk_table,
(addr_t)frontend_name);
if (frontend == NULL) {
- PrintError("Could not find frontend blk device %s\n", frontend_name);
+ PrintError(vm, VCORE_NONE,"Could not find frontend blk device %s\n", frontend_name);
return 0;
}
- if (frontend->connect(info, frontend->priv_data, ops, cfg, private_data) == -1) {
- PrintError("Error connecting to block frontend %s\n", frontend_name);
+ if (frontend->connect(vm, frontend->priv_data, ops, cfg, private_data) == -1) {
+ PrintError(vm, VCORE_NONE,"Error connecting to block frontend %s\n", frontend_name);
return -1;
}
struct net_frontend {
- int (*connect)(struct guest_info * info,
+ int (*connect)(struct v3_vm_info * vm,
void * frontend_data,
struct v3_dev_net_ops * ops,
v3_cfg_tree_t * cfg,
};
-int v3_dev_add_net_frontend(struct guest_info * info,
+int v3_dev_add_net_frontend(struct v3_vm_info * vm,
char * name,
- int (*connect)(struct guest_info * info,
+ int (*connect)(struct v3_vm_info * vm,
void * frontend_data,
struct v3_dev_net_ops * ops,
v3_cfg_tree_t * cfg,
struct net_frontend * frontend = NULL;
frontend = (struct net_frontend *)V3_Malloc(sizeof(struct net_frontend));
+
+ if (!frontend) {
+ PrintError(vm, VCORE_NONE,"Cannot allocate in adding a net front end\n");
+ return -1;
+ }
+
memset(frontend, 0, sizeof(struct net_frontend));
frontend->connect = connect;
frontend->priv_data = priv_data;
- list_add(&(frontend->net_node), &(info->dev_mgr.net_list));
- v3_htable_insert(info->dev_mgr.net_table, (addr_t)(name), (addr_t)frontend);
+ list_add(&(frontend->net_node), &(vm->dev_mgr.net_list));
+ v3_htable_insert(vm->dev_mgr.net_table, (addr_t)(name), (addr_t)frontend);
return 0;
}
-int v3_dev_connect_net(struct guest_info * info,
+int v3_dev_connect_net(struct v3_vm_info * vm,
char * frontend_name,
struct v3_dev_net_ops * ops,
v3_cfg_tree_t * cfg,
{
struct net_frontend * frontend = NULL;
- frontend = (struct net_frontend *)v3_htable_search(info->dev_mgr.net_table,
+ frontend = (struct net_frontend *)v3_htable_search(vm->dev_mgr.net_table,
(addr_t)frontend_name);
if (frontend == NULL) {
- PrintError("Could not find frontend net device %s\n", frontend_name);
+ PrintError(vm, VCORE_NONE,"Could not find frontend net device %s\n", frontend_name);
return 0;
}
- if (frontend->connect(info, frontend->priv_data, ops, cfg, private_data) == -1) {
- PrintError("Error connecting to net frontend %s\n", frontend_name);
+ if (frontend->connect(vm, frontend->priv_data, ops, cfg, private_data) == -1) {
+ PrintError(vm, VCORE_NONE,"Error connecting to net frontend %s\n", frontend_name);
+ return -1;
+ }
+
+ return 0;
+}
+
+
+struct cons_frontend {
+ int (*connect)(struct v3_vm_info * vm,
+ void * frontend_data,
+ struct v3_dev_console_ops * ops,
+ v3_cfg_tree_t * cfg,
+ void * priv_data);
+
+
+ struct list_head cons_node;
+
+ void * priv_data;
+};
+
+int v3_dev_add_console_frontend(struct v3_vm_info * vm,
+ char * name,
+ int (*connect)(struct v3_vm_info * vm,
+ void * frontend_data,
+ struct v3_dev_console_ops * ops,
+ v3_cfg_tree_t * cfg,
+ void * private_data),
+ void * priv_data)
+{
+ struct cons_frontend * frontend = NULL;
+
+ frontend = (struct cons_frontend *)V3_Malloc(sizeof(struct cons_frontend));
+
+ if (!frontend) {
+ PrintError(vm, VCORE_NONE,"Cannot allocate in adding a console front end\n");
return -1;
}
+ memset(frontend, 0, sizeof(struct cons_frontend));
+
+ frontend->connect = connect;
+ frontend->priv_data = priv_data;
+
+ list_add(&(frontend->cons_node), &(vm->dev_mgr.cons_list));
+ v3_htable_insert(vm->dev_mgr.cons_table, (addr_t)(name), (addr_t)frontend);
+
return 0;
}
+
+int v3_dev_connect_console(struct v3_vm_info * vm,
+ char * frontend_name,
+ struct v3_dev_console_ops * ops,
+ v3_cfg_tree_t * cfg,
+ void * private_data)
+{
+ struct cons_frontend * frontend = NULL;
+
+ frontend = (struct cons_frontend *)v3_htable_search(vm->dev_mgr.cons_table,
+ (addr_t)frontend_name);
+
+ if (frontend == NULL) {
+ PrintError(vm, VCORE_NONE,"Could not find frontend console device %s\n", frontend_name);
+ return 0;
+ }
+
+ if (frontend->connect(vm, frontend->priv_data, ops, cfg, private_data) == -1) {
+ PrintError(vm, VCORE_NONE,"Error connecting to console frontend %s\n", frontend_name);
+ return -1;
+ }
+
+ return 0;
+}
+
+struct char_frontend {
+ int (*connect)(struct v3_vm_info * vm,
+ void * frontend_data,
+ struct v3_dev_char_ops * ops,
+ v3_cfg_tree_t * cfg,
+ void * priv_data,
+ void ** push_fn_arg);
+
+
+ struct list_head char_node;
+
+ void * priv_data;
+};
+
+int v3_dev_add_char_frontend(struct v3_vm_info * vm,
+ char * name,
+ int (*connect)(struct v3_vm_info * vm,
+ void * frontend_data,
+ struct v3_dev_char_ops * ops,
+ v3_cfg_tree_t * cfg,
+ void * private_data,
+ void ** push_fn_arg),
+ void * priv_data)
+{
+ struct char_frontend * frontend = NULL;
+
+ frontend = (struct char_frontend *)V3_Malloc(sizeof(struct char_frontend));
+
+ if (!frontend) {
+ PrintError(vm, VCORE_NONE,"Cannot allocate in adding a char front end\n");
+ return -1;
+ }
+
+ memset(frontend, 0, sizeof(struct char_frontend));
+
+ frontend->connect = connect;
+ frontend->priv_data = priv_data;
+
+ list_add(&(frontend->char_node), &(vm->dev_mgr.char_list));
+ v3_htable_insert(vm->dev_mgr.char_table, (addr_t)(name), (addr_t)frontend);
+
+ return 0;
+}
+
+
+int v3_dev_connect_char(struct v3_vm_info * vm,
+ char * frontend_name,
+ struct v3_dev_char_ops * ops,
+ v3_cfg_tree_t * cfg,
+ void * private_data,
+ void ** push_fn_arg)
+{
+ struct char_frontend * frontend = NULL;
+
+ frontend = (struct char_frontend *)v3_htable_search(vm->dev_mgr.char_table,
+ (addr_t)frontend_name);
+
+ if (frontend == NULL) {
+ PrintError(vm, VCORE_NONE,"Could not find frontend char device %s\n", frontend_name);
+ return 0;
+ }
+
+ if (frontend->connect(vm, frontend->priv_data, ops, cfg, private_data, push_fn_arg) == -1) {
+ PrintError(vm, VCORE_NONE,"Error connecting to char frontend %s\n", frontend_name);
+ return -1;
+ }
+
+ return 0;
+}
+
+
+
+static int free_frontends(struct v3_vm_info * vm, struct vmm_dev_mgr * mgr) {
+ struct char_frontend * chr = NULL;
+ struct char_frontend * tmp_chr = NULL;
+ struct cons_frontend * cons = NULL;
+ struct cons_frontend * tmp_cons = NULL;
+ struct net_frontend * net = NULL;
+ struct net_frontend * tmp_net = NULL;
+ struct blk_frontend * blk = NULL;
+ struct blk_frontend * tmp_blk = NULL;
+
+
+
+ list_for_each_entry_safe(chr, tmp_chr, &(mgr->char_list), char_node) {
+ list_del(&(chr->char_node));
+ V3_Free(chr);
+ }
+
+ list_for_each_entry_safe(cons, tmp_cons, &(mgr->cons_list), cons_node) {
+ list_del(&(cons->cons_node));
+ V3_Free(cons);
+ }
+
+ list_for_each_entry_safe(net, tmp_net, &(mgr->net_list), net_node) {
+ list_del(&(net->net_node));
+ V3_Free(net);
+ }
+
+ list_for_each_entry_safe(blk, tmp_blk, &(mgr->blk_list), blk_node) {
+ list_del(&(blk->blk_node));
+ V3_Free(blk);
+ }
+
+ v3_free_htable(mgr->blk_table, 0, 0);
+ v3_free_htable(mgr->net_table, 0, 0);
+ v3_free_htable(mgr->char_table, 0, 0);
+ v3_free_htable(mgr->cons_table, 0, 0);
+
+
+ return 0;
+}
+
+int v3_attach_device(struct v3_vm_info * vm, struct vm_device * dev)
+{
+ PrintError(vm, VCORE_NONE, "v3_attach_device is deprecated and no longer works\n");
+ return -1;
+}
+
+int v3_detach_device(struct vm_device * dev)
+{
+ PrintError(VM_NONE, VCORE_NONE, "v3_detach_device is deprecated and no longer works\n");
+ return -1;
+}
+
+struct vm_device * v3_allocate_device(char * name, struct v3_device_ops * ops, void * private_data)
+{
+ PrintError(VM_NONE, VCORE_NONE, "v3_allocate_device is deprecated and no longer works\n");
+ return 0;
+}