External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-29 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix vcpupin hypercall map data to be 8-bytes

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-01-09 21:08:29 +00:00
parent 78f2cd3d2d
commit 9d11255a47
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Jan 9 16:04:00 EST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/xen_internal.c: Ensure cpumap is at least 8 bytes long
when doing hypercall (Saori Fukuta)
Wed Jan 9 10:55:00 EST 2008 Daniel P. Berrange <berrange@redhat.com> Wed Jan 9 10:55:00 EST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/qemu_driver.c: Wire up to system_shutdown command for * src/qemu_driver.c: Wire up to system_shutdown command for

31
src/xen_internal.c
View File

@ -1638,6 +1638,9 @@ virXen_setvcpumap(int handle, int id, unsigned int vcpu,
unsigned char * cpumap, int maplen) unsigned char * cpumap, int maplen)
{ {
int ret = -1; int ret = -1;
unsigned char *new = NULL;
unsigned char *bitmap = NULL;
uint32_t nr_cpus;
if (hypervisor_version > 1) { if (hypervisor_version > 1) {
xen_op_v2_dom op; xen_op_v2_dom op;
@ -1649,16 +1652,36 @@ virXen_setvcpumap(int handle, int id, unsigned int vcpu,
memset(&op, 0, sizeof(op)); memset(&op, 0, sizeof(op));
op.cmd = XEN_V2_OP_SETVCPUMAP; op.cmd = XEN_V2_OP_SETVCPUMAP;
op.domain = (domid_t) id; op.domain = (domid_t) id;
/* The allocated memory to cpumap must be 'sizeof(uint64_t)' byte *
* for Xen, and also nr_cpus must be 'sizeof(uint64_t) * 8' */
if (maplen < 8) {
new = calloc(1, sizeof(uint64_t));
if (!new) {
virXenErrorFunc(NULL, VIR_ERR_NO_MEMORY, __FUNCTION__,
"allocating private data", 0);
return (-1);
}
memcpy(new, cpumap, maplen);
bitmap = new;
nr_cpus = sizeof(uint64_t) * 8;
} else {
bitmap = cpumap;
nr_cpus = maplen * 8;
}
if (dom_interface_version < 5) { if (dom_interface_version < 5) {
op.u.setvcpumap.vcpu = vcpu; op.u.setvcpumap.vcpu = vcpu;
op.u.setvcpumap.cpumap.bitmap = cpumap; op.u.setvcpumap.cpumap.bitmap = bitmap;
op.u.setvcpumap.cpumap.nr_cpus = maplen * 8; op.u.setvcpumap.cpumap.nr_cpus = nr_cpus;
} else { } else {
op.u.setvcpumapd5.vcpu = vcpu; op.u.setvcpumapd5.vcpu = vcpu;
op.u.setvcpumapd5.cpumap.bitmap.v = cpumap; op.u.setvcpumapd5.cpumap.bitmap.v = bitmap;
op.u.setvcpumapd5.cpumap.nr_cpus = maplen * 8; op.u.setvcpumapd5.cpumap.nr_cpus = nr_cpus;
} }
ret = xenHypervisorDoV2Dom(handle, &op); ret = xenHypervisorDoV2Dom(handle, &op);
if (new)
free(new);
if (unlock_pages(cpumap, maplen) < 0) { if (unlock_pages(cpumap, maplen) < 0) {
virXenError(NULL, VIR_ERR_XEN_CALL, " release", maplen); virXenError(NULL, VIR_ERR_XEN_CALL, " release", maplen);