External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-05 16:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Use virNodeGetCPUMap if possible

Browse Source 
Modified the places where virNodeGetInfo was used for the purpose
of obtaining the maximum node CPU number. Transparently falling
back to virNodeGetInfo in case of failure.
Wrote utility function vshNodeGetCPUCount to compute node CPU
number.

Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
This commit is contained in:
Viktor Mihajlovski 2012-11-13 13:54:39 +01:00 committed by Eric Blake
parent a0db65663c
commit 2bbe624e1d
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tools/virsh-domain.c
View File

@ -125,6 +125,27 @@ vshDomainVcpuStateToString(int state)
return N_("no state"); return N_("no state");
} }
/*
* Determine number of CPU nodes present by trying
* virNodeGetCPUMap and falling back to virNodeGetInfo
* if needed.
*/
static int
vshNodeGetCPUCount(virConnectPtr conn)
{
int ret;
virNodeInfo nodeinfo;
if ((ret = virNodeGetCPUMap(conn, NULL, NULL, 0)) < 0) {
/* fall back to nodeinfo */
vshResetLibvirtError();
if (virNodeGetInfo(conn, &nodeinfo) == 0) {
ret = VIR_NODEINFO_MAXCPUS(nodeinfo);
}
}
return ret;
}
/* /*
* "attach-device" command * "attach-device" command
*/ */
@ -4497,7 +4518,6 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd)
{ {
virDomainInfo info; virDomainInfo info;
virDomainPtr dom; virDomainPtr dom;
virNodeInfo nodeinfo;
virVcpuInfoPtr cpuinfo; virVcpuInfoPtr cpuinfo;
unsigned char *cpumaps; unsigned char *cpumaps;
int ncpus, maxcpu; int ncpus, maxcpu;
@ -4508,7 +4528,7 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd)
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
return false; return false;
if (virNodeGetInfo(ctl->conn, &nodeinfo) != 0) { if ((maxcpu = vshNodeGetCPUCount(ctl->conn)) < 0) {
virDomainFree(dom); virDomainFree(dom);
return false; return false;
} }
@ -4519,7 +4539,6 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd)
} }
cpuinfo = vshMalloc(ctl, sizeof(virVcpuInfo)*info.nrVirtCpu); cpuinfo = vshMalloc(ctl, sizeof(virVcpuInfo)*info.nrVirtCpu);
maxcpu = VIR_NODEINFO_MAXCPUS(nodeinfo);
cpumaplen = VIR_CPU_MAPLEN(maxcpu); cpumaplen = VIR_CPU_MAPLEN(maxcpu);
cpumaps = vshMalloc(ctl, info.nrVirtCpu * cpumaplen); cpumaps = vshMalloc(ctl, info.nrVirtCpu * cpumaplen);
@ -4645,7 +4664,6 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd)
{ {
virDomainInfo info; virDomainInfo info;
virDomainPtr dom; virDomainPtr dom;
virNodeInfo nodeinfo;
int vcpu = -1; int vcpu = -1;
const char *cpulist = NULL; const char *cpulist = NULL;
bool ret = true; bool ret = true;
@ -4695,7 +4713,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd)
return false; return false;
} }
if (virNodeGetInfo(ctl->conn, &nodeinfo) != 0) { if ((maxcpu = vshNodeGetCPUCount(ctl->conn)) < 0) {
virDomainFree(dom); virDomainFree(dom);
return false; return false;
} }
@ -4712,7 +4730,6 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd)
return false; return false;
} }
maxcpu = VIR_NODEINFO_MAXCPUS(nodeinfo);
cpumaplen = VIR_CPU_MAPLEN(maxcpu); cpumaplen = VIR_CPU_MAPLEN(maxcpu);
/* Query mode: show CPU affinity information then exit.*/ /* Query mode: show CPU affinity information then exit.*/
@ -4864,7 +4881,6 @@ static bool
cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd) cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd)
{ {
virDomainPtr dom; virDomainPtr dom;
virNodeInfo nodeinfo;
const char *cpulist = NULL; const char *cpulist = NULL;
bool ret = true; bool ret = true;
unsigned char *cpumap = NULL; unsigned char *cpumap = NULL;
@ -4905,12 +4921,11 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd)
} }
query = !cpulist; query = !cpulist;
if (virNodeGetInfo(ctl->conn, &nodeinfo) != 0) { if ((maxcpu = vshNodeGetCPUCount(ctl->conn)) < 0) {
virDomainFree(dom); virDomainFree(dom);
return false; return false;
} }
maxcpu = VIR_NODEINFO_MAXCPUS(nodeinfo);
cpumaplen = VIR_CPU_MAPLEN(maxcpu); cpumaplen = VIR_CPU_MAPLEN(maxcpu);
/* Query mode: show CPU affinity information then exit.*/ /* Query mode: show CPU affinity information then exit.*/