xend: Fix bug of cpu affinity/ vcpu pin under ia32pae

c/s 21040 and 21044 used to break cpu number limit (<=64).
However, they result in bug under ia32pae model:
1. things will go wrong for affinity, making all vcpus pin to a same
cpu with same time;
2. when 'xm vcpu-pin' vpu to cpu, xend will exit abnormally.

This patch is to fix the bugs described above.

Signed-off-by: Xu, Jiajun <jiajun.xu@intel.com>
Signed-off-by: Zhang, Jianwu <jianwu.zhang@inte.com>
Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
This commit is contained in:
Keir Fraser committed 2010-03-30 18:31:39 +01:00
1 parent 7c65239bc4
commit 5657c1d9cb
1 file changed
+4 -8
+4 -8
View File
@@ -218,8 +218,7 @@ static PyObject *pyxc_vcpu_setaffinity(XcObject *self,
uint64_t *cpumap;
PyObject *cpulist = NULL;
int nr_cpus, size;
xc_physinfo_t info;
xc_cpu_to_node_t map[1];
xc_physinfo_t info = {0};
uint64_t cpumap_size = sizeof(*cpumap);
static char *kwd_list[] = { "domid", "vcpu", "cpumap", NULL };
@@ -228,8 +227,6 @@ static PyObject *pyxc_vcpu_setaffinity(XcObject *self,
&dom, &vcpu, &cpulist) )
return NULL;
set_xen_guest_handle(info.cpu_to_node, map);
info.max_cpu_id = 1;
if ( xc_physinfo(self->xc_handle, &info) != 0 )
return pyxc_error_to_exception();
@@ -381,7 +378,6 @@ static PyObject *pyxc_vcpu_getinfo(XcObject *self,
uint64_t *cpumap;
int nr_cpus, size;
xc_physinfo_t pinfo = { 0 };
xc_cpu_to_node_t map[1];
uint64_t cpumap_size = sizeof(*cpumap);
static char *kwd_list[] = { "domid", "vcpu", NULL };
@@ -390,18 +386,18 @@ static PyObject *pyxc_vcpu_getinfo(XcObject *self,
&dom, &vcpu) )
return NULL;
set_xen_guest_handle(pinfo.cpu_to_node, map);
pinfo.max_cpu_id = 1;
if ( xc_physinfo(self->xc_handle, &pinfo) != 0 )
return pyxc_error_to_exception();
nr_cpus = pinfo.nr_cpus;
rc = xc_vcpu_getinfo(self->xc_handle, dom, vcpu, &info);
if ( rc < 0 )
return pyxc_error_to_exception();
size = (nr_cpus + cpumap_size * 8 - 1)/ (cpumap_size * 8);
size = (nr_cpus + cpumap_size * 8 - 1)/ (cpumap_size * 8);
if((cpumap = malloc(cpumap_size * size)) == NULL)
return pyxc_error_to_exception();
memset(cpumap, 0, cpumap_size * size);
rc = xc_vcpu_getaffinity(self->xc_handle, dom, vcpu, cpumap, cpumap_size * size);
if ( rc < 0 )
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.