[libvirt] [ [PATCH v3 1/8] virsh-secret: Rename vshEventCallback to vshSecretEventCallback

Michal Privoznik mprivozn at redhat.com
Thu May 24 13:31:38 UTC 2018


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 at 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




More information about the libvir-list mailing list