# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID dd5649730b324a135838785864e00f1a0c7d3442
# Parent 84cf56328ce0ced88cbcb5bae31039ec3b801fbf
Fix a couple of bogus dom0_op names:
setdomaininfo -> setvcpucontext
pincpudomain -> setvcpuaffinity
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
diff -r 84cf56328ce0 -r dd5649730b32 tools/debugger/libxendebug/xendebug.c
--- a/tools/debugger/libxendebug/xendebug.c Fri Jan 6 11:25:47 2006
+++ b/tools/debugger/libxendebug/xendebug.c Fri Jan 6 11:53:19 2006
@@ -119,8 +119,8 @@
if ( !ctxt->valid[vcpu] )
{
- if ( (rc = xc_domain_get_vcpu_context(xc_handle, domid, vcpu,
- &ctxt->context[vcpu])) )
+ if ( (rc = xc_vcpu_getcontext(xc_handle, domid, vcpu,
+ &ctxt->context[vcpu])) )
return NULL;
ctxt->valid[vcpu] = true;
@@ -139,10 +139,10 @@
return -EINVAL;
op.interface_version = DOM0_INTERFACE_VERSION;
- op.cmd = DOM0_SETDOMAININFO;
- op.u.setdomaininfo.domain = ctxt->domid;
- op.u.setdomaininfo.vcpu = vcpu;
- op.u.setdomaininfo.ctxt = &ctxt->context[vcpu];
+ op.cmd = DOM0_SETVCPUCONTEXT;
+ op.u.setvcpucontext.domain = ctxt->domid;
+ op.u.setvcpucontext.vcpu = vcpu;
+ op.u.setvcpucontext.ctxt = &ctxt->context[vcpu];
if ( (rc = mlock(&ctxt->context[vcpu], sizeof(vcpu_guest_context_t))) )
return rc;
diff -r 84cf56328ce0 -r dd5649730b32 tools/libxc/xc_core.c
--- a/tools/libxc/xc_core.c Fri Jan 6 11:25:47 2006
+++ b/tools/libxc/xc_core.c Fri Jan 6 11:53:19 2006
@@ -55,7 +55,7 @@
}
for (i = 0; i < info.max_vcpu_id; i++)
- if (xc_domain_get_vcpu_context(xc_handle, domid,
+ if (xc_vcpu_getcontext(xc_handle, domid,
i, &ctxt[nr_vcpus]) == 0)
nr_vcpus++;
diff -r 84cf56328ce0 -r dd5649730b32 tools/libxc/xc_domain.c
--- a/tools/libxc/xc_domain.c Fri Jan 6 11:25:47 2006
+++ b/tools/libxc/xc_domain.c Fri Jan 6 11:53:19 2006
@@ -58,16 +58,16 @@
return do_dom0_op(xc_handle, &op);
}
-int xc_domain_pincpu(int xc_handle,
- uint32_t domid,
- int vcpu,
- cpumap_t cpumap)
-{
- DECLARE_DOM0_OP;
- op.cmd = DOM0_PINCPUDOMAIN;
- op.u.pincpudomain.domain = (domid_t)domid;
- op.u.pincpudomain.vcpu = vcpu;
- op.u.pincpudomain.cpumap = cpumap;
+int xc_vcpu_setaffinity(int xc_handle,
+ uint32_t domid,
+ int vcpu,
+ cpumap_t cpumap)
+{
+ DECLARE_DOM0_OP;
+ op.cmd = DOM0_SETVCPUAFFINITY;
+ op.u.setvcpuaffinity.domain = (domid_t)domid;
+ op.u.setvcpuaffinity.vcpu = vcpu;
+ op.u.setvcpuaffinity.cpumap = cpumap;
return do_dom0_op(xc_handle, &op);
}
@@ -155,7 +155,7 @@
return ret;
}
-int xc_domain_get_vcpu_context(int xc_handle,
+int xc_vcpu_getcontext(int xc_handle,
uint32_t domid,
uint32_t vcpu,
vcpu_guest_context_t *ctxt)
@@ -345,10 +345,10 @@
return do_dom0_op(xc_handle, &op);
}
-int xc_domain_get_vcpu_info(int xc_handle,
- uint32_t domid,
- uint32_t vcpu,
- xc_vcpuinfo_t *info)
+int xc_vcpu_getinfo(int xc_handle,
+ uint32_t domid,
+ uint32_t vcpu,
+ xc_vcpuinfo_t *info)
{
int rc;
DECLARE_DOM0_OP;
@@ -380,18 +380,18 @@
return do_dom0_op(xc_handle, &op);
}
-int xc_domain_setinfo(int xc_handle,
- uint32_t domid,
- uint32_t vcpu,
- vcpu_guest_context_t *ctxt)
+int xc_vcpu_setcontext(int xc_handle,
+ uint32_t domid,
+ uint32_t vcpu,
+ vcpu_guest_context_t *ctxt)
{
dom0_op_t op;
int rc;
- op.cmd = DOM0_SETDOMAININFO;
- op.u.setdomaininfo.domain = domid;
- op.u.setdomaininfo.vcpu = vcpu;
- op.u.setdomaininfo.ctxt = ctxt;
+ op.cmd = DOM0_SETVCPUCONTEXT;
+ op.u.setvcpucontext.domain = domid;
+ op.u.setvcpucontext.vcpu = vcpu;
+ op.u.setvcpucontext.ctxt = ctxt;
if ( (rc = mlock(ctxt, sizeof(*ctxt))) != 0 )
return rc;
diff -r 84cf56328ce0 -r dd5649730b32 tools/libxc/xc_ia64_stubs.c
--- a/tools/libxc/xc_ia64_stubs.c Fri Jan 6 11:25:47 2006
+++ b/tools/libxc/xc_ia64_stubs.c Fri Jan 6 11:53:19 2006
@@ -664,7 +664,7 @@
goto error_out;
}
- if ( xc_domain_get_vcpu_context(xc_handle, domid, 0, ctxt) ){
+ if ( xc_vcpu_getcontext(xc_handle, domid, 0, ctxt) ){
PERROR("Could not get vcpu context");
goto error_out;
}
@@ -688,11 +688,11 @@
memset( &launch_op, 0, sizeof(launch_op) );
- 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;
+ launch_op.u.setvcpucontext.domain = (domid_t)domid;
+ launch_op.u.setvcpucontext.vcpu = 0;
+ launch_op.u.setvcpucontext.ctxt = ctxt;
+
+ launch_op.cmd = DOM0_SETVCPUCONTEXT;
rc = do_dom0_op(xc_handle, &launch_op);
return rc;
diff -r 84cf56328ce0 -r dd5649730b32 tools/libxc/xc_linux_build.c
--- a/tools/libxc/xc_linux_build.c Fri Jan 6 11:25:47 2006
+++ b/tools/libxc/xc_linux_build.c Fri Jan 6 11:53:19 2006
@@ -794,7 +794,7 @@
goto error_out;
}
- if ( xc_domain_get_vcpu_context(xc_handle, domid, 0, ctxt) )
+ if ( xc_vcpu_getcontext(xc_handle, domid, 0, ctxt) )
{
PERROR("Could not get vcpu context");
goto error_out;
@@ -897,11 +897,11 @@
memset( &launch_op, 0, sizeof(launch_op) );
- 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;
+ launch_op.u.setvcpucontext.domain = (domid_t)domid;
+ launch_op.u.setvcpucontext.vcpu = 0;
+ launch_op.u.setvcpucontext.ctxt = ctxt;
+
+ launch_op.cmd = DOM0_SETVCPUCONTEXT;
rc = xc_dom0_op(xc_handle, &launch_op);
return rc;
diff -r 84cf56328ce0 -r dd5649730b32 tools/libxc/xc_linux_restore.c
--- a/tools/libxc/xc_linux_restore.c Fri Jan 6 11:25:47 2006
+++ b/tools/libxc/xc_linux_restore.c Fri Jan 6 11:53:19 2006
@@ -171,7 +171,7 @@
/* Only have to worry about vcpu 0 even for SMP */
- if (xc_domain_get_vcpu_context( xc_handle, dom, 0, &ctxt)) {
+ if (xc_vcpu_getcontext( xc_handle, dom, 0, &ctxt)) {
ERR("Could not get vcpu context");
goto out;
}
@@ -735,10 +735,10 @@
DPRINTF("Domain ready to be built.\n");
- op.cmd = DOM0_SETDOMAININFO;
- op.u.setdomaininfo.domain = (domid_t)dom;
- op.u.setdomaininfo.vcpu = 0;
- op.u.setdomaininfo.ctxt = &ctxt;
+ op.cmd = DOM0_SETVCPUCONTEXT;
+ op.u.setvcpucontext.domain = (domid_t)dom;
+ op.u.setvcpucontext.vcpu = 0;
+ op.u.setvcpucontext.ctxt = &ctxt;
rc = xc_dom0_op(xc_handle, &op);
if (rc != 0) {
diff -r 84cf56328ce0 -r dd5649730b32 tools/libxc/xc_linux_save.c
--- a/tools/libxc/xc_linux_save.c Fri Jan 6 11:25:47 2006
+++ b/tools/libxc/xc_linux_save.c Fri Jan 6 11:53:19 2006
@@ -382,7 +382,7 @@
return -1;
}
- if ( xc_domain_get_vcpu_context(xc_handle, dom, 0 /* XXX */, ctxt))
+ if ( xc_vcpu_getcontext(xc_handle, dom, 0 /* XXX */, ctxt))
ERR("Could not get vcpu context");
@@ -643,7 +643,7 @@
}
/* Only have to worry about vcpu 0 even for SMP */
- if (xc_domain_get_vcpu_context(xc_handle, dom, 0, &ctxt)) {
+ if (xc_vcpu_getcontext(xc_handle, dom, 0, &ctxt)) {
ERR("Could not get vcpu context");
goto out;
}
diff -r 84cf56328ce0 -r dd5649730b32 tools/libxc/xc_pagetab.c
--- a/tools/libxc/xc_pagetab.c Fri Jan 6 11:25:47 2006
+++ b/tools/libxc/xc_pagetab.c Fri Jan 6 11:53:19 2006
@@ -74,7 +74,7 @@
#define pt_levels 4
#endif
- if (xc_domain_get_vcpu_context(xc_handle, dom, vcpu, &ctx) != 0) {
+ if (xc_vcpu_getcontext(xc_handle, dom, vcpu, &ctx) != 0) {
fprintf(stderr, "failed to retreive vcpu context\n");
goto out;
}
diff -r 84cf56328ce0 -r dd5649730b32 tools/libxc/xc_ptrace.c
--- a/tools/libxc/xc_ptrace.c Fri Jan 6 11:25:47 2006
+++ b/tools/libxc/xc_ptrace.c Fri Jan 6 11:53:19 2006
@@ -33,7 +33,7 @@
if (online)
*online = 0;
if ( !(regs_valid & (1 << cpu)) ) {
- retval = xc_domain_get_vcpu_context(xc_handle, current_domid,
+ retval = xc_vcpu_getcontext(xc_handle, current_domid,
cpu, &ctxt[cpu]);
if ( retval )
goto done;
@@ -43,8 +43,7 @@
if ( online == NULL )
goto done;
- retval = xc_domain_get_vcpu_info(xc_handle, current_domid,
- cpu, &info);
+ retval = xc_vcpu_getinfo(xc_handle, current_domid, cpu, &info);
*online = info.online;
done:
@@ -395,7 +394,7 @@
case PTRACE_SETREGS:
SET_XC_REGS(((struct gdb_regs *)data), ctxt[cpu].user_regs);
- retval = xc_domain_setinfo(xc_handle, current_domid, cpu, &ctxt[cpu]);
+ retval = xc_vcpu_setcontext(xc_handle, current_domid, cpu, &ctxt[cpu]);
if (retval)
goto error_out;
break;
@@ -405,7 +404,7 @@
* during single-stepping - but that just seems retarded
*/
ctxt[cpu].user_regs.eflags |= PSL_T;
- retval = xc_domain_setinfo(xc_handle, current_domid, cpu, &ctxt[cpu]);
+ retval = xc_vcpu_setcontext(xc_handle, current_domid, cpu, &ctxt[cpu]);
if ( retval )
{
perror("dom0 op failed");
@@ -423,8 +422,8 @@
/* Clear trace flag */
if ( ctxt[cpu].user_regs.eflags & PSL_T ) {
ctxt[cpu].user_regs.eflags &= ~PSL_T;
- retval = xc_domain_setinfo(xc_handle, current_domid,
- cpu, &ctxt[cpu]);
+ retval = xc_vcpu_setcontext(xc_handle, current_domid,
+ cpu, &ctxt[cpu]);
if ( retval ) {
perror("dom0 op failed");
goto error_out;
diff -r 84cf56328ce0 -r dd5649730b32 tools/libxc/xc_vmx_build.c
--- a/tools/libxc/xc_vmx_build.c Fri Jan 6 11:25:47 2006
+++ b/tools/libxc/xc_vmx_build.c Fri Jan 6 11:53:19 2006
@@ -651,7 +651,7 @@
goto error_out;
}
- if ( xc_domain_get_vcpu_context(xc_handle, domid, 0, ctxt) )
+ if ( xc_vcpu_getcontext(xc_handle, domid, 0, ctxt) )
{
PERROR("Could not get vcpu context");
goto error_out;
@@ -708,11 +708,11 @@
memset( &launch_op, 0, sizeof(launch_op) );
- 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;
+ launch_op.u.setvcpucontext.domain = (domid_t)domid;
+ launch_op.u.setvcpucontext.vcpu = 0;
+ launch_op.u.setvcpucontext.ctxt = ctxt;
+
+ launch_op.cmd = DOM0_SETVCPUCONTEXT;
rc = xc_dom0_op(xc_handle, &launch_op);
return rc;
diff -r 84cf56328ce0 -r dd5649730b32 tools/libxc/xenctrl.h
--- a/tools/libxc/xenctrl.h Fri Jan 6 11:25:47 2006
+++ b/tools/libxc/xenctrl.h Fri Jan 6 11:53:19 2006
@@ -181,10 +181,11 @@
*/
int xc_domain_destroy(int xc_handle,
uint32_t domid);
-int xc_domain_pincpu(int xc_handle,
- uint32_t domid,
- int vcpu,
- cpumap_t cpumap);
+
+int xc_vcpu_setaffinity(int xc_handle,
+ uint32_t domid,
+ int vcpu,
+ cpumap_t cpumap);
/**
* This function will return information about one or more domains. It is
@@ -208,7 +209,7 @@
/**
- * This function will set the vcpu context for the specified domain.
+ * This function will set the execution context for the specified vcpu.
*
* @parm xc_handle a handle to an open hypervisor interface
* @parm domid the domain to set the vcpu context for
@@ -216,10 +217,10 @@
* @parm ctxt pointer to the the cpu context with the values to set
* @return the number of domains enumerated or -1 on error
*/
-int xc_domain_setinfo(int xc_handle,
- uint32_t domid,
- uint32_t vcpu,
- vcpu_guest_context_t *ctxt);
+int xc_vcpu_setcontext(int xc_handle,
+ uint32_t domid,
+ uint32_t vcpu,
+ vcpu_guest_context_t *ctxt);
/**
* This function will return information about one or more domains, using a
* single hypercall. The domain information will be stored into the supplied
@@ -249,17 +250,16 @@
* domain
* @return 0 on success, -1 on failure
*/
-int xc_domain_get_vcpu_context(int xc_handle,
+int xc_vcpu_getcontext(int xc_handle,
uint32_t domid,
uint32_t vcpu,
vcpu_guest_context_t *ctxt);
typedef dom0_getvcpuinfo_t xc_vcpuinfo_t;
-int xc_domain_get_vcpu_info(int xc_handle,
- uint32_t domid,
- uint32_t vcpu,
- xc_vcpuinfo_t *info);
-
+int xc_vcpu_getinfo(int xc_handle,
+ uint32_t domid,
+ uint32_t vcpu,
+ xc_vcpuinfo_t *info);
int xc_domain_setcpuweight(int xc_handle,
uint32_t domid,
diff -r 84cf56328ce0 -r dd5649730b32 tools/python/xen/lowlevel/xc/xc.c
--- a/tools/python/xen/lowlevel/xc/xc.c Fri Jan 6 11:25:47 2006
+++ b/tools/python/xen/lowlevel/xc/xc.c Fri Jan 6 11:53:19 2006
@@ -135,9 +135,9 @@
}
-static PyObject *pyxc_domain_pincpu(XcObject *self,
- PyObject *args,
- PyObject *kwds)
+static PyObject *pyxc_vcpu_setaffinity(XcObject *self,
+ PyObject *args,
+ PyObject *kwds)
{
uint32_t dom;
int vcpu = 0, i;
@@ -157,7 +157,7 @@
cpumap |= (cpumap_t)1 << PyInt_AsLong(PyList_GetItem(cpulist, i));
}
- if ( xc_domain_pincpu(self->xc_handle, dom, vcpu, cpumap) != 0 )
+ if ( xc_vcpu_setaffinity(self->xc_handle, dom, vcpu, cpumap) != 0 )
return PyErr_SetFromErrno(xc_error);
Py_INCREF(zero);
@@ -297,7 +297,7 @@
&dom, &vcpu) )
return NULL;
- rc = xc_domain_get_vcpu_info(self->xc_handle, dom, vcpu, &info);
+ rc = xc_vcpu_getinfo(self->xc_handle, dom, vcpu, &info);
if ( rc < 0 )
return PyErr_SetFromErrno(xc_error);
@@ -890,8 +890,8 @@
" dom [int]: Identifier of domain to be destroyed.\n\n"
"Returns: [int] 0 on success; -1 on error.\n" },
- { "domain_pincpu",
- (PyCFunction)pyxc_domain_pincpu,
+ { "vcpu_setaffinity",
+ (PyCFunction)pyxc_vcpu_setaffinity,
METH_VARARGS | METH_KEYWORDS, "\n"
"Pin a VCPU to a specified set CPUs.\n"
" dom [int]: Identifier of domain to which VCPU belongs.\n"
diff -r 84cf56328ce0 -r dd5649730b32 tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py Fri Jan 6 11:25:47 2006
+++ b/tools/python/xen/xend/XendDomain.py Fri Jan 6 11:53:19 2006
@@ -443,7 +443,7 @@
cpumap = map(lambda x: int(x),
cpumap.replace("[", "").replace("]", "").split(","))
try:
- return xc.domain_pincpu(dominfo.getDomid(), vcpu, cpumap)
+ return xc.vcpu_setaffinity(dominfo.getDomid(), vcpu, cpumap)
except Exception, ex:
raise XendError(str(ex))
diff -r 84cf56328ce0 -r dd5649730b32 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py Fri Jan 6 11:25:47 2006
+++ b/tools/python/xen/xend/XendDomainInfo.py Fri Jan 6 11:53:19 2006
@@ -1179,7 +1179,7 @@
for v in range(0, self.info['max_vcpu_id']+1):
# pincpu takes a list of ints
cpu = [ int( cpus[v % len(cpus)] ) ]
- xc.domain_pincpu(self.domid, v, cpu)
+ xc.vcpu_setaffinity(self.domid, v, cpu)
m = self.image.getDomainMemory(self.info['memory'] * 1024)
balloon.free(m)
diff -r 84cf56328ce0 -r dd5649730b32 tools/xentrace/xenctx.c
--- a/tools/xentrace/xenctx.c Fri Jan 6 11:25:47 2006
+++ b/tools/xentrace/xenctx.c Fri Jan 6 11:53:19 2006
@@ -380,10 +380,10 @@
exit(-1);
}
- ret = xc_domain_get_vcpu_context(xc_handle, domid, vcpu, &ctx);
+ ret = xc_vcpu_getcontext(xc_handle, domid, vcpu, &ctx);
if (ret < 0) {
xc_domain_unpause(xc_handle, domid);
- perror("xc_domain_get_vcpu_context");
+ perror("xc_vcpu_getcontext");
exit(-1);
}
diff -r 84cf56328ce0 -r dd5649730b32 xen/common/dom0_ops.c
--- a/xen/common/dom0_ops.c Fri Jan 6 11:25:47 2006
+++ b/xen/common/dom0_ops.c Fri Jan 6 11:53:19 2006
@@ -110,13 +110,13 @@
switch ( op->cmd )
{
- case DOM0_SETDOMAININFO:
- {
- struct domain *d = find_domain_by_id(op->u.setdomaininfo.domain);
+ case DOM0_SETVCPUCONTEXT:
+ {
+ struct domain *d = find_domain_by_id(op->u.setvcpucontext.domain);
ret = -ESRCH;
if ( d != NULL )
{
- ret = set_info_guest(d, &op->u.setdomaininfo);
+ ret = set_info_guest(d, &op->u.setvcpucontext);
put_domain(d);
}
}
@@ -284,9 +284,9 @@
}
break;
- case DOM0_PINCPUDOMAIN:
- {
- domid_t dom = op->u.pincpudomain.domain;
+ case DOM0_SETVCPUAFFINITY:
+ {
+ domid_t dom = op->u.setvcpuaffinity.domain;
struct domain *d = find_domain_by_id(dom);
struct vcpu *v;
@@ -296,15 +296,15 @@
break;
}
- if ( (op->u.pincpudomain.vcpu >= MAX_VIRT_CPUS) ||
- !d->vcpu[op->u.pincpudomain.vcpu] )
+ if ( (op->u.setvcpuaffinity.vcpu >= MAX_VIRT_CPUS) ||
+ !d->vcpu[op->u.setvcpuaffinity.vcpu] )
{
ret = -EINVAL;
put_domain(d);
break;
}
- v = d->vcpu[op->u.pincpudomain.vcpu];
+ v = d->vcpu[op->u.setvcpuaffinity.vcpu];
if ( v == NULL )
{
ret = -ESRCH;
@@ -320,9 +320,9 @@
}
memcpy(cpus_addr(v->cpu_affinity),
- &op->u.pincpudomain.cpumap,
+ &op->u.setvcpuaffinity.cpumap,
min((int)BITS_TO_LONGS(NR_CPUS),
- (int)sizeof(op->u.pincpudomain.cpumap)));
+ (int)sizeof(op->u.setvcpuaffinity.cpumap)));
vcpu_pause(v);
vcpu_migrate_cpu(v, first_cpu(v->cpu_affinity));
diff -r 84cf56328ce0 -r dd5649730b32 xen/common/domain.c
--- a/xen/common/domain.c Fri Jan 6 11:25:47 2006
+++ b/xen/common/domain.c Fri Jan 6 11:53:19 2006
@@ -357,11 +357,11 @@
* of domains other than domain 0. ie. the domains that are being built by
* the userspace dom0 domain builder.
*/
-int set_info_guest(struct domain *d, dom0_setdomaininfo_t *setdomaininfo)
+int set_info_guest(struct domain *d, dom0_setvcpucontext_t *setvcpucontext)
{
int rc = 0;
struct vcpu_guest_context *c = NULL;
- unsigned long vcpu = setdomaininfo->vcpu;
+ unsigned long vcpu = setvcpucontext->vcpu;
struct vcpu *v;
if ( (vcpu >= MAX_VIRT_CPUS) || ((v = d->vcpu[vcpu]) == NULL) )
@@ -374,7 +374,7 @@
return -ENOMEM;
rc = -EFAULT;
- if ( copy_from_user(c, setdomaininfo->ctxt, sizeof(*c)) == 0 )
+ if ( copy_from_user(c, setvcpucontext->ctxt, sizeof(*c)) == 0 )
rc = arch_set_info_guest(v, c);
xfree(c);
diff -r 84cf56328ce0 -r dd5649730b32 xen/include/public/dom0_ops.h
--- a/xen/include/public/dom0_ops.h Fri Jan 6 11:25:47 2006
+++ b/xen/include/public/dom0_ops.h Fri Jan 6 11:53:19 2006
@@ -94,14 +94,14 @@
xen_domain_handle_t handle;
} dom0_getdomaininfo_t;
-#define DOM0_SETDOMAININFO 13
+#define DOM0_SETVCPUCONTEXT 13
typedef struct {
/* IN variables. */
domid_t domain;
uint32_t vcpu;
/* IN/OUT parameters */
vcpu_guest_context_t *ctxt;
-} dom0_setdomaininfo_t;
+} dom0_setvcpucontext_t;
#define DOM0_MSR 15
typedef struct {
@@ -163,13 +163,13 @@
/*
* Set which physical cpus a vcpu can execute on.
*/
-#define DOM0_PINCPUDOMAIN 20
+#define DOM0_SETVCPUAFFINITY 20
typedef struct {
/* IN variables. */
domid_t domain;
uint32_t vcpu;
cpumap_t cpumap;
-} dom0_pincpudomain_t;
+} dom0_setvcpuaffinity_t;
/* Get trace buffers machine base address */
#define DOM0_TBUFCONTROL 21
@@ -436,13 +436,13 @@
dom0_getmemlist_t getmemlist;
dom0_schedctl_t schedctl;
dom0_adjustdom_t adjustdom;
- dom0_setdomaininfo_t setdomaininfo;
+ dom0_setvcpucontext_t setvcpucontext;
dom0_getdomaininfo_t getdomaininfo;
dom0_getpageframeinfo_t getpageframeinfo;
dom0_msr_t msr;
dom0_settime_t settime;
dom0_readconsole_t readconsole;
- dom0_pincpudomain_t pincpudomain;
+ dom0_setvcpuaffinity_t setvcpuaffinity;
dom0_tbufcontrol_t tbufcontrol;
dom0_physinfo_t physinfo;
dom0_sched_id_t sched_id;
diff -r 84cf56328ce0 -r dd5649730b32 xen/include/xen/sched.h
--- a/xen/include/xen/sched.h Fri Jan 6 11:25:47 2006
+++ b/xen/include/xen/sched.h Fri Jan 6 11:53:19 2006
@@ -221,7 +221,7 @@
unsigned long image_start, unsigned long image_len,
unsigned long initrd_start, unsigned long initrd_len,
char *cmdline);
-extern int set_info_guest(struct domain *d, dom0_setdomaininfo_t *);
+extern int set_info_guest(struct domain *d, dom0_setvcpucontext_t *);
struct domain *find_domain_by_id(domid_t dom);
extern void domain_destruct(struct domain *d);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home