Commit 271940223c2914bf63cbec00930ce46d6eef30ba which strived to add support to use '--uuid' in the table output of 'virsh list' went too far and also allowed the default table view to be enabled when just '--uuid' is specified. This broke the script-friendly output which previously had this format: $ virsh list --uuid b6d03c07-86f8-4a57-8719-172a5d0359bb to this script-unfriendly output: $ virsh list --uuid Id Name State UUID ------------------------------------------------------------- 1 ha running b6d03c07-86f8-4a57-8719-172a5d0359bb Using the human friendly output will still be possible by using: $ virsh list --table --uuid Fixes: 271940223c2914bf63cbec00930ce46d6eef30ba Closes: https://gitlab.com/libvirt/libvirt/-/issues/666 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tools/virsh-domain-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 87efd86a69..9ee9090c11 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1857,7 +1857,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS("table", "name"); VSH_EXCLUSIVE_OPTIONS("table", "id"); - if (!optName && !optID) + if (!optUUID && !optName && !optID) optTable = true; if (!(list = virshDomainListCollect(ctl, flags))) -- 2.46.0

Add a bunch of tests verifying that script-friendly options of certain commands are not changed incompatibly thus potentially breaking user scripts. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- This sample represents what 'libvirt-guests' uses and what I thought off. Feel free to suggest more. tests/virshtest.c | 2 ++ .../virshtestdata/script-friendly-options.in | 11 +++++++ .../virshtestdata/script-friendly-options.out | 33 +++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 tests/virshtestdata/script-friendly-options.in create mode 100644 tests/virshtestdata/script-friendly-options.out diff --git a/tests/virshtest.c b/tests/virshtest.c index b86c39285a..a7f62df563 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -352,6 +352,8 @@ mymain(void) "checkpoint-create test --redefine checkpoint-c2.xml ;" "checkpoint-info test c2"); + DO_TEST_SCRIPT("script-friendly-options", NULL, VIRSH_CUSTOM); + /* completion doesn't work on non-readline builds */ need_readline = true; diff --git a/tests/virshtestdata/script-friendly-options.in b/tests/virshtestdata/script-friendly-options.in new file mode 100644 index 0000000000..08d2a87474 --- /dev/null +++ b/tests/virshtestdata/script-friendly-options.in @@ -0,0 +1,11 @@ +echo "Following script-friendly outputs of commands must not change" +list --uuid; +list --uuid --all; +list --name; +list --name --all; +list --uuid --name --all; +domstate fv0 +domstate fv0 --reason +domname ef861801-45b9-11cb-88e3-afbfe5370493 +domid fv0 +domstats fv0 diff --git a/tests/virshtestdata/script-friendly-options.out b/tests/virshtestdata/script-friendly-options.out new file mode 100644 index 0000000000..2ab1ba0e71 --- /dev/null +++ b/tests/virshtestdata/script-friendly-options.out @@ -0,0 +1,33 @@ +Following script-friendly outputs of commands must not change +4dea22b3-1d52-d8f3-2516-782e98ab3fa0 +ef861801-45b9-11cb-88e3-afbfe5370493 +08721f99-3d1d-4aec-96eb-97803297bb36 + +4dea22b3-1d52-d8f3-2516-782e98ab3fa0 +ef861801-45b9-11cb-88e3-afbfe5370493 +08721f99-3d1d-4aec-96eb-97803297bb36 + +fv0 +fc4 +fc5 + +fv0 +fc4 +fc5 + +4dea22b3-1d52-d8f3-2516-782e98ab3fa0 fv0 +ef861801-45b9-11cb-88e3-afbfe5370493 fc4 +08721f99-3d1d-4aec-96eb-97803297bb36 fc5 + +running + +running (unknown) + +fc4 + +1 + +Domain: 'fv0' + state.state=1 + state.reason=0 + -- 2.46.0