From: Jack Lange Date: Fri, 26 Aug 2011 19:54:58 +0000 (-0400) Subject: various minor bug fixes X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=3a64514e2fbdb79da57b289fc94b336b78046ba2;p=palacios.git various minor bug fixes --- diff --git a/linux_module/vm.c b/linux_module/vm.c index 967ecf6..00111fc 100644 --- a/linux_module/vm.c +++ b/linux_module/vm.c @@ -274,7 +274,7 @@ int stop_palacios_vm(struct v3_guest * guest) { cdev_del(&(guest->cdev)); - kfree(guest->img); + vfree(guest->img); kfree(guest); return 0; diff --git a/palacios/src/palacios/vmm_string.c b/palacios/src/palacios/vmm_string.c index 725fa17..75a8975 100644 --- a/palacios/src/palacios/vmm_string.c +++ b/palacios/src/palacios/vmm_string.c @@ -460,10 +460,14 @@ size_t strcspn(const char * s, const char * reject) { for (i = 0; i < reject_len; i++) { if (s[cnt] == reject[i]) { match = 1; - cnt++; break; } } + + if (!match) { + cnt++; + } + } return cnt; diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c index 20c0c5f..e2e6d4b 100644 --- a/palacios/src/palacios/vmx.c +++ b/palacios/src/palacios/vmx.c @@ -549,7 +549,7 @@ int v3_deinit_vmx_vmcs(struct guest_info * core) { struct vmx_data * vmx_state = core->vmm_data; V3_FreePages((void *)(vmx_state->vmcs_ptr_phys), 1); - V3_FreePages(vmx_state->msr_area, 1); + V3_FreePages(V3_PAddr(vmx_state->msr_area), 1); V3_Free(vmx_state);