vmm: rename VMCALL_* -> AKAROS_VMCALL_* (XCC)
authorBarret Rhoden <brho@cs.berkeley.edu>
Fri, 24 May 2019 20:21:46 +0000 (16:21 -0400)
committerBarret Rhoden <brho@cs.berkeley.edu>
Fri, 24 May 2019 20:21:46 +0000 (16:21 -0400)
These are the same names I use in Linux 5.1.

Reinstall your kernel headers.

Signed-off-by: Barret Rhoden <brho@cs.berkeley.edu>
kern/arch/x86/trap.c
kern/include/ros/vmm.h
user/vmm/vmexit.c

index 20f53fd..83de9c0 100644 (file)
@@ -1119,7 +1119,7 @@ static void vmexit_dispatch(struct vm_trapframe *tf)
        switch (tf->tf_exit_reason) {
        case EXIT_REASON_VMCALL:
                if (current->vmm.flags & VMM_CTL_FL_KERN_PRINTC &&
-                   tf->tf_rax == VMCALL_PRINTC) {
+                   tf->tf_rax == AKAROS_VMCALL_PRINTC) {
                        printk("%c", tf->tf_rdi);
                        tf->tf_rip += 3;
                        handled = TRUE;
index fc0ac44..a9b3196 100644 (file)
@@ -9,10 +9,10 @@
 #include <ros/arch/vmm.h>
 
 /* VMCALL FUNCTION NUMBERS */
-#define VMCALL_PRINTC          0x1
-#define VMCALL_SMPBOOT         0x2
-#define VMCALL_GET_TSCFREQ     0x3
-#define VMCALL_TRACE_TF                0x4
+#define AKAROS_VMCALL_PRINTC           0x1
+#define AKAROS_VMCALL_SMPBOOT          0x2
+#define AKAROS_VMCALL_GET_TSCFREQ      0x3
+#define AKAROS_VMCALL_TRACE_TF         0x4
 
 #define VMM_CTL_GET_EXITS              1
 #define VMM_CTL_SET_EXITS              2
index e3d5924..172ee08 100644 (file)
@@ -250,16 +250,16 @@ static bool handle_vmcall(struct guest_thread *gth)
                return vm->vmcall(gth, vm_tf);
 
        switch (vm_tf->tf_rax) {
-       case VMCALL_PRINTC:
+       case AKAROS_VMCALL_PRINTC:
                retval = handle_vmcall_printc(gth);
                break;
-       case VMCALL_SMPBOOT:
+       case AKAROS_VMCALL_SMPBOOT:
                retval = handle_vmcall_smpboot(gth);
                break;
-       case VMCALL_GET_TSCFREQ:
+       case AKAROS_VMCALL_GET_TSCFREQ:
                retval = handle_vmcall_get_tscfreq(gth);
                break;
-       case VMCALL_TRACE_TF:
+       case AKAROS_VMCALL_TRACE_TF:
                trace_printf("  rax  0x%016lx\n",      vm_tf->tf_r11);
                trace_printf("  rbx  0x%016lx\n",      vm_tf->tf_rbx);
                trace_printf("  rcx  0x%016lx\n",      vm_tf->tf_rcx);