Rename SYS_setup_vmm -> SYS_vmm_setup (XCC)
authorBarret Rhoden <brho@cs.berkeley.edu>
Fri, 5 Feb 2016 21:39:26 +0000 (16:39 -0500)
committerBarret Rhoden <brho@cs.berkeley.edu>
Thu, 11 Feb 2016 15:39:30 +0000 (10:39 -0500)
This will make having multiple VMM syscalls slightly cleaner.

Reinstall your kernel headers.

Signed-off-by: Barret Rhoden <brho@cs.berkeley.edu>
kern/include/ros/bits/syscall.h
kern/src/syscall.c
tests/vmm/vmrunkernel.c

index 3f47d7f..4612885 100644 (file)
@@ -42,7 +42,7 @@
 #define SYS_abort_sysc                         31
 #define SYS_populate_va                                32
 #define SYS_abort_sysc_fd                      33
-#define SYS_setup_vmm                          34
+#define SYS_vmm_setup                          34
 #define SYS_vc_entry                           35
 #define SYS_nanosleep                          36
 #define SYS_pop_ctx                                    37
index b867291..b5cd624 100644 (file)
@@ -1432,7 +1432,7 @@ static int sys_pop_ctx(struct proc *p, struct user_context *ctx)
 
 /* Initializes a process to run virtual machine contexts, returning the number
  * initialized, optionally setting errno */
-static int sys_setup_vmm(struct proc *p, unsigned int nr_guest_pcores,
+static int sys_vmm_setup(struct proc *p, unsigned int nr_guest_pcores,
                          struct vmm_gpcore_init *gpcis, int flags)
 {
        return vmm_struct_init(p, nr_guest_pcores, gpcis, flags);
@@ -2580,7 +2580,7 @@ const struct sys_table_entry syscall_table[] = {
        [SYS_init_arsc] = {(syscall_t)sys_init_arsc, "init_arsc"},
 #endif
        [SYS_change_to_m] = {(syscall_t)sys_change_to_m, "change_to_m"},
-       [SYS_setup_vmm] = {(syscall_t)sys_setup_vmm, "setup_vmm"},
+       [SYS_vmm_setup] = {(syscall_t)sys_vmm_setup, "vmm_setup"},
        [SYS_poke_ksched] = {(syscall_t)sys_poke_ksched, "poke_ksched"},
        [SYS_abort_sysc] = {(syscall_t)sys_abort_sysc, "abort_sysc"},
        [SYS_abort_sysc_fd] = {(syscall_t)sys_abort_sysc_fd, "abort_sysc_fd"},
index abc30b4..f995605 100644 (file)
@@ -775,7 +775,7 @@ int main(int argc, char **argv)
        a += 4096;
        gpci.apic_addr = (void*)0xfee00000;
 
-       if (ros_syscall(SYS_setup_vmm, nr_gpcs, &gpci, vmmflags, 0, 0, 0) !=
+       if (ros_syscall(SYS_vmm_setup, nr_gpcs, &gpci, vmmflags, 0, 0, 0) !=
            nr_gpcs) {
                perror("Guest pcore setup failed");
                exit(1);