direct-io.hg
changeset 4882:7bc5d4e9b217
bitkeeper revision 1.1389.1.49 (4283701cNLgzy29rE9Sw2-Jbp4DdZA)
Remove 'exec_domain' from Xen public interfaces. Replace with 'vcpu'.
Signed-off-by: Keir Fraser <keir@xensource.com>
Remove 'exec_domain' from Xen public interfaces. Replace with 'vcpu'.
Signed-off-by: Keir Fraser <keir@xensource.com>
| author | kaf24@firebug.cl.cam.ac.uk |
|---|---|
| date | Thu May 12 15:02:52 2005 +0000 (2005-05-12) |
| parents | 72682d90c1b8 |
| children | 13190ce86cae d16ae85cb89e |
| files | tools/libxc/xc_domain.c tools/libxc/xc_linux_build.c tools/libxc/xc_linux_restore.c tools/libxc/xc_plan9_build.c tools/libxc/xc_private.c tools/libxc/xc_ptrace.c tools/libxc/xc_vmx_build.c xen/include/public/dom0_ops.h |
line diff
1.1 --- a/tools/libxc/xc_domain.c Thu May 12 15:00:02 2005 +0000 1.2 +++ b/tools/libxc/xc_domain.c Thu May 12 15:02:52 2005 +0000 1.3 @@ -91,8 +91,8 @@ int xc_domain_pincpu(int xc_handle, 1.4 { 1.5 dom0_op_t op; 1.6 op.cmd = DOM0_PINCPUDOMAIN; 1.7 - op.u.pincpudomain.domain = (domid_t)domid; 1.8 - op.u.pincpudomain.exec_domain = vcpu; 1.9 + op.u.pincpudomain.domain = (domid_t)domid; 1.10 + op.u.pincpudomain.vcpu = vcpu; 1.11 op.u.pincpudomain.cpumap = cpumap; 1.12 return do_dom0_op(xc_handle, &op); 1.13 } 1.14 @@ -156,8 +156,8 @@ int xc_domain_get_vcpu_context(int xc_ha 1.15 1.16 op.cmd = DOM0_GETVCPUCONTEXT; 1.17 op.u.getvcpucontext.domain = (domid_t)domid; 1.18 - op.u.getvcpucontext.exec_domain = (u16)vcpu; 1.19 - op.u.getvcpucontext.ctxt = ctxt; 1.20 + op.u.getvcpucontext.vcpu = (u16)vcpu; 1.21 + op.u.getvcpucontext.ctxt = ctxt; 1.22 1.23 if ( (ctxt != NULL) && 1.24 ((rc = mlock(ctxt, sizeof(*ctxt))) != 0) )
2.1 --- a/tools/libxc/xc_linux_build.c Thu May 12 15:00:02 2005 +0000 2.2 +++ b/tools/libxc/xc_linux_build.c Thu May 12 15:02:52 2005 +0000 2.3 @@ -457,9 +457,9 @@ int xc_linux_build(int xc_handle, 2.4 2.5 memset( &launch_op, 0, sizeof(launch_op) ); 2.6 2.7 - launch_op.u.setdomaininfo.domain = (domid_t)domid; 2.8 - launch_op.u.setdomaininfo.exec_domain = 0; 2.9 - launch_op.u.setdomaininfo.ctxt = ctxt; 2.10 + launch_op.u.setdomaininfo.domain = (domid_t)domid; 2.11 + launch_op.u.setdomaininfo.vcpu = 0; 2.12 + launch_op.u.setdomaininfo.ctxt = ctxt; 2.13 2.14 launch_op.cmd = DOM0_SETDOMAININFO; 2.15 rc = do_dom0_op(xc_handle, &launch_op);
3.1 --- a/tools/libxc/xc_linux_restore.c Thu May 12 15:00:02 2005 +0000 3.2 +++ b/tools/libxc/xc_linux_restore.c Thu May 12 15:02:52 2005 +0000 3.3 @@ -634,9 +634,9 @@ int xc_linux_restore(int xc_handle, XcIO 3.4 xcio_info(ioctxt, "Domain ready to be built.\n"); 3.5 3.6 op.cmd = DOM0_SETDOMAININFO; 3.7 - op.u.setdomaininfo.domain = (domid_t)dom; 3.8 - op.u.setdomaininfo.exec_domain = 0; 3.9 - op.u.setdomaininfo.ctxt = &ctxt; 3.10 + op.u.setdomaininfo.domain = (domid_t)dom; 3.11 + op.u.setdomaininfo.vcpu = 0; 3.12 + op.u.setdomaininfo.ctxt = &ctxt; 3.13 rc = do_dom0_op(xc_handle, &op); 3.14 3.15 if ( rc != 0 )
4.1 --- a/tools/libxc/xc_plan9_build.c Thu May 12 15:00:02 2005 +0000 4.2 +++ b/tools/libxc/xc_plan9_build.c Thu May 12 15:02:52 2005 +0000 4.3 @@ -543,7 +543,7 @@ xc_plan9_build(int xc_handle, 4.4 memset(&launch_op, 0, sizeof (launch_op)); 4.5 4.6 launch_op.u.setdomaininfo.domain = (domid_t) domid; 4.7 - launch_op.u.setdomaininfo.exec_domain = 0; 4.8 + launch_op.u.setdomaininfo.vcpu = 0; 4.9 // launch_op.u.setdomaininfo.num_vifs = 1; 4.10 launch_op.u.setdomaininfo.ctxt = ctxt; 4.11 launch_op.cmd = DOM0_SETDOMAININFO;
5.1 --- a/tools/libxc/xc_private.c Thu May 12 15:00:02 2005 +0000 5.2 +++ b/tools/libxc/xc_private.c Thu May 12 15:02:52 2005 +0000 5.3 @@ -175,8 +175,8 @@ long long xc_domain_get_cpu_usage( int x 5.4 5.5 op.cmd = DOM0_GETVCPUCONTEXT; 5.6 op.u.getvcpucontext.domain = (domid_t)domid; 5.7 - op.u.getvcpucontext.exec_domain = (u16)vcpu; 5.8 - op.u.getvcpucontext.ctxt = NULL; 5.9 + op.u.getvcpucontext.vcpu = (u16)vcpu; 5.10 + op.u.getvcpucontext.ctxt = NULL; 5.11 if ( (do_dom0_op(xc_handle, &op) < 0) ) 5.12 { 5.13 PERROR("Could not get info on domain");
6.1 --- a/tools/libxc/xc_ptrace.c Thu May 12 15:00:02 2005 +0000 6.2 +++ b/tools/libxc/xc_ptrace.c Thu May 12 15:02:52 2005 +0000 6.3 @@ -311,8 +311,8 @@ xc_ptrace(enum __ptrace_request request, 6.4 op.cmd = DOM0_SETDOMAININFO; 6.5 SET_XC_REGS(((struct gdb_regs *)data), ctxt[VCPU].user_regs); 6.6 op.u.setdomaininfo.domain = domid; 6.7 - /* XXX need to understand multiple exec_domains */ 6.8 - op.u.setdomaininfo.exec_domain = cpu; 6.9 + /* XXX need to understand multiple vcpus */ 6.10 + op.u.setdomaininfo.vcpu = cpu; 6.11 op.u.setdomaininfo.ctxt = &ctxt[cpu]; 6.12 retval = do_dom0_op(xc_handle, &op); 6.13 if (retval) 6.14 @@ -340,7 +340,7 @@ xc_ptrace(enum __ptrace_request request, 6.15 ctxt[VCPU].user_regs.eflags |= PSL_T; 6.16 op.cmd = DOM0_SETDOMAININFO; 6.17 op.u.setdomaininfo.domain = domid; 6.18 - op.u.setdomaininfo.exec_domain = 0; 6.19 + op.u.setdomaininfo.vcpu = 0; 6.20 op.u.setdomaininfo.ctxt = &ctxt[cpu]; 6.21 retval = do_dom0_op(xc_handle, &op); 6.22 if (retval) { 6.23 @@ -357,7 +357,7 @@ xc_ptrace(enum __ptrace_request request, 6.24 ctxt[cpu].user_regs.eflags &= ~PSL_T; 6.25 op.cmd = DOM0_SETDOMAININFO; 6.26 op.u.setdomaininfo.domain = domid; 6.27 - op.u.setdomaininfo.exec_domain = cpu; 6.28 + op.u.setdomaininfo.vcpu = cpu; 6.29 op.u.setdomaininfo.ctxt = &ctxt[cpu]; 6.30 retval = do_dom0_op(xc_handle, &op); 6.31 if (retval) {
7.1 --- a/tools/libxc/xc_vmx_build.c Thu May 12 15:00:02 2005 +0000 7.2 +++ b/tools/libxc/xc_vmx_build.c Thu May 12 15:02:52 2005 +0000 7.3 @@ -623,9 +623,9 @@ int xc_vmx_build(int xc_handle, 7.4 7.5 memset( &launch_op, 0, sizeof(launch_op) ); 7.6 7.7 - launch_op.u.setdomaininfo.domain = (domid_t)domid; 7.8 - launch_op.u.setdomaininfo.exec_domain = 0; 7.9 - launch_op.u.setdomaininfo.ctxt = ctxt; 7.10 + launch_op.u.setdomaininfo.domain = (domid_t)domid; 7.11 + launch_op.u.setdomaininfo.vcpu = 0; 7.12 + launch_op.u.setdomaininfo.ctxt = ctxt; 7.13 7.14 launch_op.cmd = DOM0_SETDOMAININFO; 7.15 rc = do_dom0_op(xc_handle, &launch_op);
8.1 --- a/xen/include/public/dom0_ops.h Thu May 12 15:00:02 2005 +0000 8.2 +++ b/xen/include/public/dom0_ops.h Thu May 12 15:02:52 2005 +0000 8.3 @@ -95,7 +95,7 @@ typedef struct { 8.4 typedef struct { 8.5 /* IN variables. */ 8.6 domid_t domain; 8.7 - u16 exec_domain; 8.8 + u16 vcpu; 8.9 /* IN/OUT parameters */ 8.10 vcpu_guest_context_t *ctxt; 8.11 } dom0_setdomaininfo_t; 8.12 @@ -171,13 +171,13 @@ typedef struct { 8.13 } dom0_readconsole_t; 8.14 8.15 /* 8.16 - * Set which cpus an exec_domain can use 8.17 + * Set which physical cpus a vcpu can execute on. 8.18 */ 8.19 #define DOM0_PINCPUDOMAIN 20 8.20 typedef struct { 8.21 /* IN variables. */ 8.22 domid_t domain; 8.23 - u16 exec_domain; 8.24 + u16 vcpu; 8.25 cpumap_t *cpumap; 8.26 } dom0_pincpudomain_t; 8.27 8.28 @@ -346,7 +346,7 @@ typedef struct { 8.29 #define DOM0_GETVCPUCONTEXT 37 8.30 typedef struct { 8.31 domid_t domain; /* domain to be affected */ 8.32 - u16 exec_domain; /* vcpu # */ 8.33 + u16 vcpu; /* vcpu # */ 8.34 vcpu_guest_context_t *ctxt; /* NB. IN/OUT variable. */ 8.35 u64 cpu_time; 8.36 } dom0_getvcpucontext_t;