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

virsh: Add daemon version reporting

Browse Source 
'virsh version' might report against which version of libvirtd is
running.
This commit is contained in:
Michal Privoznik 2011-06-02 15:59:02 +02:00
parent 15743e94d5
commit f67f965077
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/virsh.c
View File

@ -8689,6 +8689,10 @@ static const vshCmdInfo info_version[] = {
{NULL, NULL} {NULL, NULL}
}; };
static const vshCmdOptDef opts_version[] = {
{"daemon", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("report daemon version too")},
{NULL, 0, 0, NULL}
};
static bool static bool
cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
@ -8698,6 +8702,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
unsigned long libVersion; unsigned long libVersion;
unsigned long includeVersion; unsigned long includeVersion;
unsigned long apiVersion; unsigned long apiVersion;
unsigned long daemonVersion;
int ret; int ret;
unsigned int major; unsigned int major;
unsigned int minor; unsigned int minor;
@ -8756,6 +8761,21 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
vshPrint(ctl, _("Running hypervisor: %s %d.%d.%d\n"), vshPrint(ctl, _("Running hypervisor: %s %d.%d.%d\n"),
hvType, major, minor, rel); hvType, major, minor, rel);
} }
if (vshCommandOptBool(cmd, "daemon")) {
ret = virConnectGetLibVersion(ctl->conn, &daemonVersion);
if (ret < 0) {
vshError(ctl, "%s", _("failed to get the daemon version"));
} else {
major = daemonVersion / 1000000;
daemonVersion %= 1000000;
minor = daemonVersion / 1000;
rel = daemonVersion % 1000;
vshPrint(ctl, _("Running against daemon: %d.%d.%d\n"),
major, minor, rel);
}
}
return true; return true;
} }
@ -11179,7 +11199,7 @@ static const vshCmdDef domManagementCmds[] = {
{"vcpucount", cmdVcpucount, opts_vcpucount, info_vcpucount, 0}, {"vcpucount", cmdVcpucount, opts_vcpucount, info_vcpucount, 0},
{"vcpuinfo", cmdVcpuinfo, opts_vcpuinfo, info_vcpuinfo, 0}, {"vcpuinfo", cmdVcpuinfo, opts_vcpuinfo, info_vcpuinfo, 0},
{"vcpupin", cmdVcpupin, opts_vcpupin, info_vcpupin, 0}, {"vcpupin", cmdVcpupin, opts_vcpupin, info_vcpupin, 0},
{"version", cmdVersion, NULL, info_version, 0}, {"version", cmdVersion, opts_version, info_version, 0},
{"vncdisplay", cmdVNCDisplay, opts_vncdisplay, info_vncdisplay, 0}, {"vncdisplay", cmdVNCDisplay, opts_vncdisplay, info_vncdisplay, 0},
{NULL, NULL, NULL, NULL, 0} {NULL, NULL, NULL, NULL, 0}
}; };