From: Peter Dinda Date: Fri, 20 Sep 2013 21:02:16 +0000 (-0500) Subject: Assorted cleanup X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=ffc83679ff6580fe325f505a91bf568660d663f7;p=palacios.git Assorted cleanup --- diff --git a/linux_module/vm.c b/linux_module/vm.c index ac1b363..dd4aeda 100644 --- a/linux_module/vm.c +++ b/linux_module/vm.c @@ -442,6 +442,7 @@ int free_palacios_vm(struct v3_guest * guest) { free_guest_ctrls(guest); + deinit_vm_extensions(guest); palacios_vfree(guest->img); palacios_free(guest); diff --git a/linux_usr/v3_continue.c b/linux_usr/v3_continue.c index 0b2c411..30ce201 100644 --- a/linux_usr/v3_continue.c +++ b/linux_usr/v3_continue.c @@ -27,7 +27,7 @@ int main(int argc, char* argv[]) { return -1; } - printf("Stopping VM\n"); + printf("Continuing VM\n"); vm_fd = open(filename, O_RDONLY); diff --git a/linux_usr/v3_core_move.c b/linux_usr/v3_core_move.c index 80e8847..eb35896 100644 --- a/linux_usr/v3_core_move.c +++ b/linux_usr/v3_core_move.c @@ -30,7 +30,7 @@ int main(int argc, char* argv[]) { cmd.vcore_id = atoi(argv[2]); cmd.pcore_id = atoi(argv[3]); - printf("Migrate vcore %d to physical CPU %d\n", cmd.vcore_id, cmd.pcore_id); + printf("Migrateing vcore %d to physical CPU %d\n", cmd.vcore_id, cmd.pcore_id); vm_fd = open(vm_dev, O_RDONLY); diff --git a/linux_usr/v3_pause.c b/linux_usr/v3_pause.c index 193ba57..be445db 100644 --- a/linux_usr/v3_pause.c +++ b/linux_usr/v3_pause.c @@ -27,7 +27,7 @@ int main(int argc, char* argv[]) { return -1; } - printf("Stopping VM\n"); + printf("Pausing VM\n"); vm_fd = open(filename, O_RDONLY); diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c index 48f0d8a..e49e4d4 100644 --- a/palacios/src/palacios/vm_guest.c +++ b/palacios/src/palacios/vm_guest.c @@ -354,6 +354,8 @@ int v3_free_vm_internal(struct v3_vm_info * vm) { v3_deinit_events(vm); + v3_fw_cfg_deinit(vm); + return 0; }