[virt-viewer][PATCH] cosmetic: rename waitvm to waitdom, according to its use

[Fabiano Fidêncio <fidencio@xxxxxxxxxx>]

--wait is used to wait for a domain to start, not to wait for a VM to
start.
---
 src/virt-viewer-main.c | 8 ++++----
 src/virt-viewer.c      | 8 ++++----
 src/virt-viewer.h      | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/virt-viewer-main.c b/src/virt-viewer-main.c
index 505b472..f0c66fa 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;
+    gboolean waitdom = FALSE;
     gboolean reconnect = FALSE;
     VirtViewer *viewer = NULL;
     char *base_name;
@@ -64,7 +64,7 @@ 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,
+        { "wait", 'w', 0, G_OPTION_ARG_NONE, &waitdom,
           N_("Wait for domain to start"), NULL },
         { "reconnect", 'r', 0, G_OPTION_ARG_NONE, &reconnect,
           N_("Reconnect to domain upon restart"), NULL },
@@ -108,12 +108,12 @@ int main(int argc, char **argv)
         goto cleanup;
     }
 
-    if (args == NULL && waitvm) {
+    if (args == NULL && waitdom) {
         g_printerr(_("\nNo DOMAIN-NAME|ID|UUID was specified for '--wait'\n\n"));
         goto cleanup;
     }
 
-    viewer = virt_viewer_new(uri, (args) ? args[0] : NULL, direct, attach, waitvm, reconnect);
+    viewer = virt_viewer_new(uri, (args) ? args[0] : NULL, direct, attach, waitdom, reconnect);
     if (viewer == NULL)
         goto cleanup;
 
diff --git a/src/virt-viewer.c b/src/virt-viewer.c
index 851c83d..7e619e6 100644
--- a/src/virt-viewer.c
+++ b/src/virt-viewer.c
@@ -55,7 +55,7 @@ struct _VirtViewerPrivate {
     virConnectPtr conn;
     virDomainPtr dom;
     char *domkey;
-    gboolean waitvm;
+    gboolean waitdom;
     gboolean reconnect;
     gboolean auth_cancelled;
     gint domain_event;
@@ -733,7 +733,7 @@ virt_viewer_initial_connect(VirtViewerApp *app, GError **error)
     virt_viewer_app_show_status(app, _("Finding guest domain"));
     dom = virt_viewer_lookup_domain(self);
     if (!dom) {
-        if (priv->waitvm) {
+        if (priv->waitdom) {
             virt_viewer_app_show_status(app, _("Waiting for guest domain to be created"));
             goto wait;
         } else {
@@ -985,7 +985,7 @@ virt_viewer_new(const char *uri,
                 const char *name,
                 gboolean direct,
                 gboolean attach,
-                gboolean waitvm,
+                gboolean waitdom,
                 gboolean reconnect)
 {
     VirtViewer *self;
@@ -1004,7 +1004,7 @@ virt_viewer_new(const char *uri,
     /* should probably be properties instead */
     priv->uri = g_strdup(uri);
     priv->domkey = g_strdup(name);
-    priv->waitvm = waitvm;
+    priv->waitdom = waitdom;
     priv->reconnect = reconnect;
 
     return self;
diff --git a/src/virt-viewer.h b/src/virt-viewer.h
index c962615..4ecda11 100644
--- a/src/virt-viewer.h
+++ b/src/virt-viewer.h
@@ -53,7 +53,7 @@ virt_viewer_new(const char *uri,
                 const char *name,
                 gboolean direct,
                 gboolean attach,
-                gboolean waitvm,
+                gboolean waitdom,
                 gboolean reconnect);
 
 G_END_DECLS
-- 
2.4.3

_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list