integrated new configuration system

[palacios.git] / palacios / src / palacios / vmm_cpuid.c

diff --git a/palacios/src/palacios/vmm_cpuid.c b/palacios/src/palacios/vmm_cpuid.c
index 6dc29eb..34040d8 100644 (file)
--- a/palacios/src/palacios/vmm_cpuid.c
+++ b/palacios/src/palacios/vmm_cpuid.c
@@ -20,7 +20,7 @@
 #include <palacios/vmm.h>
 #include <palacios/vmm_cpuid.h>
 #include <palacios/vmm_lowlevel.h>
-
+#include <palacios/vm_guest.h>
 
 
 void v3_init_cpuid_map(struct guest_info * info) {
@@ -131,7 +131,10 @@ int v3_handle_cpuid(struct guest_info * info) {
     uint32_t cpuid = info->vm_regs.rax;
     struct v3_cpuid_hook * hook = get_cpuid_hook(info, cpuid);
 
+    //PrintDebug("CPUID called for 0x%x\n", cpuid);
+
     if (hook == NULL) {
+       //PrintDebug("Calling passthrough handler\n");
        // call the passthrough handler
        v3_cpuid(cpuid, 
                 (uint32_t *)&(info->vm_regs.rax), 
@@ -139,6 +142,8 @@ int v3_handle_cpuid(struct guest_info * info) {
                 (uint32_t *)&(info->vm_regs.rcx), 
                 (uint32_t *)&(info->vm_regs.rdx));
     } else {
+       //      PrintDebug("Calling hook function\n");
+
        if (hook->hook_fn(info, cpuid, 
                          (uint32_t *)&(info->vm_regs.rax), 
                          (uint32_t *)&(info->vm_regs.rbx), 
@@ -150,6 +155,8 @@ int v3_handle_cpuid(struct guest_info * info) {
        }
     }
 
+    //    PrintDebug("Cleaning up register contents\n");
+
     info->vm_regs.rax &= 0x00000000ffffffffLL;
     info->vm_regs.rbx &= 0x00000000ffffffffLL;
     info->vm_regs.rcx &= 0x00000000ffffffffLL;