pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2026-01-09 22:25:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "virt-viewer-main: Require domain name as argument for '--wait'"

Browse Source 
This reverts commit a830275344.

Commit a830275344 required the domain
name to be placed just after the '--wait' option. It broke the
command line api, because running 'virt-viewer $vm --wait' was considered
as the error.

Related: rhbz#1209398, rhbz#1211573
This commit is contained in:
Pavel Grunt 2015-04-14 16:22:37 +02:00
parent ea42d03027
commit d71c2a673d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/virt-viewer-main.c
View File

@ -50,7 +50,7 @@ int main(int argc, char **argv)
gchar **args = NULL;
gboolean direct = FALSE;
gboolean attach = FALSE;
char *waitvm = NULL;
gboolean waitvm = FALSE;
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_STRING, &waitvm,
N_("Wait for domain to start"), "DOMAIN-NAME|ID|UUID" },
{ "wait", 'w', 0, G_OPTION_ARG_NONE, &waitvm,
N_("Wait for domain to start"), NULL },
{ "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] : waitvm, direct, attach, waitvm != NULL, reconnect);
viewer = virt_viewer_new(uri, (args) ? args[0] : NULL, direct, attach, waitvm, reconnect);
if (viewer == NULL)
goto cleanup;
@ -129,7 +129,6 @@ 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);