NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Allow cpu pinning for all logical CPUs, not just physical

Browse Source 
This is what virsh already expects when printing output, and what
'man cpuset' claims to support.
This commit is contained in:
Cole Robinson 2009-11-05 10:21:33 -05:00
parent c26cb9234f
commit cd04abcc8e
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/qemu/qemu_driver.c
View File

@ -1222,7 +1222,7 @@ qemudInitCpus(virConnectPtr conn,
const char *migrateFrom) { const char *migrateFrom) {
#if HAVE_SCHED_GETAFFINITY #if HAVE_SCHED_GETAFFINITY
cpu_set_t mask; cpu_set_t mask;
int i, maxcpu = QEMUD_CPUMASK_LEN; int i, hostcpus, maxcpu = QEMUD_CPUMASK_LEN;
virNodeInfo nodeinfo; virNodeInfo nodeinfo;
if (nodeGetInfo(conn, &nodeinfo) < 0) if (nodeGetInfo(conn, &nodeinfo) < 0)
@ -1230,8 +1230,9 @@ qemudInitCpus(virConnectPtr conn,
/* setaffinity fails if you set bits for CPUs which /* setaffinity fails if you set bits for CPUs which
* aren't present, so we have to limit ourselves */ * aren't present, so we have to limit ourselves */
if (maxcpu > nodeinfo.cpus) hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo);
maxcpu = nodeinfo.cpus; if (maxcpu > hostcpus)
maxcpu = hostcpus;
CPU_ZERO(&mask); CPU_ZERO(&mask);
if (vm->def->cpumask) { if (vm->def->cpumask) {
@ -3339,7 +3340,7 @@ qemudDomainPinVcpu(virDomainPtr dom,
struct qemud_driver *driver = dom->conn->privateData; struct qemud_driver *driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
cpu_set_t mask; cpu_set_t mask;
int i, maxcpu; int i, maxcpu, hostcpus;
virNodeInfo nodeinfo; virNodeInfo nodeinfo;
int ret = -1; int ret = -1;
@ -3371,13 +3372,14 @@ qemudDomainPinVcpu(virDomainPtr dom,
if (nodeGetInfo(dom->conn, &nodeinfo) < 0) if (nodeGetInfo(dom->conn, &nodeinfo) < 0)
goto cleanup; goto cleanup;
hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo);
maxcpu = maplen * 8; maxcpu = maplen * 8;
if (maxcpu > nodeinfo.cpus) if (maxcpu > hostcpus)
maxcpu = nodeinfo.cpus; maxcpu = hostcpus;
CPU_ZERO(&mask); CPU_ZERO(&mask);
for (i = 0 ; i < maxcpu ; i++) { for (i = 0 ; i < maxcpu ; i++) {
if ((cpumap[i/8] >> (i % 8)) & 1) if (VIR_CPU_USABLE(cpumap, maplen, 0, i))
CPU_SET(i, &mask); CPU_SET(i, &mask);
} }
@ -3409,7 +3411,7 @@ qemudDomainGetVcpus(virDomainPtr dom,
struct qemud_driver *driver = dom->conn->privateData; struct qemud_driver *driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
virNodeInfo nodeinfo; virNodeInfo nodeinfo;
int i, v, maxcpu; int i, v, maxcpu, hostcpus;
int ret = -1; int ret = -1;
qemuDriverLock(driver); qemuDriverLock(driver);
@ -3434,9 +3436,10 @@ qemudDomainGetVcpus(virDomainPtr dom,
if (nodeGetInfo(dom->conn, &nodeinfo) < 0) if (nodeGetInfo(dom->conn, &nodeinfo) < 0)
goto cleanup; goto cleanup;
hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo);
maxcpu = maplen * 8; maxcpu = maplen * 8;
if (maxcpu > nodeinfo.cpus) if (maxcpu > hostcpus)
maxcpu = nodeinfo.cpus; maxcpu = hostcpus;
/* Clamp to actual number of vcpus */ /* Clamp to actual number of vcpus */
if (maxinfo > vm->nvcpupids) if (maxinfo > vm->nvcpupids)