This will make having multiple VMM syscalls slightly cleaner. Reinstall your kernel headers.
Signed-off-by: Barret Rhoden <[email protected]> --- kern/include/ros/bits/syscall.h | 2 +- kern/src/syscall.c | 4 ++-- tests/vmm/vmrunkernel.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kern/include/ros/bits/syscall.h b/kern/include/ros/bits/syscall.h index 3f47d7f6e86d..4612885b71ac 100644 --- a/kern/include/ros/bits/syscall.h +++ b/kern/include/ros/bits/syscall.h @@ -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 diff --git a/kern/src/syscall.c b/kern/src/syscall.c index b867291b7108..b5cd624ddae1 100644 --- a/kern/src/syscall.c +++ b/kern/src/syscall.c @@ -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"}, diff --git a/tests/vmm/vmrunkernel.c b/tests/vmm/vmrunkernel.c index abc30b48960d..f99560581d83 100644 --- a/tests/vmm/vmrunkernel.c +++ b/tests/vmm/vmrunkernel.c @@ -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); -- 2.7.0.rc3.207.g0ac5344 -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
