External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use VIR_USE_CPU instead of new wheel

Browse Source
This commit is contained in:
Osier Yang 2011-06-07 16:51:51 +08:00
parent b10bca09f9
commit ebf6b11ac1
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libxl/libxl_driver.c
View File

@ -530,7 +530,6 @@ libxlDomainSetVcpuAffinites(libxlDriverPrivatePtr driver, virDomainObjPtr vm)
uint8_t *cpumap = NULL;
virNodeInfo nodeinfo;
size_t cpumaplen;
unsigned int pos;
int vcpu, i;
int ret = -1;
@ -551,10 +550,8 @@ libxlDomainSetVcpuAffinites(libxlDriverPrivatePtr driver, virDomainObjPtr vm)
cpumask = (uint8_t*) def->cputune.vcpupin[vcpu]->cpumask;
for (i = 0; i < VIR_DOMAIN_CPUMASK_LEN; ++i) {
if (cpumask[i]) {
pos = i / 8;
cpumap[pos] |= 1 << (i % 8);
}
if (cpumask[i])
VIR_USE_CPU(cpumap, i);
}
map.size = cpumaplen;

13
src/qemu/qemu_process.c
View File

@ -1233,18 +1233,9 @@ qemuProcessSetVcpuAffinites(virConnectPtr conn,
cpumask = (unsigned char *)def->cputune.vcpupin[vcpu]->cpumask;
vcpupid = priv->vcpupids[vcpu];
/* Convert cpumask to bitmap here. */
for (i = 0; i < VIR_DOMAIN_CPUMASK_LEN; i++) {
int cur = 0;
int mod = 0;
if (i) {
cur = i / 8;
mod = i % 8;
}
for (i = 0 ; i < VIR_DOMAIN_CPUMASK_LEN ; i++) {
if (cpumask[i])
cpumap[cur] |= 1 << mod;
VIR_USE_CPU(cpumap, i);
}
if (virProcessInfoSetAffinity(vcpupid,