kernel/vmm: Rename struct guest_options to vmm_guest_options.
authorSascha Wildner <saw@online.de>
Fri, 25 Oct 2013 17:38:50 +0000 (19:38 +0200)
committerSascha Wildner <saw@online.de>
Fri, 25 Oct 2013 17:39:18 +0000 (19:39 +0200)
14 files changed:
sys/kern/sys_vmm.c
sys/kern/syscalls.master
sys/platform/pc32/include/vmm.h
sys/platform/pc64/include/vmm.h
sys/platform/pc64/vmm/svm.c
sys/platform/pc64/vmm/vmm.c
sys/platform/pc64/vmm/vmm.h
sys/platform/pc64/vmm/vmx.c
sys/platform/vkernel/include/vmm.h
sys/platform/vkernel64/include/vmm.h
sys/platform/vkernel64/platform/init.c
sys/sys/sysproto.h
sys/sys/vmm.h
test/vmm/vmm_test.c

index dd81d68..414c154 100644 (file)
@@ -55,7 +55,7 @@ int
 sys_vmm_guest_ctl(struct vmm_guest_ctl_args *uap)
 {
        int error = 0;
-       struct guest_options options;
+       struct vmm_guest_options options;
        struct trapframe *tf = uap->sysmsg_frame;
        unsigned long stack_limit = USRSTACK;
        unsigned char stack_page[PAGE_SIZE];
@@ -64,9 +64,9 @@ sys_vmm_guest_ctl(struct vmm_guest_ctl_args *uap)
 
        switch (uap->op) {
                case VMM_GUEST_RUN:
-                       error = copyin(uap->options, &options, sizeof(struct guest_options));
+                       error = copyin(uap->options, &options, sizeof(struct vmm_guest_options));
                        if (error) {
-                               kprintf("sys_vmm_guest: error copyin guest_options\n");
+                               kprintf("sys_vmm_guest: error copyin vmm_guest_options\n");
                                goto out;
                        }
 
index 832a1e1..ea198db 100644 (file)
                                char *path2, int flags); }
 532    STD     BSD     { int eaccess(char *path, int flags); }
 533    STD     BSD     { int lpathconf(char *path, int name); }
-534    STD     BSD     { int vmm_guest_ctl(int op, struct guest_options *options); }
+534    STD     BSD     { int vmm_guest_ctl(int op, struct vmm_guest_options *options); }
 535    STD     BSD     { int vmm_guest_sync_addr(long *dstaddr, long *srcaddr); }
index 520099a..ef2a9b0 100644 (file)
@@ -38,7 +38,7 @@
 #include <sys/vmm.h>
 
 static __inline
-int vmm_vminit(struct guest_options* opts) {
+int vmm_vminit(struct vmm_guest_options* opts) {
        return 0;
 }
 
index 3510921..bb8365f 100644 (file)
@@ -37,7 +37,7 @@
 
 #include <sys/vmm.h>
 
-int vmm_vminit(struct guest_options*);
+int vmm_vminit(struct vmm_guest_options*);
 int vmm_vmdestroy(void);
 int vmm_vmrun(void);
 int vmm_vm_set_tls_area(void);
index bf9cd9e..b7bab29 100644 (file)
@@ -120,7 +120,7 @@ static int svm_disable(void) {
  *     Allocates a VMCB for the current thread and flags the thread to return
  *     to usermode via svm_vmrun().
  */
-static int svm_vminit(struct guest_options *options) {
+static int svm_vminit(struct vmm_guest_options *options) {
        return (ENODEV);
 }
 
index 74e6fc5..493923b 100644 (file)
@@ -139,7 +139,7 @@ SYSINIT(vmm_init, SI_BOOT2_CPU_TOPOLOGY, SI_ORDER_ANY, vmm_init, NULL);
 
 
 int
-vmm_vminit(struct guest_options *options)
+vmm_vminit(struct vmm_guest_options *options)
 {
        if (!vmm_enabled) {
                return ENODEV;
index 97092d0..4580f84 100644 (file)
@@ -71,7 +71,7 @@ struct vmm_ctl {
        int (*init)(void);
        int (*enable)(void);
        int (*disable)(void);
-       int (*vminit)(struct guest_options *);
+       int (*vminit)(struct vmm_guest_options *);
        int (*vmdestroy)(void);
        int (*vmrun)(void);
        int (*vm_set_tls_area)(void);
index 84767a8..82d429b 100644 (file)
@@ -700,7 +700,7 @@ error:
  * - remove the old vmspace
  */
 static int
-vmx_vminit_master(struct guest_options *options)
+vmx_vminit_master(struct vmm_guest_options *options)
 {
        struct vmspace *oldvmspace;
        struct vmspace *newvmspace;
@@ -740,7 +740,7 @@ vmx_vminit_master(struct guest_options *options)
 }
 
 static int
-vmx_vminit(struct guest_options *options)
+vmx_vminit(struct vmm_guest_options *options)
 {
        struct vmx_thread_info * vti;
        int err;
@@ -1514,13 +1514,13 @@ error2:
 static void
 vmx_lwp_return(struct lwp *lp, struct trapframe *frame)
 {
-       struct guest_options options;
+       struct vmm_guest_options options;
        int vmrun_err;
        struct vmm_proc *p_vmm = (struct vmm_proc *)curproc->p_vmm;
 
        dkprintf("VMM: vmx_lwp_return \n");
 
-       bzero(&options, sizeof(struct guest_options));
+       bzero(&options, sizeof(struct vmm_guest_options));
 
        bcopy(frame, &options.tf, sizeof(struct trapframe));
 
index 520099a..ef2a9b0 100644 (file)
@@ -38,7 +38,7 @@
 #include <sys/vmm.h>
 
 static __inline
-int vmm_vminit(struct guest_options* opts) {
+int vmm_vminit(struct vmm_guest_options* opts) {
        return 0;
 }
 
index 520099a..ef2a9b0 100644 (file)
@@ -38,7 +38,7 @@
 #include <sys/vmm.h>
 
 static __inline
-int vmm_vminit(struct guest_options* opts) {
+int vmm_vminit(struct vmm_guest_options* opts) {
        return 0;
 }
 
index 14427fb..29fd114 100644 (file)
@@ -668,7 +668,7 @@ init_kern_memory_vmm(void)
 {
        int i;
        void *firstfree;
-       struct guest_options options;
+       struct vmm_guest_options options;
        void *dmap_address;
 
        KvaStart = (vm_offset_t)KERNEL_KVA_START;
index 3a975ff..a696e4e 100644 (file)
@@ -2286,7 +2286,7 @@ struct    vmm_guest_ctl_args {
        struct sysmsg sysmsg;
 #endif
        int     op;     char op_[PAD_(int)];
-       struct guest_options *  options;        char options_[PAD_(struct guest_options *)];
+       struct vmm_guest_options *      options;        char options_[PAD_(struct vmm_guest_options *)];
 };
 struct vmm_guest_sync_addr_args {
 #ifdef _KERNEL
index be21e66..9ad91cd 100644 (file)
@@ -46,7 +46,7 @@
 #include <sys/types.h>
 #include <machine/frame.h>
 
-struct guest_options {
+struct vmm_guest_options {
        register_t guest_cr3;
        register_t vmm_cr3;
        register_t new_stack;
@@ -55,7 +55,7 @@ struct guest_options {
 };
 
 
-int    vmm_guest_ctl (int, struct guest_options *);
+int    vmm_guest_ctl (int, struct vmm_guest_options *);
 
 int    vmm_guest_sync_addr (long *, long *);
 
index eb597bf..fce7c60 100644 (file)
@@ -24,7 +24,7 @@
 int
 vmm_boostrap(void)
 {
-       struct guest_options options;
+       struct vmm_guest_options options;
        uint64_t *ptr;
        uint64_t stack_source;
        uint64_t stack_size;