From: Jonathon Jongsma <jjongsma@redhat.com>
Date: Wed, 7 Jul 2021 21:29:29 +0000 (-0500)
Subject: virsh: allow nodedev-list --all --tree
X-Git-Tag: v7.6.0-rc1~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26136e3b86f5eaf1018252cee8c6ab7df24b0832;p=thirdparty%2Flibvirt.git

virsh: allow nodedev-list --all --tree

Allow the tree view with --all so that we can see all inactive mdevs in
a tree structure nested under their parent devices.

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Shalini Chellathurai Saroja <shalini@linux.ibm.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 8c2086b71f..5b1afe4601 100644
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -428,8 +428,8 @@ cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED)
         return false;
     }
 
-    if (tree && (cap_str || inactive || all)) {
-        vshError(ctl, "%s", _("Option --tree is incompatible with other options"));
+    if (tree && (cap_str || inactive)) {
+        vshError(ctl, "%s", _("Option --tree is incompatible with --cap and --inactive"));
         return false;
     }