#include <palacios/vmm_decoder.h>
-
-#ifndef NULL
-#define NULL 0
+#ifndef DEBUG_DEV_MGR
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
#endif
-int dev_mgr_init(struct guest_info * info) {
+
+
+int v3_init_dev_mgr(struct guest_info * info) {
struct vmm_dev_mgr * mgr = &(info->dev_mgr);
INIT_LIST_HEAD(&(mgr->dev_list));
mgr->num_devs = 0;
}
-int dev_mgr_deinit(struct guest_info * info) {
+int v3_dev_mgr_deinit(struct guest_info * info) {
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_unattach_device(dev);
- free_device(dev);
+ v3_free_device(dev);
}
return 0;
/* IO HOOKS */
-int dev_mgr_add_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) {
+static int dev_mgr_add_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) {
list_add(&(hook->mgr_list), &(mgr->io_hooks));
mgr->num_io_hooks++;
return 0;
}
-int dev_mgr_remove_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) {
+static int dev_mgr_remove_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) {
list_del(&(hook->mgr_list));
mgr->num_io_hooks--;
}
-int dev_add_io_hook(struct vm_device * dev, struct dev_io_hook * hook) {
+static int dev_add_io_hook(struct vm_device * dev, struct dev_io_hook * hook) {
list_add(&(hook->dev_list), &(dev->io_hooks));
dev->num_io_hooks++;
return 0;
}
-int dev_remove_io_hook(struct vm_device * dev, struct dev_io_hook * hook) {
+static int dev_remove_io_hook(struct vm_device * dev, struct dev_io_hook * hook) {
list_del(&(hook->dev_list));
dev->num_io_hooks--;
-struct dev_io_hook * dev_mgr_find_io_hook(struct vmm_dev_mgr * mgr, ushort_t port) {
+static struct dev_io_hook * dev_mgr_find_io_hook(struct vmm_dev_mgr * mgr, ushort_t port) {
struct dev_io_hook * tmp = NULL;
list_for_each_entry(tmp, &(mgr->io_hooks), mgr_list) {
return NULL;
}
-struct dev_io_hook * dev_find_io_hook(struct vm_device * dev, ushort_t port) {
+
+/*
+static struct dev_io_hook * dev_find_io_hook(struct vm_device * dev, ushort_t port) {
struct dev_io_hook * tmp = NULL;
list_for_each_entry(tmp, &(dev->io_hooks), dev_list) {
}
return NULL;
}
+*/
-
-int dev_hook_io(struct vm_device *dev,
- ushort_t port,
- int (*read)(ushort_t port, void * dst, uint_t length, struct vm_device * dev),
- int (*write)(ushort_t port, void * src, uint_t length, struct vm_device * dev)) {
-
+int v3_dev_hook_io(struct vm_device *dev,
+ ushort_t port,
+ int (*read)(ushort_t port, void * dst, uint_t length, struct vm_device * dev),
+ int (*write)(ushort_t port, void * src, uint_t length, struct vm_device * dev)) {
+
struct dev_io_hook *hook = (struct dev_io_hook *)V3_Malloc(sizeof(struct dev_io_hook));
if (!hook) {
}
-int dev_unhook_io(struct vm_device *dev,
+int v3_dev_unhook_io(struct vm_device *dev,
ushort_t port) {
struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
-
-int dev_mgr_hook_mem(struct guest_info *vm,
- struct vm_device *device,
- void *start,
- void *end)
+#if 0
+static int dev_mgr_hook_mem(struct guest_info *vm,
+ struct vm_device *device,
+ void *start,
+ void *end)
{
struct dev_mem_hook * hook = (struct dev_mem_hook*)V3_Malloc(sizeof(struct dev_mem_hook));
}
-int dev_mgr_unhook_mem(struct vm_device *dev,
- addr_t start,
- addr_t end) {
+static int dev_mgr_unhook_mem(struct vm_device *dev,
+ addr_t start,
+ addr_t end) {
/*
struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr);
struct dev_mem_hook *hook = dev_mgr_find_mem_hook(mgr, start, end);
*/
return -1;
}
+#endif
-
+#ifdef DEBUG_DEV_MGR
void PrintDebugDevMgr(struct guest_info * info) {
struct vmm_dev_mgr * mgr = &(info->dev_mgr);
return;
}
+
+#else
+void PrintDebugDevMgr(struct guest_info * info) {}
+void PrintDebugDev(struct vm_device * dev) {}
+void PrintDebugDevMgrIO(struct vmm_dev_mgr * mgr) {}
+void PrintDebugDevIO(struct vm_device * dev) {}
+#endif