[virt-tools-list] [PATCH virt-viewer] virt-viewer-main: Require domain name as argument for '--wait'

[Pavel Grunt]

> 
> On Tue, Apr 7, 2015 at 11:06 AM, Pavel Grunt <pgrunt at redhat.com>
> wrote:
> > Waiting should be possible only when the domain name is specified.
> > ---
> >  src/virt-viewer-main.c | 9 +++++----
> >  1 file changed, 5 insertions(+), 4 deletions(-)
> >
> > diff --git a/src/virt-viewer-main.c b/src/virt-viewer-main.c
> > index 291af42..75de7c6 100644
> > --- a/src/virt-viewer-main.c
> > +++ b/src/virt-viewer-main.c
> > @@ -50,7 +50,7 @@ int main(int argc, char **argv)
> >      gchar **args = NULL;
> >      gboolean direct = FALSE;
> >      gboolean attach = FALSE;
> > -    gboolean waitvm = FALSE;
> > +    char *waitvm = NULL;
> >      gboolean reconnect = FALSE;
> >      VirtViewer *viewer = NULL;
> >      char *base_name;
> > @@ -64,8 +64,8 @@ int main(int argc, char **argv)
> >            N_("Attach to the local display using libvirt"), NULL },
> >          { "connect", 'c', 0, G_OPTION_ARG_STRING, &uri,
> >            N_("Connect to hypervisor"), "URI"},
> > -        { "wait", 'w', 0, G_OPTION_ARG_NONE, &waitvm,
> > -          N_("Wait for domain to start"), NULL },
> > +        { "wait", 'w', 0, G_OPTION_ARG_STRING, &waitvm,
> > +          N_("Wait for domain to start"), "DOMAIN-NAME|ID|UUID" },
> >          { "reconnect", 'r', 0, G_OPTION_ARG_NONE, &reconnect,
> >            N_("Reconnect to domain upon restart"), NULL },
> >          { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY,
> >          &args,
> > @@ -108,7 +108,7 @@ int main(int argc, char **argv)
> >          goto cleanup;
> >      }
> >
> > -    viewer = virt_viewer_new(uri, (args) ? args[0] : NULL, direct,
> > attach, waitvm, reconnect);
> > +    viewer = virt_viewer_new(uri, (args) ? args[0] : waitvm,
> > direct, attach, waitvm != NULL, reconnect);
> >      if (viewer == NULL)
> >          goto cleanup;
> >
> > @@ -129,6 +129,7 @@ int main(int argc, char **argv)
> >      if (viewer)
> >          g_object_unref(viewer);
> >      g_free(uri);
> > +    g_free(waitvm);
> >      g_strfreev(args);
> >      g_free(help_msg);
> >      g_clear_error(&error);
> > --
> > 2.3.4
> >
> > _______________________________________________
> > virt-tools-list mailing list
> > virt-tools-list at redhat.com
> > https://www.redhat.com/mailman/listinfo/virt-tools-list
> 
> 
> ACK!
> (I'm not going to push yet, as we have discussed and a bug it will be
> opened ... I'll just amend the bug reference before pushing it)
> 
> Best Regards,
> --
> Fabiano Fidêncio
> 

Thank you, there is the bug: https://bugzilla.redhat.com/show_bug.cgi?id=1209398

Pavel