X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fextensions%2Fext_vmware.c;h=e9db64cc05059276b61f7ecd67e1abe2d015099d;hb=4d1d8fadad33de7d3ebce2083d9782048f78b44e;hp=ea1c789385847a8db9ae42fbd99fcea95b8f0289;hpb=60628a7a3b37ac2dae5c033d3c4ee9e9f6af7d95;p=palacios.git

diff --git a/palacios/src/extensions/ext_vmware.c b/palacios/src/extensions/ext_vmware.c
index ea1c789..e9db64c 100644
--- a/palacios/src/extensions/ext_vmware.c
+++ b/palacios/src/extensions/ext_vmware.c
@@ -38,11 +38,11 @@ static int io_read(struct guest_info * core, uint16_t port, void * dst, uint_t l
     uint32_t magic = (uint32_t)(core->vm_regs.rax);
     uint32_t cmd = (uint32_t)(core->vm_regs.rcx);
 
-    PrintError("VMWARE IO READ of size %d (command=%d)\n", length, cmd);
+    PrintError(core->vm_info, core, "VMWARE IO READ of size %d (command=%d)\n", length, cmd);
 
     
     if (magic != VMWARE_MAGIC) {
-	PrintError("Invalid VMWARE MAgic number in Persona interface, ignoring for now\n");
+	PrintError(core->vm_info, core, "Invalid VMWARE MAgic number in Persona interface, ignoring for now\n");
 	return length;
     }
     
@@ -52,7 +52,7 @@ static int io_read(struct guest_info * core, uint16_t port, void * dst, uint_t l
 	core->vm_regs.rax = cpu_hz & 0x00000000ffffffffLL;
 	core->vm_regs.rbx = (cpu_hz >> 32) & 0x00000000ffffffffLL;
     } else {
-	PrintError("Unhandled VMWARE IO operation\n");
+	PrintError(core->vm_info, core, "Unhandled VMWARE IO operation\n");
 	return -1;
     }
 
@@ -62,7 +62,7 @@ static int io_read(struct guest_info * core, uint16_t port, void * dst, uint_t l
 
 static int io_write(struct guest_info * core, uint16_t port, void * src, uint_t length, void * priv_data) {
 
-    PrintError("VMWARE IO PORT WRITE\n");
+    PrintError(core->vm_info, core, "VMWARE IO PORT WRITE\n");
     return -1;
 }
 
@@ -87,7 +87,7 @@ static int vmware_cpuid_handler(struct guest_info * core, uint32_t cpuid,
 
 static int vmware_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg, void ** priv_data) {
 
-    V3_Print("Using VMWARE virtualization persona\n");
+    V3_Print(vm, VCORE_NONE, "Using VMWARE virtualization persona\n");
 
 /*
     v3_cpuid_add_fields(vm, 0x00000001, 
@@ -121,8 +121,9 @@ static int vmware_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg, void ** priv
 
 static struct v3_extension_impl vmware_impl = {
     .name = "VMWARE_IFACE",
-    .init = vmware_init,
-    .deinit = NULL,
+    .init = NULL,
+    .vm_init = vmware_init,
+    .vm_deinit = NULL,
     .core_init = NULL,
     .core_deinit = NULL,
     .on_entry = NULL,