X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_sym_iface.c;h=9b3a09028a193140b0639d3f316a8bc6d69e97d9;hb=f1e6da297651aadbc037f1635a82f41285a0a424;hp=43d62c58e2a9b4bc6b8db4b150d6fcb724cdf4f7;hpb=4290e5f20a4ea5e5f32cb8228ac4d7446dc1021b;p=palacios.git

diff --git a/palacios/src/palacios/vmm_sym_iface.c b/palacios/src/palacios/vmm_sym_iface.c
index 43d62c5..9b3a090 100644
--- a/palacios/src/palacios/vmm_sym_iface.c
+++ b/palacios/src/palacios/vmm_sym_iface.c
@@ -22,15 +22,17 @@
 #include <palacios/vmm_msr.h>
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm_hypercall.h>
+#include <palacios/vm_guest.h>
+#include <palacios/vmm_sprintf.h>
 
-#define SYM_PAGE_MSR 0x535
+
+#define SYMSPY_GLOBAL_MSR 0x534
+#define SYMSPY_LOCAL_MSR 0x535
 
 #define SYM_CPUID_NUM 0x90000000
 
 // A succesfull symcall returns via the RET_HCALL, with the return values in registers
 // A symcall error returns via the ERR_HCALL with the error code in rbx
-#define SYM_CALL_RET_HCALL 0x535
-#define SYM_CALL_ERR_HCALL 0x536
 
 
 /* Notes: We use a combination of SYSCALL and SYSENTER Semantics 
@@ -47,15 +49,30 @@
 #define SYMCALL_GS_MSR  0x539
 #define SYMCALL_FS_MSR  0x540
 
-
-static int msr_read(uint_t msr, struct v3_msr * dst, void * priv_data) {
-    struct guest_info * info = (struct guest_info *)priv_data;
-    struct v3_sym_state * state = &(info->sym_state);
+static int symspy_msr_read(struct guest_info * core, uint_t msr, 
+		    struct v3_msr * dst, void * priv_data) {
+    struct v3_sym_global_state * global_state = &(core->vm_info->sym_global_state);
+    struct v3_sym_local_state * local_state = &(core->sym_local_state);
 
     switch (msr) {
-	case SYM_PAGE_MSR:
-	    dst->value = state->guest_pg_addr;
+	case SYMSPY_GLOBAL_MSR:
+	    dst->value = global_state->global_guest_pa;
 	    break;
+	case SYMSPY_LOCAL_MSR:
+	    dst->value = local_state->local_guest_pa;
+	    break;
+	default:
+	    return -1;
+    }
+
+    return 0;
+}
+
+static int symcall_msr_read(struct guest_info * core, uint_t msr, 
+			    struct v3_msr * dst, void * priv_data) {
+    struct v3_symcall_state * state = &(core->sym_local_state.symcall_state);
+
+    switch (msr) {
 	case SYMCALL_RIP_MSR:
 	    dst->value = state->sym_call_rip;
 	    break;
@@ -78,46 +95,64 @@ static int msr_read(uint_t msr, struct v3_msr * dst, void * priv_data) {
     return 0;
 }
 
-static int msr_write(uint_t msr, struct v3_msr src, void * priv_data) {
-    struct guest_info * info = (struct guest_info *)priv_data;
-    struct v3_sym_state * state = &(info->sym_state);
+static int symspy_msr_write(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data) {
 
-    if (msr == SYM_PAGE_MSR) {
-	PrintDebug("Symbiotic MSR write for page %p\n", (void *)src.value);
+    if (msr == SYMSPY_GLOBAL_MSR) {
+	struct v3_sym_global_state * global_state = &(core->vm_info->sym_global_state);
 
-	if (state->active == 1) {
+	PrintDebug("Symbiotic Glbal MSR write for page %p\n", (void *)(addr_t)src.value);
+
+	if (global_state->active == 1) {
 	    // unmap page
-	    struct v3_shadow_region * old_reg = v3_get_shadow_region(info, (addr_t)state->guest_pg_addr);
+	    struct v3_shadow_region * old_reg = v3_get_shadow_region(core->vm_info, core->cpu_id, 
+								     (addr_t)global_state->global_guest_pa);
 
 	    if (old_reg == NULL) {
-		PrintError("Could not find previously active symbiotic page (%p)\n", (void *)state->guest_pg_addr);
+		PrintError("Could not find previously active symbiotic page (%p)\n", 
+			   (void *)(addr_t)global_state->global_guest_pa);
 		return -1;
 	    }
 
-	    v3_delete_shadow_region(info, old_reg);
+	    v3_delete_shadow_region(core->vm_info, old_reg);
 	}
 
-	state->guest_pg_addr = src.value;
-	state->guest_pg_addr &= ~0xfffLL;
+	global_state->global_guest_pa = src.value;
+	global_state->global_guest_pa &= ~0xfffLL;
 
-	state->active = 1;
+	global_state->active = 1;
 
 	// map page
-	v3_add_shadow_mem(info, (addr_t)state->guest_pg_addr, 
-			  (addr_t)(state->guest_pg_addr + PAGE_SIZE_4KB - 1), 
-			  state->sym_page_pa);
-
-
-    } else if (msr == SYMCALL_RIP_MSR) {
-	state->sym_call_rip = src.value;
-    } else if (msr == SYMCALL_RSP_MSR) {
-	state->sym_call_rsp = src.value;
-    } else if (msr == SYMCALL_CS_MSR) {
-	state->sym_call_cs = src.value;
-    } else if (msr == SYMCALL_GS_MSR) {
-	state->sym_call_gs = src.value;
-    } else if (msr == SYMCALL_FS_MSR) {
-	state->sym_call_fs = src.value;
+	v3_add_shadow_mem(core->vm_info, V3_MEM_CORE_ANY, (addr_t)global_state->global_guest_pa, 
+			  (addr_t)(global_state->global_guest_pa + PAGE_SIZE_4KB - 1), 
+			  global_state->global_page_pa);
+    } else if (msr == SYMSPY_LOCAL_MSR) {
+	struct v3_sym_local_state * local_state = &(core->sym_local_state);
+
+	PrintDebug("Symbiotic Local MSR write for page %p\n", (void *)(addr_t)src.value);
+
+	if (local_state->active == 1) {
+	    // unmap page
+	    struct v3_shadow_region * old_reg = v3_get_shadow_region(core->vm_info, core->cpu_id,
+								     (addr_t)local_state->local_guest_pa);
+
+	    if (old_reg == NULL) {
+		PrintError("Could not find previously active symbiotic page (%p)\n", 
+			   (void *)(addr_t)local_state->local_guest_pa);
+		return -1;
+	    }
+
+	    v3_delete_shadow_region(core->vm_info, old_reg);
+	}
+
+	local_state->local_guest_pa = src.value;
+	local_state->local_guest_pa &= ~0xfffLL;
+
+	local_state->active = 1;
+
+	// map page
+	v3_add_shadow_mem(core->vm_info, core->cpu_id, (addr_t)local_state->local_guest_pa, 
+			  (addr_t)(local_state->local_guest_pa + PAGE_SIZE_4KB - 1), 
+			  local_state->local_page_pa);
     } else {
 	PrintError("Invalid Symbiotic MSR write (0x%x)\n", msr);
 	return -1;
@@ -126,7 +161,34 @@ static int msr_write(uint_t msr, struct v3_msr src, void * priv_data) {
     return 0;
 }
 
-static int cpuid_fn(struct guest_info * info, uint32_t cpuid, 
+
+static int symcall_msr_write(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data) {
+    struct v3_symcall_state * state = &(core->sym_local_state.symcall_state);
+
+    switch (msr) {
+	case SYMCALL_RIP_MSR:
+	    state->sym_call_rip = src.value;
+	    break;
+	case SYMCALL_RSP_MSR:
+	    state->sym_call_rsp = src.value;
+	    break;
+	case SYMCALL_CS_MSR:
+	    state->sym_call_cs = src.value;
+	    break;
+	case SYMCALL_GS_MSR:
+	    state->sym_call_gs = src.value;
+	    break;
+	case SYMCALL_FS_MSR:
+	    state->sym_call_fs = src.value;
+	    break;
+	default:
+	    PrintError("Invalid Symbiotic MSR write (0x%x)\n", msr);
+	    return -1;
+    }
+    return 0;
+}
+
+static int cpuid_fn(struct guest_info * core, uint32_t cpuid, 
 		    uint32_t * eax, uint32_t * ebx,
 		    uint32_t * ecx, uint32_t * edx,
 		    void * private_data) {
@@ -134,53 +196,68 @@ static int cpuid_fn(struct guest_info * info, uint32_t cpuid,
 
     *eax = *(uint32_t *)"V3V";
 
-    if ((v3_cpu_types[info->cpu_id] == V3_SVM_CPU) || 
-	(v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU)) {
+    if ((v3_cpu_types[core->cpu_id] == V3_SVM_CPU) || 
+	(v3_cpu_types[core->cpu_id] == V3_SVM_REV3_CPU)) {
 	*ebx = *(uint32_t *)"SVM";
-    } else if ((v3_cpu_types[info->cpu_id] == V3_VMX_CPU) || 
-	       (v3_cpu_types[info->cpu_id] == V3_VMX_EPT_CPU)) {
+    } else if ((v3_cpu_types[core->cpu_id] == V3_VMX_CPU) || 
+	       (v3_cpu_types[core->cpu_id] == V3_VMX_EPT_CPU)) {
 	*ebx = *(uint32_t *)"VMX";
     }
 
 
     return 0;
 }
-    
+
 
 static int sym_call_ret(struct guest_info * info, uint_t hcall_id, void * private_data);
 static int sym_call_err(struct guest_info * info, uint_t hcall_id, void * private_data);
 
 
 
-int v3_init_sym_iface(struct guest_info * info) {
-    struct v3_sym_state * state = &(info->sym_state);
-    memset(state, 0, sizeof(struct v3_sym_state));
+int v3_init_sym_iface(struct v3_vm_info * vm) {
+    struct v3_sym_global_state * global_state = &(vm->sym_global_state);
+    memset(global_state, 0, sizeof(struct v3_sym_global_state));
 
-    state->sym_page_pa = (addr_t)V3_AllocPages(1);
-    state->sym_page = (struct v3_sym_interface *)V3_VAddr((void *)state->sym_page_pa);
-    memset(state->sym_page, 0, PAGE_SIZE_4KB);
+    global_state->global_page_pa = (addr_t)V3_AllocPages(1);
+    global_state->sym_page = (struct v3_sym_global_page *)V3_VAddr((void *)global_state->global_page_pa);
+    memset(global_state->sym_page, 0, PAGE_SIZE_4KB);
 
-    
-    memcpy(&(state->sym_page->magic), "V3V", 3);
+    memcpy(&(global_state->sym_page->magic), "V3V", 3);
+
+    v3_hook_msr(vm, SYMSPY_LOCAL_MSR, symspy_msr_read, symspy_msr_write, NULL);
+    v3_hook_msr(vm, SYMSPY_GLOBAL_MSR, symspy_msr_read, symspy_msr_write, NULL);
+
+    v3_hook_cpuid(vm, SYM_CPUID_NUM, cpuid_fn, NULL);
 
-    v3_hook_msr(info, SYM_PAGE_MSR, msr_read, msr_write, info);
+    v3_hook_msr(vm, SYMCALL_RIP_MSR, symcall_msr_read, symcall_msr_write, NULL);
+    v3_hook_msr(vm, SYMCALL_RSP_MSR, symcall_msr_read, symcall_msr_write, NULL);
+    v3_hook_msr(vm, SYMCALL_CS_MSR, symcall_msr_read, symcall_msr_write, NULL);
+    v3_hook_msr(vm, SYMCALL_GS_MSR, symcall_msr_read, symcall_msr_write, NULL);
+    v3_hook_msr(vm, SYMCALL_FS_MSR, symcall_msr_read, symcall_msr_write, NULL);
 
-    v3_hook_cpuid(info, SYM_CPUID_NUM, cpuid_fn, info);
+    v3_register_hypercall(vm, SYMCALL_RET_HCALL, sym_call_ret, NULL);
+    v3_register_hypercall(vm, SYMCALL_ERR_HCALL, sym_call_err, NULL);
 
-    v3_hook_msr(info, SYMCALL_RIP_MSR, msr_read, msr_write, info);
-    v3_hook_msr(info, SYMCALL_RSP_MSR, msr_read, msr_write, info);
-    v3_hook_msr(info, SYMCALL_CS_MSR, msr_read, msr_write, info);
-    v3_hook_msr(info, SYMCALL_GS_MSR, msr_read, msr_write, info);
-    v3_hook_msr(info, SYMCALL_FS_MSR, msr_read, msr_write, info);
+    return 0;
+}
+
+
+int v3_init_sym_core(struct guest_info * core) {
+    struct v3_sym_local_state * local_state = &(core->sym_local_state);
+    memset(local_state, 0, sizeof(struct v3_sym_local_state));
 
-    v3_register_hypercall(info, SYM_CALL_RET_HCALL, sym_call_ret, NULL);
-    v3_register_hypercall(info, SYM_CALL_ERR_HCALL, sym_call_err, NULL);
+    local_state->local_page_pa = (addr_t)V3_AllocPages(1);
+    local_state->local_page = (struct v3_sym_local_page *)V3_VAddr((void *)local_state->local_page_pa);
+    memset(local_state->local_page, 0, PAGE_SIZE_4KB);
+
+    snprintf((uint8_t *)&(local_state->local_page->magic), 8, "V3V.%d", core->cpu_id);
 
     return 0;
 }
 
-int v3_sym_map_pci_passthrough(struct guest_info * info, uint_t bus, uint_t dev, uint_t fn) {
-    struct v3_sym_state * state = &(info->sym_state);
+
+int v3_sym_map_pci_passthrough(struct v3_vm_info * vm, uint_t bus, uint_t dev, uint_t fn) {
+    struct v3_sym_global_state * global_state = &(vm->sym_global_state);
     uint_t dev_index = (bus << 8) + (dev << 3) + fn;
     uint_t major = dev_index / 8;
     uint_t minor = dev_index % 8;
@@ -192,17 +269,17 @@ int v3_sym_map_pci_passthrough(struct guest_info * info, uint_t bus, uint_t dev,
 
     PrintDebug("Setting passthrough pci map for index=%d\n", dev_index);
 
-    state->sym_page->pci_pt_map[major] |= 0x1 << minor;
+    global_state->sym_page->pci_pt_map[major] |= 0x1 << minor;
 
-    PrintDebug("pt_map entry=%x\n",   state->sym_page->pci_pt_map[major]);
+    PrintDebug("pt_map entry=%x\n",   global_state->sym_page->pci_pt_map[major]);
 
-    PrintDebug("pt map vmm addr=%p\n", state->sym_page->pci_pt_map);
+    PrintDebug("pt map vmm addr=%p\n", global_state->sym_page->pci_pt_map);
 
     return 0;
 }
 
-int v3_sym_unmap_pci_passthrough(struct guest_info * info, uint_t bus, uint_t dev, uint_t fn) {
-    struct v3_sym_state * state = &(info->sym_state);
+int v3_sym_unmap_pci_passthrough(struct v3_vm_info * vm, uint_t bus, uint_t dev, uint_t fn) {
+    struct v3_sym_global_state * global_state = &(vm->sym_global_state);
     uint_t dev_index = (bus << 8) + (dev << 3) + fn;
     uint_t major = dev_index / 8;
     uint_t minor = dev_index % 8;
@@ -212,20 +289,20 @@ int v3_sym_unmap_pci_passthrough(struct guest_info * info, uint_t bus, uint_t de
 	return -1;
     }
 
-    state->sym_page->pci_pt_map[major] &= ~(0x1 << minor);
+    global_state->sym_page->pci_pt_map[major] &= ~(0x1 << minor);
 
     return 0;
 }
 
 
-static int sym_call_err(struct guest_info * info, uint_t hcall_id, void * private_data) {
-    struct v3_sym_state * state = (struct v3_sym_state *)&(info->sym_state);
+static int sym_call_err(struct guest_info * core, uint_t hcall_id, void * private_data) {
+    struct v3_symcall_state * state = (struct v3_symcall_state *)&(core->sym_local_state.symcall_state);
 
     PrintError("sym call error\n");
 
-    state->sym_call_errno = (int)info->vm_regs.rbx;
-    v3_print_guest_state(info);
-    v3_print_mem_map(info);
+    state->sym_call_errno = (int)core->vm_regs.rbx;
+    v3_print_guest_state(core);
+    v3_print_mem_map(core->vm_info);
 
     // clear sym flags
     state->sym_call_error = 1;
@@ -234,22 +311,22 @@ static int sym_call_err(struct guest_info * info, uint_t hcall_id, void * privat
     return -1;
 }
 
-static int sym_call_ret(struct guest_info * info, uint_t hcall_id, void * private_data) {
-    struct v3_sym_state * state = (struct v3_sym_state *)&(info->sym_state);
+static int sym_call_ret(struct guest_info * core, uint_t hcall_id, void * private_data) {
+    struct v3_symcall_state * state = (struct v3_symcall_state *)&(core->sym_local_state.symcall_state);
 
-    PrintError("Return from sym call\n");
-    v3_print_guest_state(info);
-    v3_print_mem_map(info);
+    //    PrintError("Return from sym call (ID=%x)\n", hcall_id);
+    //   v3_print_guest_state(info);
 
     state->sym_call_returned = 1;
 
     return 0;
 }
 
-static int execute_symcall(struct guest_info * info) {
+static int execute_symcall(struct guest_info * core) {
+    struct v3_symcall_state * state = (struct v3_symcall_state *)&(core->sym_local_state.symcall_state);
 
-    while (info->sym_state.sym_call_returned == 0) {
-	if (v3_vm_enter(info) == -1) {
+    while (state->sym_call_returned == 0) {
+	if (v3_vm_enter(core) == -1) {
 	    PrintError("Error in Sym call\n");
 	    return -1;
 	}
@@ -259,20 +336,21 @@ static int execute_symcall(struct guest_info * info) {
 }
 
 
-int v3_sym_call(struct guest_info * info, 
+int v3_sym_call(struct guest_info * core, 
 		uint64_t call_num, sym_arg_t * arg0, 
 		sym_arg_t * arg1, sym_arg_t * arg2,
 		sym_arg_t * arg3, sym_arg_t * arg4) {
-    struct v3_sym_state * state = (struct v3_sym_state *)&(info->sym_state);
-    struct v3_sym_context * old_ctx = (struct v3_sym_context *)&(state->old_ctx);
+    struct v3_sym_local_state * sym_state = (struct v3_sym_local_state *)&(core->sym_local_state);
+    struct v3_symcall_state * state = (struct v3_symcall_state *)&(sym_state->symcall_state);
+    struct v3_sym_cpu_context * old_ctx = (struct v3_sym_cpu_context *)&(state->old_ctx);
     struct v3_segment sym_cs;
     struct v3_segment sym_ss;
     uint64_t trash_args[5] = { [0 ... 4] = 0 };
 
-    PrintDebug("Making Sym call\n");
-    v3_print_guest_state(info);
+    //   PrintDebug("Making Sym call\n");
+    //    v3_print_guest_state(info);
 
-    if ((state->sym_page->sym_call_enabled == 0) ||
+    if ((sym_state->local_page->sym_call_enabled == 0) ||
 	(state->sym_call_active == 1)) {
 	return -1;
     }
@@ -284,72 +362,72 @@ int v3_sym_call(struct guest_info * info,
     if (!arg4) arg4 = &trash_args[4];
 
     // Save the old context
-    memcpy(&(old_ctx->vm_regs), &(info->vm_regs), sizeof(struct v3_gprs));
-    memcpy(&(old_ctx->cs), &(info->segments.cs), sizeof(struct v3_segment));
-    memcpy(&(old_ctx->ss), &(info->segments.ss), sizeof(struct v3_segment));
-    old_ctx->gs_base = info->segments.gs.base;
-    old_ctx->fs_base = info->segments.fs.base;
-    old_ctx->rip = info->rip;
-    old_ctx->cpl = info->cpl;
-    old_ctx->flags = info->ctrl_regs.rflags;
+    memcpy(&(old_ctx->vm_regs), &(core->vm_regs), sizeof(struct v3_gprs));
+    memcpy(&(old_ctx->cs), &(core->segments.cs), sizeof(struct v3_segment));
+    memcpy(&(old_ctx->ss), &(core->segments.ss), sizeof(struct v3_segment));
+    old_ctx->gs_base = core->segments.gs.base;
+    old_ctx->fs_base = core->segments.fs.base;
+    old_ctx->rip = core->rip;
+    old_ctx->cpl = core->cpl;
+    old_ctx->flags = core->ctrl_regs.rflags;
 
     // Setup the sym call context
-    info->rip = state->sym_call_rip;
-    info->vm_regs.rsp = state->sym_call_rsp; // old contest rsp is saved in vm_regs
+    core->rip = state->sym_call_rip;
+    core->vm_regs.rsp = state->sym_call_rsp; // old contest rsp is saved in vm_regs
 
-    v3_translate_segment(info, state->sym_call_cs, &sym_cs);
-    memcpy(&(info->segments.cs), &sym_cs, sizeof(struct v3_segment));
+    v3_translate_segment(core, state->sym_call_cs, &sym_cs);
+    memcpy(&(core->segments.cs), &sym_cs, sizeof(struct v3_segment));
  
-    v3_translate_segment(info, state->sym_call_cs + 8, &sym_ss);
-    memcpy(&(info->segments.ss), &sym_ss, sizeof(struct v3_segment));
+    v3_translate_segment(core, state->sym_call_cs + 8, &sym_ss);
+    memcpy(&(core->segments.ss), &sym_ss, sizeof(struct v3_segment));
 
-    info->segments.gs.base = state->sym_call_gs;
-    info->segments.fs.base = state->sym_call_fs;
-    info->cpl = 0;
+    core->segments.gs.base = state->sym_call_gs;
+    core->segments.fs.base = state->sym_call_fs;
+    core->cpl = 0;
 
-    info->vm_regs.rax = call_num;
-    info->vm_regs.rbx = *arg0;
-    info->vm_regs.rcx = *arg1;
-    info->vm_regs.rdx = *arg2;
-    info->vm_regs.rsi = *arg3;
-    info->vm_regs.rdi = *arg4;
+    core->vm_regs.rax = call_num;
+    core->vm_regs.rbx = *arg0;
+    core->vm_regs.rcx = *arg1;
+    core->vm_regs.rdx = *arg2;
+    core->vm_regs.rsi = *arg3;
+    core->vm_regs.rdi = *arg4;
 
     // Mark sym call as active
     state->sym_call_active = 1;
     state->sym_call_returned = 0;
 
-    PrintDebug("Sym state\n");
-    v3_print_guest_state(info);
+    //    PrintDebug("Sym state\n");
+    //  v3_print_guest_state(core);
 
     // Do the sym call entry
-    if (execute_symcall(info) == -1) {
+    if (execute_symcall(core) == -1) {
 	PrintError("SYMCALL error\n");
 	return -1;
-    } 
+    }
 
     // clear sym flags
     state->sym_call_active = 0;
 
-    *arg0 = info->vm_regs.rbx;
-    *arg1 = info->vm_regs.rcx;
-    *arg2 = info->vm_regs.rdx;
-    *arg3 = info->vm_regs.rsi;
-    *arg4 = info->vm_regs.rdi;
+    *arg0 = core->vm_regs.rbx;
+    *arg1 = core->vm_regs.rcx;
+    *arg2 = core->vm_regs.rdx;
+    *arg3 = core->vm_regs.rsi;
+    *arg4 = core->vm_regs.rdi;
 
     // restore guest state
-    memcpy(&(info->vm_regs), &(old_ctx->vm_regs), sizeof(struct v3_gprs));
-    memcpy(&(info->segments.cs), &(old_ctx->cs), sizeof(struct v3_segment));
-    memcpy(&(info->segments.ss), &(old_ctx->ss), sizeof(struct v3_segment));
-    info->segments.gs.base = old_ctx->gs_base;
-    info->segments.fs.base = old_ctx->fs_base;
-    info->rip = old_ctx->rip;
-    info->cpl = old_ctx->cpl;
-    info->ctrl_regs.rflags = old_ctx->flags;
+    memcpy(&(core->vm_regs), &(old_ctx->vm_regs), sizeof(struct v3_gprs));
+    memcpy(&(core->segments.cs), &(old_ctx->cs), sizeof(struct v3_segment));
+    memcpy(&(core->segments.ss), &(old_ctx->ss), sizeof(struct v3_segment));
+    core->segments.gs.base = old_ctx->gs_base;
+    core->segments.fs.base = old_ctx->fs_base;
+    core->rip = old_ctx->rip;
+    core->cpl = old_ctx->cpl;
+    core->ctrl_regs.rflags = old_ctx->flags;
 
 
 
-    PrintDebug("restoring guest state\n");
-    v3_print_guest_state(info);
+    //    PrintError("restoring guest state\n");
+    //    v3_print_guest_state(core);
 
     return 0;
 }