Some fixes and improvement for virsh completion in non interactive mode

[libvirt] [PATCH v2 09/12] vshReadlineOptionsGenerator: Add already provided VSH_OT_ARGV options to list

Posted by Lin Ma 7 years ago

It's helpful for users while they type certain kind of VSH_OT_ARGV options.
e.g.

$ virsh domstats --domain sles12sp3 --d<TAB>

Signed-off-by: Lin Ma <lma@suse.com>
---
 tools/vsh.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/vsh.c b/tools/vsh.c
index e45bb0d825..279d1b56e6 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -2685,7 +2685,7 @@ vshReadlineOptionsGenerator(const char *text,
         }
 
         while (opt) {
-            if (STREQ(opt->def->name, name)) {
+            if (STREQ(opt->def->name, name) && opt->def->type != VSH_OT_ARGV) {
                 exists = true;
                 break;
             }
-- 
2.15.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH v2 09/12] vshReadlineOptionsGenerator: Add already provided VSH_OT_ARGV options to list

Posted by Michal Privoznik 7 years ago

On 05/08/2018 04:20 PM, Lin Ma wrote:
> It's helpful for users while they type certain kind of VSH_OT_ARGV options.
> e.g.
> 
> $ virsh domstats --domain sles12sp3 --d<TAB>
> 
> Signed-off-by: Lin Ma <lma@suse.com>
> ---
>  tools/vsh.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/vsh.c b/tools/vsh.c
> index e45bb0d825..279d1b56e6 100644
> --- a/tools/vsh.c
> +++ b/tools/vsh.c
> @@ -2685,7 +2685,7 @@ vshReadlineOptionsGenerator(const char *text,
>          }
>  
>          while (opt) {
> -            if (STREQ(opt->def->name, name)) {
> +            if (STREQ(opt->def->name, name) && opt->def->type != VSH_OT_ARGV) {
>                  exists = true;
>                  break;
>              }
> 

Okay, with this change the 06/12 patch makes sense. As pointed out there
small reordering is required.

ACK

Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list