X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=c75e6332f1dcde070643ed2acb80abf63fb6fee5;hb=db03a1fef60b6d90c02a65369292a57833a7824b;hp=3709ced8c16dc651f80ab0540b6b13b105be8547;hpb=acaadd79c597c8d5180fbfbec79c01fef3dff003;p=palacios.git

diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c
index 3709ced..c75e633 100644
--- a/palacios/src/palacios/vmm_dev_mgr.c
+++ b/palacios/src/palacios/vmm_dev_mgr.c
@@ -94,7 +94,10 @@ int V3_init_devices() {
 
 
 int V3_deinit_devices() {    
-    v3_free_htable(master_dev_table, 0, 0);
+    if (master_dev_table) { 
+	v3_free_htable(master_dev_table, 0, 0);
+	master_dev_table=0;
+    }
     return 0;
 }
 
@@ -126,8 +129,10 @@ int v3_free_vm_devices(struct v3_vm_info * vm) {
     struct vm_device * dev;
     struct vm_device * tmp;
 
-    list_for_each_entry_safe(dev, tmp, &(mgr->dev_list), dev_link) {
-	v3_remove_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;
@@ -329,7 +334,10 @@ int v3_deinit_dev_mgr(struct v3_vm_info * vm) {
 
     free_frontends(vm, mgr);
 
-    v3_free_htable(mgr->dev_table, 0, 0);
+    if (mgr->dev_table) { 
+	v3_free_htable(mgr->dev_table, 0, 0);
+	mgr->dev_table=0;
+    }
 
     return 0;
 }