[libvirt] [ [PATCH v3 0/8] virsh completion for event, secret-event, pool-event and nodedev-event
v2 -> v3: Most of patches in original v2 patchset were pushed, only 2 patches left, So create a new patchset for including the 2 patches and 6 new completion patches which about secret-event, pool-event and nodedev-event. (Borrowed code & idea from Michal Privoznik for these patches design) Lin Ma (8): virsh-secret: Rename vshEventCallback to vshSecretEventCallback virsh: Add event name completion to 'secret-event' command virsh: Move vshEventCallback structure definition to virsh-domain.h virsh: Add event name completion to 'event' command virsh-pool: Rename vshEventCallback to vshPoolEventCallback virsh: Add event name completion to 'pool-event' command virsh-nodedev: Rename vshEventCallback to vshNodedevEventCallback virsh: Add event name completion to 'nodedev-event' command tools/virsh-completer.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 15 ++++++ tools/virsh-domain.c | 9 +--- tools/virsh-domain.h | 8 ++++ tools/virsh-nodedev.c | 19 +++----- tools/virsh-nodedev.h | 8 ++++ tools/virsh-pool.c | 19 +++----- tools/virsh-pool.h | 8 ++++ tools/virsh-secret.c | 18 +++----- tools/virsh-secret.h | 8 ++++ 10 files changed, 189 insertions(+), 42 deletions(-) -- 2.16.2
The next patch will use it in virsh-completer.c for returning the name list of secret events. The patch code originally authored by Michal Privoznik, Please refer to https://www.redhat.com/archives/libvir-list/2018-May/msg01022.html I splitted it to 2 patches with tiny change. Signed-off-by: Lin Ma <lma@suse.com> --- tools/virsh-secret.c | 17 ++++++----------- tools/virsh-secret.h | 8 ++++++++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 9e4ec61a88..07bc54d1bf 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -571,18 +571,12 @@ virshSecretEventToString(int event) return str ? _(str) : _("unknown"); } -struct vshEventCallback { - const char *name; - virConnectSecretEventGenericCallback cb; -}; -typedef struct vshEventCallback vshEventCallback; - struct virshSecretEventData { vshControl *ctl; bool loop; bool timestamp; int count; - vshEventCallback *cb; + vshSecretEventCallback *cb; }; typedef struct virshSecretEventData virshSecretEventData; @@ -652,11 +646,12 @@ vshEventGenericPrint(virConnectPtr conn ATTRIBUTE_UNUSED, vshEventDone(data->ctl); } -static vshEventCallback vshEventCallbacks[] = { +vshSecretEventCallback vshSecretEventCallbacks[] = { { "lifecycle", VIR_SECRET_EVENT_CALLBACK(vshEventLifecyclePrint), }, { "value-changed", vshEventGenericPrint, }, }; +verify(VIR_SECRET_EVENT_ID_LAST == ARRAY_CARDINALITY(vshSecretEventCallbacks)); static const vshCmdInfo info_secret_event[] = { {.name = "help", @@ -713,7 +708,7 @@ cmdSecretEvent(vshControl *ctl, const vshCmd *cmd) size_t i; for (i = 0; i < VIR_SECRET_EVENT_ID_LAST; i++) - vshPrint(ctl, "%s\n", vshEventCallbacks[i].name); + vshPrint(ctl, "%s\n", vshSecretEventCallbacks[i].name); return true; } @@ -724,7 +719,7 @@ cmdSecretEvent(vshControl *ctl, const vshCmd *cmd) return false; } for (event = 0; event < VIR_SECRET_EVENT_ID_LAST; event++) - if (STREQ(eventName, vshEventCallbacks[event].name)) + if (STREQ(eventName, vshSecretEventCallbacks[event].name)) break; if (event == VIR_SECRET_EVENT_ID_LAST) { vshError(ctl, _("unknown event type %s"), eventName); @@ -735,7 +730,7 @@ cmdSecretEvent(vshControl *ctl, const vshCmd *cmd) data.loop = vshCommandOptBool(cmd, "loop"); data.timestamp = vshCommandOptBool(cmd, "timestamp"); data.count = 0; - data.cb = &vshEventCallbacks[event]; + data.cb = &vshSecretEventCallbacks[event]; if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0) return false; diff --git a/tools/virsh-secret.h b/tools/virsh-secret.h index dda22b021e..c70a2b5c75 100644 --- a/tools/virsh-secret.h +++ b/tools/virsh-secret.h @@ -28,6 +28,14 @@ # include "virsh.h" +struct vshSecretEventCallback { + const char *name; + virConnectSecretEventGenericCallback cb; +}; +typedef struct vshSecretEventCallback vshSecretEventCallback; + +extern vshSecretEventCallback vshSecretEventCallbacks[]; + extern const vshCmdDef secretCmds[]; #endif /* VIRSH_SECRET_H */ -- 2.16.2
On 05/23/2018 08:32 AM, Lin Ma wrote:
The next patch will use it in virsh-completer.c for returning the name list of secret events.
The patch code originally authored by Michal Privoznik, Please refer to https://www.redhat.com/archives/libvir-list/2018-May/msg01022.html
I splitted it to 2 patches with tiny change.
Signed-off-by: Lin Ma <lma@suse.com> --- tools/virsh-secret.c | 17 ++++++----------- tools/virsh-secret.h | 8 ++++++++ 2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 9e4ec61a88..07bc54d1bf 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -571,18 +571,12 @@ virshSecretEventToString(int event) return str ? _(str) : _("unknown"); }
-struct vshEventCallback { - const char *name; - virConnectSecretEventGenericCallback cb; -}; -typedef struct vshEventCallback vshEventCallback; - struct virshSecretEventData { vshControl *ctl; bool loop; bool timestamp; int count; - vshEventCallback *cb; + vshSecretEventCallback *cb; }; typedef struct virshSecretEventData virshSecretEventData;
@@ -652,11 +646,12 @@ vshEventGenericPrint(virConnectPtr conn ATTRIBUTE_UNUSED, vshEventDone(data->ctl); }
-static vshEventCallback vshEventCallbacks[] = { +vshSecretEventCallback vshSecretEventCallbacks[] = {
Since you're renaming this, it should be virshSecret... because it's related to virsh, not vsh. Michal
The patch code originally authored by Michal Privoznik, Please refer to https://www.redhat.com/archives/libvir-list/2018-May/msg01022.html Signed-off-by: Lin Ma <lma@suse.com> --- tools/virsh-completer.c | 27 +++++++++++++++++++++++++++ tools/virsh-completer.h | 4 ++++ tools/virsh-secret.c | 1 + 3 files changed, 32 insertions(+) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 1435d1d4c6..b402fd22c3 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -26,6 +26,7 @@ #include "virsh.h" #include "virsh-pool.h" #include "virsh-util.h" +#include "virsh-secret.h" #include "internal.h" #include "virutil.h" #include "viralloc.h" @@ -649,3 +650,29 @@ virshAllocpagesPagesizeCompleter(vshControl *ctl, VIR_FREE(ret); goto cleanup; } + + +char ** +virshSecretEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + size_t i; + char **ret = NULL; + + virCheckFlags(0, NULL); + + if (VIR_ALLOC_N(ret, VIR_SECRET_EVENT_ID_LAST) < 0) + goto error; + + for (i = 0; i < VIR_SECRET_EVENT_ID_LAST; i++) { + if (VIR_STRDUP(ret[i], vshSecretEventCallbacks[i].name) < 0) + goto error; + } + + return ret; + + error: + virStringListFree(ret); + return NULL; +} diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index c7b181879e..c662267882 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -78,4 +78,8 @@ char ** virshAllocpagesPagesizeCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); +char ** virshSecretEventNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + #endif diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 07bc54d1bf..ba0210e765 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -671,6 +671,7 @@ static const vshCmdOptDef opts_secret_event[] = { }, {.name = "event", .type = VSH_OT_STRING, + .completer = virshSecretEventNameCompleter, .help = N_("which event type to wait for") }, {.name = "loop", -- 2.16.2
The next patch will use it in virsh-completer.c for returning the strings of domain event name. Signed-off-by: Lin Ma <lma@suse.com> --- tools/virsh-domain.c | 8 +------- tools/virsh-domain.h | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index cfbbf5a7bc..347c744bc9 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12832,12 +12832,6 @@ virshDomainEventTrayChangeToString(int reason) return str ? _(str) : _("unknown"); } -struct vshEventCallback { - const char *name; - virConnectDomainEventGenericCallback cb; -}; -typedef struct vshEventCallback vshEventCallback; - struct virshDomEventData { vshControl *ctl; bool loop; @@ -13278,7 +13272,7 @@ virshEventBlockThresholdPrint(virConnectPtr conn ATTRIBUTE_UNUSED, } -static vshEventCallback vshEventCallbacks[] = { +vshEventCallback vshEventCallbacks[] = { { "lifecycle", VIR_DOMAIN_EVENT_CALLBACK(virshEventLifecyclePrint), }, { "reboot", virshEventGenericPrint, }, diff --git a/tools/virsh-domain.h b/tools/virsh-domain.h index 3f9d12a5ff..e8e5611244 100644 --- a/tools/virsh-domain.h +++ b/tools/virsh-domain.h @@ -28,6 +28,14 @@ # include "virsh.h" +struct vshEventCallback { + const char *name; + virConnectDomainEventGenericCallback cb; +}; +typedef struct vshEventCallback vshEventCallback; + +extern vshEventCallback vshEventCallbacks[]; + extern const vshCmdDef domManagementCmds[]; #endif /* VIRSH_DOMAIN_H */ -- 2.16.2
On 05/23/2018 08:32 AM, Lin Ma wrote:
The next patch will use it in virsh-completer.c for returning the strings of domain event name.
Signed-off-by: Lin Ma <lma@suse.com> --- tools/virsh-domain.c | 8 +------- tools/virsh-domain.h | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index cfbbf5a7bc..347c744bc9 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12832,12 +12832,6 @@ virshDomainEventTrayChangeToString(int reason) return str ? _(str) : _("unknown"); }
-struct vshEventCallback { - const char *name; - virConnectDomainEventGenericCallback cb; -}; -typedef struct vshEventCallback vshEventCallback; - struct virshDomEventData { vshControl *ctl; bool loop; @@ -13278,7 +13272,7 @@ virshEventBlockThresholdPrint(virConnectPtr conn ATTRIBUTE_UNUSED, }
-static vshEventCallback vshEventCallbacks[] = { +vshEventCallback vshEventCallbacks[] = { { "lifecycle", VIR_DOMAIN_EVENT_CALLBACK(virshEventLifecyclePrint), }, { "reboot", virshEventGenericPrint, }, diff --git a/tools/virsh-domain.h b/tools/virsh-domain.h index 3f9d12a5ff..e8e5611244 100644 --- a/tools/virsh-domain.h +++ b/tools/virsh-domain.h @@ -28,6 +28,14 @@
# include "virsh.h"
+struct vshEventCallback { + const char *name; + virConnectDomainEventGenericCallback cb; +}; +typedef struct vshEventCallback vshEventCallback;
This should be virshDomainEventCallback because: a) it's related to virsh, not vsh b) it's related to Domain not some generic object Michal
Signed-off-by: Lin Ma <lma@suse.com> --- tools/virsh-completer.c | 31 +++++++++++++++++++++++++++++++ tools/virsh-completer.h | 3 +++ tools/virsh-domain.c | 1 + 3 files changed, 35 insertions(+) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index b402fd22c3..c0c3c5571a 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -23,6 +23,7 @@ #include <config.h> #include "virsh-completer.h" +#include "virsh-domain.h" #include "virsh.h" #include "virsh-pool.h" #include "virsh-util.h" @@ -676,3 +677,33 @@ virshSecretEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, virStringListFree(ret); return NULL; } + + +char ** +virshEventNameCompleter(vshControl *ctl, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virshControlPtr priv = ctl->privData; + size_t i = 0; + char **ret = NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + return NULL; + + if (VIR_ALLOC_N(ret, VIR_DOMAIN_EVENT_ID_LAST + 1) < 0) + goto error; + + for (i = 0; i < VIR_DOMAIN_EVENT_ID_LAST; i++) { + if (VIR_STRDUP(ret[i], vshEventCallbacks[i].name) < 0) + goto error; + } + + return ret; + + error: + virStringListFree(ret); + return NULL; +} diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index c662267882..9f8dc3dfa8 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -73,6 +73,9 @@ char ** virshSecretUUIDCompleter(vshControl *ctl, char ** virshSnapshotNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); +char ** virshEventNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); char ** virshAllocpagesPagesizeCompleter(vshControl *ctl, const vshCmd *cmd, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 347c744bc9..4af7aa2155 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -13339,6 +13339,7 @@ static const vshCmdOptDef opts_event[] = { 0), {.name = "event", .type = VSH_OT_STRING, + .completer = virshEventNameCompleter, .help = N_("which event type to wait for") }, {.name = "all", -- 2.16.2
On 05/23/2018 08:32 AM, Lin Ma wrote:
Signed-off-by: Lin Ma <lma@suse.com> --- tools/virsh-completer.c | 31 +++++++++++++++++++++++++++++++ tools/virsh-completer.h | 3 +++ tools/virsh-domain.c | 1 + 3 files changed, 35 insertions(+)
diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index b402fd22c3..c0c3c5571a 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -23,6 +23,7 @@ #include <config.h>
#include "virsh-completer.h" +#include "virsh-domain.h" #include "virsh.h" #include "virsh-pool.h" #include "virsh-util.h" @@ -676,3 +677,33 @@ virshSecretEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, virStringListFree(ret); return NULL; } + + +char ** +virshEventNameCompleter(vshControl *ctl, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virshControlPtr priv = ctl->privData; + size_t i = 0; + char **ret = NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + return NULL;
There is no need for connection.
+ + if (VIR_ALLOC_N(ret, VIR_DOMAIN_EVENT_ID_LAST + 1) < 0) + goto error; + + for (i = 0; i < VIR_DOMAIN_EVENT_ID_LAST; i++) { + if (VIR_STRDUP(ret[i], vshEventCallbacks[i].name) < 0) + goto error; + } + + return ret; + + error: + virStringListFree(ret); + return NULL; +}
Michal
The next patch will use it in virsh-completer.c for returning the name list of pool events. Signed-off-by: Lin Ma <lma@suse.com> --- tools/virsh-pool.c | 18 ++++++------------ tools/virsh-pool.h | 8 ++++++++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 36bf8d9faa..f0544d2e2d 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -1999,18 +1999,12 @@ virshPoolEventToString(int event) return str ? _(str) : _("unknown"); } -struct vshEventCallback { - const char *name; - virConnectStoragePoolEventGenericCallback cb; -}; -typedef struct vshEventCallback vshEventCallback; - struct virshPoolEventData { vshControl *ctl; bool loop; bool timestamp; int count; - vshEventCallback *cb; + vshPoolEventCallback *cb; }; typedef struct virshPoolEventData virshPoolEventData; @@ -2079,12 +2073,12 @@ vshEventGenericPrint(virConnectPtr conn ATTRIBUTE_UNUSED, vshEventDone(data->ctl); } -static vshEventCallback vshEventCallbacks[] = { +vshPoolEventCallback vshPoolEventCallbacks[] = { { "lifecycle", VIR_STORAGE_POOL_EVENT_CALLBACK(vshEventLifecyclePrint), }, { "refresh", vshEventGenericPrint, } }; -verify(VIR_STORAGE_POOL_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); +verify(VIR_STORAGE_POOL_EVENT_ID_LAST == ARRAY_CARDINALITY(vshPoolEventCallbacks)); static const vshCmdInfo info_pool_event[] = { @@ -2141,7 +2135,7 @@ cmdPoolEvent(vshControl *ctl, const vshCmd *cmd) size_t i; for (i = 0; i < VIR_STORAGE_POOL_EVENT_ID_LAST; i++) - vshPrint(ctl, "%s\n", vshEventCallbacks[i].name); + vshPrint(ctl, "%s\n", vshPoolEventCallbacks[i].name); return true; } @@ -2153,7 +2147,7 @@ cmdPoolEvent(vshControl *ctl, const vshCmd *cmd) } for (event = 0; event < VIR_STORAGE_POOL_EVENT_ID_LAST; event++) - if (STREQ(eventName, vshEventCallbacks[event].name)) + if (STREQ(eventName, vshPoolEventCallbacks[event].name)) break; if (event == VIR_STORAGE_POOL_EVENT_ID_LAST) { vshError(ctl, _("unknown event type %s"), eventName); @@ -2164,7 +2158,7 @@ cmdPoolEvent(vshControl *ctl, const vshCmd *cmd) data.loop = vshCommandOptBool(cmd, "loop"); data.timestamp = vshCommandOptBool(cmd, "timestamp"); data.count = 0; - data.cb = &vshEventCallbacks[event]; + data.cb = &vshPoolEventCallbacks[event]; if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0) return false; diff --git a/tools/virsh-pool.h b/tools/virsh-pool.h index 5f2671ae63..1148d7cebb 100644 --- a/tools/virsh-pool.h +++ b/tools/virsh-pool.h @@ -37,6 +37,14 @@ virshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, virshCommandOptPoolBy(_ctl, _cmd, _optname, _name, \ VIRSH_BYUUID | VIRSH_BYNAME) +struct vshPoolEventCallback { + const char *name; + virConnectStoragePoolEventGenericCallback cb; +}; +typedef struct vshPoolEventCallback vshPoolEventCallback; + +extern vshPoolEventCallback vshPoolEventCallbacks[]; + extern const vshCmdDef storagePoolCmds[]; #endif /* VIRSH_POOL_H */ -- 2.16.2
Signed-off-by: Lin Ma <lma@suse.com> --- tools/virsh-completer.c | 30 ++++++++++++++++++++++++++++++ tools/virsh-completer.h | 4 ++++ tools/virsh-pool.c | 1 + 3 files changed, 35 insertions(+) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index c0c3c5571a..1fab758e12 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -707,3 +707,33 @@ virshEventNameCompleter(vshControl *ctl, virStringListFree(ret); return NULL; } + + +char ** +virshPoolEventNameCompleter(vshControl *ctl, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virshControlPtr priv = ctl->privData; + size_t i = 0; + char **ret = NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + return NULL; + + if (VIR_ALLOC_N(ret, VIR_STORAGE_POOL_EVENT_ID_LAST) < 0) + goto error; + + for (i = 0; i < VIR_STORAGE_POOL_EVENT_ID_LAST; i++) { + if (VIR_STRDUP(ret[i], vshPoolEventCallbacks[i].name) < 0) + goto error; + } + + return ret; + + error: + virStringListFree(ret); + return NULL; +} diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index 9f8dc3dfa8..76fa31cb47 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -85,4 +85,8 @@ char ** virshSecretEventNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); +char ** virshPoolEventNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + #endif diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index f0544d2e2d..5f59e35894 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -2098,6 +2098,7 @@ static const vshCmdOptDef opts_pool_event[] = { }, {.name = "event", .type = VSH_OT_STRING, + .completer = virshPoolEventNameCompleter, .help = N_("which event type to wait for") }, {.name = "loop", -- 2.16.2
The next patch will use it in virsh-completer.c for returning the name list of nodedev events. Signed-off-by: Lin Ma <lma@suse.com> --- tools/virsh-nodedev.c | 18 ++++++------------ tools/virsh-nodedev.h | 8 ++++++++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index d25fe0e09b..66cf46c22f 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -773,18 +773,12 @@ virshNodeDeviceEventToString(int event) return str ? _(str) : _("unknown"); } -struct vshEventCallback { - const char *name; - virConnectNodeDeviceEventGenericCallback cb; -}; -typedef struct vshEventCallback vshEventCallback; - struct virshNodeDeviceEventData { vshControl *ctl; bool loop; bool timestamp; int count; - vshEventCallback *cb; + vshNodedevEventCallback *cb; }; typedef struct virshNodeDeviceEventData virshNodeDeviceEventData; @@ -850,12 +844,12 @@ vshEventGenericPrint(virConnectPtr conn ATTRIBUTE_UNUSED, vshEventDone(data->ctl); } -static vshEventCallback vshEventCallbacks[] = { +vshNodedevEventCallback vshNodedevEventCallbacks[] = { { "lifecycle", VIR_NODE_DEVICE_EVENT_CALLBACK(vshEventLifecyclePrint), }, { "update", vshEventGenericPrint, } }; -verify(VIR_NODE_DEVICE_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); +verify(VIR_NODE_DEVICE_EVENT_ID_LAST == ARRAY_CARDINALITY(vshNodedevEventCallbacks)); static const vshCmdInfo info_node_device_event[] = { @@ -914,7 +908,7 @@ cmdNodeDeviceEvent(vshControl *ctl, const vshCmd *cmd) size_t i; for (i = 0; i < VIR_NODE_DEVICE_EVENT_ID_LAST; i++) - vshPrint(ctl, "%s\n", vshEventCallbacks[i].name); + vshPrint(ctl, "%s\n", vshNodedevEventCallbacks[i].name); return true; } @@ -926,7 +920,7 @@ cmdNodeDeviceEvent(vshControl *ctl, const vshCmd *cmd) } for (event = 0; event < VIR_NODE_DEVICE_EVENT_ID_LAST; event++) - if (STREQ(eventName, vshEventCallbacks[event].name)) + if (STREQ(eventName, vshNodedevEventCallbacks[event].name)) break; if (event == VIR_NODE_DEVICE_EVENT_ID_LAST) { vshError(ctl, _("unknown event type %s"), eventName); @@ -937,7 +931,7 @@ cmdNodeDeviceEvent(vshControl *ctl, const vshCmd *cmd) data.loop = vshCommandOptBool(cmd, "loop"); data.timestamp = vshCommandOptBool(cmd, "timestamp"); data.count = 0; - data.cb = &vshEventCallbacks[event]; + data.cb = &vshNodedevEventCallbacks[event]; if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0) return false; if (vshCommandOptStringReq(ctl, cmd, "device", &device_value) < 0) diff --git a/tools/virsh-nodedev.h b/tools/virsh-nodedev.h index c64f7df83c..931beb982d 100644 --- a/tools/virsh-nodedev.h +++ b/tools/virsh-nodedev.h @@ -28,6 +28,14 @@ # include "virsh.h" +struct vshNodedevEventCallback { + const char *name; + virConnectNodeDeviceEventGenericCallback cb; +}; +typedef struct vshNodedevEventCallback vshNodedevEventCallback; + +extern vshNodedevEventCallback vshNodedevEventCallbacks[]; + extern const vshCmdDef nodedevCmds[]; #endif /* VIRSH_NODEDEV_H */ -- 2.16.2
Signed-off-by: Lin Ma <lma@suse.com> --- tools/virsh-completer.c | 31 +++++++++++++++++++++++++++++++ tools/virsh-completer.h | 4 ++++ tools/virsh-nodedev.c | 1 + 3 files changed, 36 insertions(+) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 1fab758e12..162b7a0e1c 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -26,6 +26,7 @@ #include "virsh-domain.h" #include "virsh.h" #include "virsh-pool.h" +#include "virsh-nodedev.h" #include "virsh-util.h" #include "virsh-secret.h" #include "internal.h" @@ -737,3 +738,33 @@ virshPoolEventNameCompleter(vshControl *ctl, virStringListFree(ret); return NULL; } + + +char ** +virshNodedevEventNameCompleter(vshControl *ctl, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virshControlPtr priv = ctl->privData; + size_t i = 0; + char **ret = NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + return NULL; + + if (VIR_ALLOC_N(ret, VIR_NODE_DEVICE_EVENT_ID_LAST) < 0) + goto error; + + for (i = 0; i < VIR_NODE_DEVICE_EVENT_ID_LAST; i++) { + if (VIR_STRDUP(ret[i], vshNodedevEventCallbacks[i].name) < 0) + goto error; + } + + return ret; + + error: + virStringListFree(ret); + return NULL; +} diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index 76fa31cb47..1190130ec0 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -89,4 +89,8 @@ char ** virshPoolEventNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); +char ** virshNodedevEventNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + #endif diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 66cf46c22f..f6bdeadd62 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -870,6 +870,7 @@ static const vshCmdOptDef opts_node_device_event[] = { }, {.name = "event", .type = VSH_OT_STRING, + .completer = virshNodedevEventNameCompleter, .help = N_("which event type to wait for") }, {.name = "loop", -- 2.16.2
On 05/23/2018 08:32 AM, Lin Ma wrote:
v2 -> v3: Most of patches in original v2 patchset were pushed, only 2 patches left, So create a new patchset for including the 2 patches and 6 new completion patches which about secret-event, pool-event and nodedev-event.
(Borrowed code & idea from Michal Privoznik for these patches design)
Lin Ma (8): virsh-secret: Rename vshEventCallback to vshSecretEventCallback virsh: Add event name completion to 'secret-event' command virsh: Move vshEventCallback structure definition to virsh-domain.h virsh: Add event name completion to 'event' command virsh-pool: Rename vshEventCallback to vshPoolEventCallback virsh: Add event name completion to 'pool-event' command virsh-nodedev: Rename vshEventCallback to vshNodedevEventCallback virsh: Add event name completion to 'nodedev-event' command
tools/virsh-completer.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 15 ++++++ tools/virsh-domain.c | 9 +--- tools/virsh-domain.h | 8 ++++ tools/virsh-nodedev.c | 19 +++----- tools/virsh-nodedev.h | 8 ++++ tools/virsh-pool.c | 19 +++----- tools/virsh-pool.h | 8 ++++ tools/virsh-secret.c | 18 +++----- tools/virsh-secret.h | 8 ++++ 10 files changed, 189 insertions(+), 42 deletions(-)
I've fixed all the issues I've found, ACKed and pushed. Would be nice if you can provide news.xml patch that mention these additions. Michal
participants (2)
-
Lin Ma -
Michal Privoznik