shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

virsh: Make cmdVersion() work with split daemon

Browse Source 
When virsh connects to a non-hypervisor daemon directly (e.g.
"nodedev:///system") and user executes 'version' they are met
with an error message. This is because cmdVersion() calls
virConnectGetVersion() which fails, hence the error.

The reason for virConnectGetVersion() fail is simple - it's
documented as:

  Get the version level of the Hypervisor running.

Well, there's no hypervisor in non-hypervisor daemons and thus it
doesn't make sense to provide an implementation in each driver's
virConnectDriver.hypervisorDriver table (just like we do for
other APIs, e.g. nodeConnectIsSecure()).

Given all of this, just make cmdVersion() deal with the error in
a non-fatal fashion.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2023-07-17 15:05:19 +02:00
parent 59d73ae768
commit f6e88f6113
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/virsh-host.c
View File

@ -1448,20 +1448,25 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED)
major, minor, rel); major, minor, rel);
if (virConnectGetVersion(priv->conn, &hvVersion) < 0) { if (virConnectGetVersion(priv->conn, &hvVersion) < 0) {
vshError(ctl, "%s", _("failed to get the hypervisor version")); if (last_error->code == VIR_ERR_NO_SUPPORT) {
return false; vshResetLibvirtError();
} } else {
if (hvVersion == 0) { vshError(ctl, "%s", _("failed to get the hypervisor version"));
vshPrint(ctl, return false;
_("Cannot extract running %1$s hypervisor version\n"), hvType); }
} else { } else {
major = hvVersion / 1000000; if (hvVersion == 0) {
hvVersion %= 1000000; vshPrint(ctl,
minor = hvVersion / 1000; _("Cannot extract running %1$s hypervisor version\n"), hvType);
rel = hvVersion % 1000; } else {
major = hvVersion / 1000000;
hvVersion %= 1000000;
minor = hvVersion / 1000;
rel = hvVersion % 1000;
vshPrint(ctl, _("Running hypervisor: %1$s %2$d.%3$d.%4$d\n"), vshPrint(ctl, _("Running hypervisor: %1$s %2$d.%3$d.%4$d\n"),
hvType, major, minor, rel); hvType, major, minor, rel);
}
} }
if (vshCommandOptBool(cmd, "daemon")) { if (vshCommandOptBool(cmd, "daemon")) {