virsh: Add domain uuid completion to domname command

Signed-off-by: Lin Ma <lma@suse.de>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c
index 8ffb6661a25e49cb9ba1dcd1da252a362ad6505f..e63e5686ac485d12a7d4af2a1aa3e5f99e26d1f3 100644 (file)
--- a/tools/virsh-completer-domain.c
+++ b/tools/virsh-completer-domain.c
@@ -80,6 +80,58 @@ virshDomainNameCompleter(vshControl *ctl,
 }
 
 
+char **
+virshDomainUUIDCompleter(vshControl *ctl,
+                         const vshCmd *cmd G_GNUC_UNUSED,
+                         unsigned int flags)
+{
+    virshControlPtr priv = ctl->privData;
+    virDomainPtr *domains = NULL;
+    int ndomains = 0;
+    size_t i = 0;
+    char **ret = NULL;
+    VIR_AUTOSTRINGLIST tmp = NULL;
+
+    virCheckFlags(VIR_CONNECT_LIST_DOMAINS_ACTIVE |
+                  VIR_CONNECT_LIST_DOMAINS_INACTIVE |
+                  VIR_CONNECT_LIST_DOMAINS_OTHER |
+                  VIR_CONNECT_LIST_DOMAINS_PAUSED |
+                  VIR_CONNECT_LIST_DOMAINS_PERSISTENT |
+                  VIR_CONNECT_LIST_DOMAINS_RUNNING |
+                  VIR_CONNECT_LIST_DOMAINS_SHUTOFF |
+                  VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE |
+                  VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT |
+                  VIR_CONNECT_LIST_DOMAINS_HAS_CHECKPOINT,
+                  NULL);
+
+    if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
+        return NULL;
+
+    if ((ndomains = virConnectListAllDomains(priv->conn, &domains, flags)) < 0)
+        return NULL;
+
+    if (VIR_ALLOC_N(tmp, ndomains + 1) < 0)
+        goto cleanup;
+
+    for (i = 0; i < ndomains; i++) {
+        char uuid[VIR_UUID_STRING_BUFLEN];
+
+        if (virDomainGetUUIDString(domains[i], uuid) < 0)
+            goto cleanup;
+
+        tmp[i] = g_strdup(uuid);
+    }
+
+    ret = g_steal_pointer(&tmp);
+
+ cleanup:
+    for (i = 0; i < ndomains; i++)
+        virshDomainFree(domains[i]);
+    VIR_FREE(domains);
+    return ret;
+}
+
+
 char **
 virshDomainInterfaceCompleter(vshControl *ctl,
                               const vshCmd *cmd,

diff --git a/tools/virsh-completer-domain.h b/tools/virsh-completer-domain.h
index e3375c3c650e1eaede2740577dd52823a640ebcb..9a8b962cb756933c6f735e917b7982529cfc9cf0 100644 (file)
--- a/tools/virsh-completer-domain.h
+++ b/tools/virsh-completer-domain.h
@@ -70,3 +70,7 @@ char ** virshDomainPerfEnableCompleter(vshControl *ctl,
 char ** virshDomainPerfDisableCompleter(vshControl *ctl,
                                         const vshCmd *cmd,
                                         unsigned int flags);
+
+char ** virshDomainUUIDCompleter(vshControl *ctl,
+                                 const vshCmd *cmd,
+                                 unsigned int flags);

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 1b4040080e51185443aeede02ef961ce798fd4ee..48958d6974a4519c00528fd3098bc6e6ad62b005 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -10369,7 +10369,12 @@ static const vshCmdInfo info_domname[] = {
 };
 
 static const vshCmdOptDef opts_domname[] = {
-    VIRSH_COMMON_OPT_DOMAIN(N_("domain id or uuid"), 0),
+    {.name = "domain",
+     .type = VSH_OT_DATA,
+     .flags = VSH_OFLAG_REQ,
+     .completer = virshDomainUUIDCompleter,
+     .help = N_("domain id or uuid")
+    },
     {.name = NULL}
 };