ChangeSet 1.1438, 2005/05/12 16:02:52+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx
Remove 'exec_domain' from Xen public interfaces. Replace with 'vcpu'.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
tools/libxc/xc_domain.c | 8 ++++----
tools/libxc/xc_linux_build.c | 6 +++---
tools/libxc/xc_linux_restore.c | 6 +++---
tools/libxc/xc_plan9_build.c | 2 +-
tools/libxc/xc_private.c | 4 ++--
tools/libxc/xc_ptrace.c | 8 ++++----
tools/libxc/xc_vmx_build.c | 6 +++---
xen/include/public/dom0_ops.h | 8 ++++----
8 files changed, 24 insertions(+), 24 deletions(-)
diff -Nru a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
--- a/tools/libxc/xc_domain.c 2005-05-12 12:04:53 -04:00
+++ b/tools/libxc/xc_domain.c 2005-05-12 12:04:53 -04:00
@@ -91,8 +91,8 @@
{
dom0_op_t op;
op.cmd = DOM0_PINCPUDOMAIN;
- op.u.pincpudomain.domain = (domid_t)domid;
- op.u.pincpudomain.exec_domain = vcpu;
+ op.u.pincpudomain.domain = (domid_t)domid;
+ op.u.pincpudomain.vcpu = vcpu;
op.u.pincpudomain.cpumap = cpumap;
return do_dom0_op(xc_handle, &op);
}
@@ -156,8 +156,8 @@
op.cmd = DOM0_GETVCPUCONTEXT;
op.u.getvcpucontext.domain = (domid_t)domid;
- op.u.getvcpucontext.exec_domain = (u16)vcpu;
- op.u.getvcpucontext.ctxt = ctxt;
+ op.u.getvcpucontext.vcpu = (u16)vcpu;
+ op.u.getvcpucontext.ctxt = ctxt;
if ( (ctxt != NULL) &&
((rc = mlock(ctxt, sizeof(*ctxt))) != 0) )
diff -Nru a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c
--- a/tools/libxc/xc_linux_build.c 2005-05-12 12:04:53 -04:00
+++ b/tools/libxc/xc_linux_build.c 2005-05-12 12:04:53 -04:00
@@ -457,9 +457,9 @@
memset( &launch_op, 0, sizeof(launch_op) );
- launch_op.u.setdomaininfo.domain = (domid_t)domid;
- launch_op.u.setdomaininfo.exec_domain = 0;
- launch_op.u.setdomaininfo.ctxt = ctxt;
+ launch_op.u.setdomaininfo.domain = (domid_t)domid;
+ launch_op.u.setdomaininfo.vcpu = 0;
+ launch_op.u.setdomaininfo.ctxt = ctxt;
launch_op.cmd = DOM0_SETDOMAININFO;
rc = do_dom0_op(xc_handle, &launch_op);
diff -Nru a/tools/libxc/xc_linux_restore.c b/tools/libxc/xc_linux_restore.c
--- a/tools/libxc/xc_linux_restore.c 2005-05-12 12:04:53 -04:00
+++ b/tools/libxc/xc_linux_restore.c 2005-05-12 12:04:53 -04:00
@@ -634,9 +634,9 @@
xcio_info(ioctxt, "Domain ready to be built.\n");
op.cmd = DOM0_SETDOMAININFO;
- op.u.setdomaininfo.domain = (domid_t)dom;
- op.u.setdomaininfo.exec_domain = 0;
- op.u.setdomaininfo.ctxt = &ctxt;
+ op.u.setdomaininfo.domain = (domid_t)dom;
+ op.u.setdomaininfo.vcpu = 0;
+ op.u.setdomaininfo.ctxt = &ctxt;
rc = do_dom0_op(xc_handle, &op);
if ( rc != 0 )
diff -Nru a/tools/libxc/xc_plan9_build.c b/tools/libxc/xc_plan9_build.c
--- a/tools/libxc/xc_plan9_build.c 2005-05-12 12:04:53 -04:00
+++ b/tools/libxc/xc_plan9_build.c 2005-05-12 12:04:53 -04:00
@@ -543,7 +543,7 @@
memset(&launch_op, 0, sizeof (launch_op));
launch_op.u.setdomaininfo.domain = (domid_t) domid;
- launch_op.u.setdomaininfo.exec_domain = 0;
+ launch_op.u.setdomaininfo.vcpu = 0;
// launch_op.u.setdomaininfo.num_vifs = 1;
launch_op.u.setdomaininfo.ctxt = ctxt;
launch_op.cmd = DOM0_SETDOMAININFO;
diff -Nru a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c
--- a/tools/libxc/xc_private.c 2005-05-12 12:04:53 -04:00
+++ b/tools/libxc/xc_private.c 2005-05-12 12:04:53 -04:00
@@ -175,8 +175,8 @@
op.cmd = DOM0_GETVCPUCONTEXT;
op.u.getvcpucontext.domain = (domid_t)domid;
- op.u.getvcpucontext.exec_domain = (u16)vcpu;
- op.u.getvcpucontext.ctxt = NULL;
+ op.u.getvcpucontext.vcpu = (u16)vcpu;
+ op.u.getvcpucontext.ctxt = NULL;
if ( (do_dom0_op(xc_handle, &op) < 0) )
{
PERROR("Could not get info on domain");
diff -Nru a/tools/libxc/xc_ptrace.c b/tools/libxc/xc_ptrace.c
--- a/tools/libxc/xc_ptrace.c 2005-05-12 12:04:53 -04:00
+++ b/tools/libxc/xc_ptrace.c 2005-05-12 12:04:53 -04:00
@@ -311,8 +311,8 @@
op.cmd = DOM0_SETDOMAININFO;
SET_XC_REGS(((struct gdb_regs *)data), ctxt[VCPU].user_regs);
op.u.setdomaininfo.domain = domid;
- /* XXX need to understand multiple exec_domains */
- op.u.setdomaininfo.exec_domain = cpu;
+ /* XXX need to understand multiple vcpus */
+ op.u.setdomaininfo.vcpu = cpu;
op.u.setdomaininfo.ctxt = &ctxt[cpu];
retval = do_dom0_op(xc_handle, &op);
if (retval)
@@ -340,7 +340,7 @@
ctxt[VCPU].user_regs.eflags |= PSL_T;
op.cmd = DOM0_SETDOMAININFO;
op.u.setdomaininfo.domain = domid;
- op.u.setdomaininfo.exec_domain = 0;
+ op.u.setdomaininfo.vcpu = 0;
op.u.setdomaininfo.ctxt = &ctxt[cpu];
retval = do_dom0_op(xc_handle, &op);
if (retval) {
@@ -357,7 +357,7 @@
ctxt[cpu].user_regs.eflags &= ~PSL_T;
op.cmd = DOM0_SETDOMAININFO;
op.u.setdomaininfo.domain = domid;
- op.u.setdomaininfo.exec_domain = cpu;
+ op.u.setdomaininfo.vcpu = cpu;
op.u.setdomaininfo.ctxt = &ctxt[cpu];
retval = do_dom0_op(xc_handle, &op);
if (retval) {
diff -Nru a/tools/libxc/xc_vmx_build.c b/tools/libxc/xc_vmx_build.c
--- a/tools/libxc/xc_vmx_build.c 2005-05-12 12:04:53 -04:00
+++ b/tools/libxc/xc_vmx_build.c 2005-05-12 12:04:53 -04:00
@@ -623,9 +623,9 @@
memset( &launch_op, 0, sizeof(launch_op) );
- launch_op.u.setdomaininfo.domain = (domid_t)domid;
- launch_op.u.setdomaininfo.exec_domain = 0;
- launch_op.u.setdomaininfo.ctxt = ctxt;
+ launch_op.u.setdomaininfo.domain = (domid_t)domid;
+ launch_op.u.setdomaininfo.vcpu = 0;
+ launch_op.u.setdomaininfo.ctxt = ctxt;
launch_op.cmd = DOM0_SETDOMAININFO;
rc = do_dom0_op(xc_handle, &launch_op);
diff -Nru a/xen/include/public/dom0_ops.h b/xen/include/public/dom0_ops.h
--- a/xen/include/public/dom0_ops.h 2005-05-12 12:04:53 -04:00
+++ b/xen/include/public/dom0_ops.h 2005-05-12 12:04:53 -04:00
@@ -95,7 +95,7 @@
typedef struct {
/* IN variables. */
domid_t domain;
- u16 exec_domain;
+ u16 vcpu;
/* IN/OUT parameters */
vcpu_guest_context_t *ctxt;
} dom0_setdomaininfo_t;
@@ -171,13 +171,13 @@
} dom0_readconsole_t;
/*
- * Set which cpus an exec_domain can use
+ * Set which physical cpus a vcpu can execute on.
*/
#define DOM0_PINCPUDOMAIN 20
typedef struct {
/* IN variables. */
domid_t domain;
- u16 exec_domain;
+ u16 vcpu;
cpumap_t *cpumap;
} dom0_pincpudomain_t;
@@ -346,7 +346,7 @@
#define DOM0_GETVCPUCONTEXT 37
typedef struct {
domid_t domain; /* domain to be affected */
- u16 exec_domain; /* vcpu # */
+ u16 vcpu; /* vcpu # */
vcpu_guest_context_t *ctxt; /* NB. IN/OUT variable. */
u64 cpu_time;
} dom0_getvcpucontext_t;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home