From: Kyle Hale <kh@u.northwestern.edu>
Date: Tue, 8 Oct 2013 17:54:17 +0000 (-0500)
Subject: bring GEARS up to date with interface changes
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=7513aa35c06a89f23e76a7368a278d43c6416e70

bring GEARS up to date with interface changes
---

diff --git a/palacios/src/gears/ext_code_inject.c b/palacios/src/gears/ext_code_inject.c
index 87e5325..24f2d5e 100644
--- a/palacios/src/gears/ext_code_inject.c
+++ b/palacios/src/gears/ext_code_inject.c
@@ -727,8 +727,8 @@ int v3_remove_code_inject (struct v3_vm_info * vm, struct v3_code_inject_info *
 
 static struct v3_extension_impl code_inject_impl = {
 	.name = "code_inject",
-	.init = init_code_inject,
-	.deinit = deinit_code_inject,
+	.vm_init = init_code_inject,
+	.vm_deinit = deinit_code_inject,
 	.core_init = NULL,
 	.core_deinit = NULL,
 	.on_entry = NULL,
diff --git a/palacios/src/gears/ext_env_inject.c b/palacios/src/gears/ext_env_inject.c
index 4b7590c..96a935c 100644
--- a/palacios/src/gears/ext_env_inject.c
+++ b/palacios/src/gears/ext_env_inject.c
@@ -109,8 +109,8 @@ int v3_remove_env_inject (struct v3_vm_info * vm, struct v3_env_inject_info * in
 
 static struct v3_extension_impl env_inject_impl = {
 	.name = "env_inject",
-	.init = init_env_inject,
-	.deinit = deinit_env_inject,
+	.vm_init = init_env_inject,
+	.vm_deinit = deinit_env_inject,
 	.core_init = NULL,
 	.core_deinit = NULL,
 	.on_entry = NULL,
diff --git a/palacios/src/gears/ext_execve_hook.c b/palacios/src/gears/ext_execve_hook.c
index 17142eb..501b992 100644
--- a/palacios/src/gears/ext_execve_hook.c
+++ b/palacios/src/gears/ext_execve_hook.c
@@ -143,8 +143,8 @@ int v3_unhook_executable (struct v3_vm_info * vm, const uchar_t * binfile) {
 
 static struct v3_extension_impl execve_impl = {
 	.name = "execve_intercept",
-	.init = init_exec_hooks,
-	.deinit = NULL,
+	.vm_init = init_exec_hooks,
+	.vm_deinit = NULL,
 	.core_init = init_exec_hooks_core,
 	.core_deinit = deinit_exec_hooks_core,
 	.on_entry = NULL,
diff --git a/palacios/src/gears/ext_sw_intr.c b/palacios/src/gears/ext_sw_intr.c
index 03034dc..54992a8 100644
--- a/palacios/src/gears/ext_sw_intr.c
+++ b/palacios/src/gears/ext_sw_intr.c
@@ -114,8 +114,8 @@ static inline struct v3_swintr_hook * get_swintr_hook (struct guest_info * core,
 
 static struct v3_extension_impl swintr_impl = {
     .name = "swintr_intercept",
-    .init = init_swintr_intercept,
-    .deinit = deinit_swintr_intercept,
+    .vm_init = init_swintr_intercept,
+    .vm_deinit = deinit_swintr_intercept,
     .core_init = init_swintr_intercept_core,
     .core_deinit = NULL,
     .on_entry = NULL,
diff --git a/palacios/src/gears/ext_syscall_hijack.c b/palacios/src/gears/ext_syscall_hijack.c
index a531176..a910414 100644
--- a/palacios/src/gears/ext_syscall_hijack.c
+++ b/palacios/src/gears/ext_syscall_hijack.c
@@ -338,8 +338,8 @@ static int deinit_syscall_hijack (struct v3_vm_info * vm, void * priv_data) {
 
 static struct v3_extension_impl syscall_impl = {
     .name = "syscall_intercept",
-    .init = init_syscall_hijack,
-    .deinit = deinit_syscall_hijack,
+    .vm_init = init_syscall_hijack,
+    .vm_deinit = deinit_syscall_hijack,
     .core_init = init_syscall_hijack_core,
     .core_deinit = NULL,
     .on_entry = NULL,