1. Patchew
  2. Libvirt
  3. [libvirt] [PATCH v3 0/9] add virDomainGetGuestInfo()
  4. View patch

[libvirt] [PATCH v3 9/9] virsh: add 'guestinfo' command

Jonathon Jongsma posted 9 patches 5 years, 3 months ago
[libvirt] [PATCH v3 9/9] virsh: add 'guestinfo' command
Posted by Jonathon Jongsma 5 years, 3 months ago 
The 'guestinfo' command uses the new virDomainGetGuestInfo() API to
query information about the specified domain and print it out for the
user. The output is modeled roughly on the 'domstats' command.

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
---
 tools/virsh-domain.c | 85 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index ccda71d7e0..977783951d 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -14038,6 +14038,85 @@ cmdDomFSInfo(vshControl *ctl, const vshCmd *cmd)
     return ret;
 }
 
+/*
+ * "guestinfo" command
+ */
+static const vshCmdInfo info_guestinfo[] = {
+    {.name = "help",
+     .data = N_("query information about the guest (via agent)")
+    },
+    {.name = "desc",
+     .data = N_("Use the guest agent to query various information from guest's "
+                "point of view")
+    },
+    {.name = NULL}
+};
+
+static const vshCmdOptDef opts_guestinfo[] = {
+    VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE),
+    {.name = "user",
+     .type = VSH_OT_BOOL,
+     .help = N_("report active users"),
+    },
+    {.name = "os",
+     .type = VSH_OT_BOOL,
+     .help = N_("report operating system information"),
+    },
+    {.name = "timezone",
+     .type = VSH_OT_BOOL,
+     .help = N_("report timezone information"),
+    },
+    {.name = "hostname",
+     .type = VSH_OT_BOOL,
+     .help = N_("report hostname"),
+    },
+    {.name = "filesystem",
+     .type = VSH_OT_BOOL,
+     .help = N_("report filesystem information"),
+    },
+    {.name = NULL}
+};
+
+static bool
+cmdGuestInfo(vshControl *ctl, const vshCmd *cmd)
+{
+    virDomainPtr dom;
+    bool ret = false;
+    virTypedParameterPtr params = NULL;
+    int nparams = 0;
+    size_t i;
+    unsigned int types = 0;
+
+    if (vshCommandOptBool(cmd, "user"))
+        types |= VIR_DOMAIN_GUEST_INFO_USERS;
+    if (vshCommandOptBool(cmd, "os"))
+        types |= VIR_DOMAIN_GUEST_INFO_OS;
+    if (vshCommandOptBool(cmd, "timezone"))
+        types |= VIR_DOMAIN_GUEST_INFO_TIMEZONE;
+    if (vshCommandOptBool(cmd, "hostname"))
+        types |= VIR_DOMAIN_GUEST_INFO_HOSTNAME;
+    if (vshCommandOptBool(cmd, "filesystem"))
+        types |= VIR_DOMAIN_GUEST_INFO_FILESYSTEM;
+
+    if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
+        return false;
+
+    if (virDomainGetGuestInfo(dom, types, &params, &nparams, 0) < 0)
+        goto cleanup;
+
+    for (i = 0; i < nparams; i++) {
+        char *str = vshGetTypedParamValue(ctl, &params[i]);
+        vshPrint(ctl, "%-20s: %s\n", params[i].field, str);
+        VIR_FREE(str);
+    }
+
+    ret = true;
+
+ cleanup:
+    virshDomainFree(dom);
+    return ret;
+}
+
 const vshCmdDef domManagementCmds[] = {
     {.name = "attach-device",
      .handler = cmdAttachDevice,
@@ -14653,5 +14732,11 @@ const vshCmdDef domManagementCmds[] = {
      .info = info_domblkthreshold,
      .flags = 0
     },
+    {.name = "guestinfo",
+     .handler = cmdGuestInfo,
+     .opts = opts_guestinfo,
+     .info = info_guestinfo,
+     .flags = 0
+    },
     {.name = NULL}
 };
-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH v3 9/9] virsh: add 'guestinfo' command
Posted by Michal Privoznik 5 years, 3 months ago 
On 8/23/19 6:31 PM, Jonathon Jongsma wrote:
> The 'guestinfo' command uses the new virDomainGetGuestInfo() API to
> query information about the specified domain and print it out for the
> user. The output is modeled roughly on the 'domstats' command.
> 
> Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
> ---
>   tools/virsh-domain.c | 85 ++++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 85 insertions(+)

Almost :-) This is missing documentation (virsh.pod change). And since 
I'm too lazy to write one I'll leave that up to you O:-)

> 
> diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
> index ccda71d7e0..977783951d 100644
> --- a/tools/virsh-domain.c
> +++ b/tools/virsh-domain.c
> @@ -14038,6 +14038,85 @@ cmdDomFSInfo(vshControl *ctl, const vshCmd *cmd)
>       return ret;
>   }
>   
> +/*
> + * "guestinfo" command
> + */
> +static const vshCmdInfo info_guestinfo[] = {
> +    {.name = "help",
> +     .data = N_("query information about the guest (via agent)")
> +    },
> +    {.name = "desc",
> +     .data = N_("Use the guest agent to query various information from guest's "
> +                "point of view")
> +    },
> +    {.name = NULL}
> +};
> +
> +static const vshCmdOptDef opts_guestinfo[] = {
> +    VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE),
> +    {.name = "user",
> +     .type = VSH_OT_BOOL,
> +     .help = N_("report active users"),
> +    },
> +    {.name = "os",
> +     .type = VSH_OT_BOOL,
> +     .help = N_("report operating system information"),
> +    },
> +    {.name = "timezone",
> +     .type = VSH_OT_BOOL,
> +     .help = N_("report timezone information"),
> +    },
> +    {.name = "hostname",
> +     .type = VSH_OT_BOOL,
> +     .help = N_("report hostname"),
> +    },
> +    {.name = "filesystem",
> +     .type = VSH_OT_BOOL,
> +     .help = N_("report filesystem information"),
> +    },
> +    {.name = NULL}
> +};
> +
> +static bool
> +cmdGuestInfo(vshControl *ctl, const vshCmd *cmd)
> +{
> +    virDomainPtr dom;
> +    bool ret = false;
> +    virTypedParameterPtr params = NULL;
> +    int nparams = 0;
> +    size_t i;
> +    unsigned int types = 0;
> +
> +    if (vshCommandOptBool(cmd, "user"))
> +        types |= VIR_DOMAIN_GUEST_INFO_USERS;
> +    if (vshCommandOptBool(cmd, "os"))
> +        types |= VIR_DOMAIN_GUEST_INFO_OS;
> +    if (vshCommandOptBool(cmd, "timezone"))
> +        types |= VIR_DOMAIN_GUEST_INFO_TIMEZONE;
> +    if (vshCommandOptBool(cmd, "hostname"))
> +        types |= VIR_DOMAIN_GUEST_INFO_HOSTNAME;
> +    if (vshCommandOptBool(cmd, "filesystem"))
> +        types |= VIR_DOMAIN_GUEST_INFO_FILESYSTEM;
> +
> +    if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
> +        return false;
> +
> +    if (virDomainGetGuestInfo(dom, types, &params, &nparams, 0) < 0)
> +        goto cleanup;
> +
> +    for (i = 0; i < nparams; i++) {
> +        char *str = vshGetTypedParamValue(ctl, &params[i]);
> +        vshPrint(ctl, "%-20s: %s\n", params[i].field, str);
> +        VIR_FREE(str);
> +    }
> +
> +    ret = true;
> +
> + cleanup:

Don't forget to free @params:

   virTypedParamsFree(params, nparams);

> +    virshDomainFree(dom);
> +    return ret;
> +}
> +
>   const vshCmdDef domManagementCmds[] = {
>       {.name = "attach-device",
>        .handler = cmdAttachDevice,
> @@ -14653,5 +14732,11 @@ const vshCmdDef domManagementCmds[] = {
>        .info = info_domblkthreshold,
>        .flags = 0
>       },
> +    {.name = "guestinfo",
> +     .handler = cmdGuestInfo,
> +     .opts = opts_guestinfo,
> +     .info = info_guestinfo,
> +     .flags = 0
> +    },
>       {.name = NULL}
>   };
> 

Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH v3 9/9] virsh: add 'guestinfo' command
Posted by Daniel Henrique Barboza 5 years, 3 months ago 

On 8/23/19 1:31 PM, Jonathon Jongsma wrote:
> The 'guestinfo' command uses the new virDomainGetGuestInfo() API to
> query information about the specified domain and print it out for the
> user. The output is modeled roughly on the 'domstats' command.
>
> Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
> ---

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>


>   tools/virsh-domain.c | 85 ++++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 85 insertions(+)
>
> diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
> index ccda71d7e0..977783951d 100644
> --- a/tools/virsh-domain.c
> +++ b/tools/virsh-domain.c
> @@ -14038,6 +14038,85 @@ cmdDomFSInfo(vshControl *ctl, const vshCmd *cmd)
>       return ret;
>   }
>   
> +/*
> + * "guestinfo" command
> + */
> +static const vshCmdInfo info_guestinfo[] = {
> +    {.name = "help",
> +     .data = N_("query information about the guest (via agent)")
> +    },
> +    {.name = "desc",
> +     .data = N_("Use the guest agent to query various information from guest's "
> +                "point of view")
> +    },
> +    {.name = NULL}
> +};
> +
> +static const vshCmdOptDef opts_guestinfo[] = {
> +    VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE),
> +    {.name = "user",
> +     .type = VSH_OT_BOOL,
> +     .help = N_("report active users"),
> +    },
> +    {.name = "os",
> +     .type = VSH_OT_BOOL,
> +     .help = N_("report operating system information"),
> +    },
> +    {.name = "timezone",
> +     .type = VSH_OT_BOOL,
> +     .help = N_("report timezone information"),
> +    },
> +    {.name = "hostname",
> +     .type = VSH_OT_BOOL,
> +     .help = N_("report hostname"),
> +    },
> +    {.name = "filesystem",
> +     .type = VSH_OT_BOOL,
> +     .help = N_("report filesystem information"),
> +    },
> +    {.name = NULL}
> +};
> +
> +static bool
> +cmdGuestInfo(vshControl *ctl, const vshCmd *cmd)
> +{
> +    virDomainPtr dom;
> +    bool ret = false;
> +    virTypedParameterPtr params = NULL;
> +    int nparams = 0;
> +    size_t i;
> +    unsigned int types = 0;
> +
> +    if (vshCommandOptBool(cmd, "user"))
> +        types |= VIR_DOMAIN_GUEST_INFO_USERS;
> +    if (vshCommandOptBool(cmd, "os"))
> +        types |= VIR_DOMAIN_GUEST_INFO_OS;
> +    if (vshCommandOptBool(cmd, "timezone"))
> +        types |= VIR_DOMAIN_GUEST_INFO_TIMEZONE;
> +    if (vshCommandOptBool(cmd, "hostname"))
> +        types |= VIR_DOMAIN_GUEST_INFO_HOSTNAME;
> +    if (vshCommandOptBool(cmd, "filesystem"))
> +        types |= VIR_DOMAIN_GUEST_INFO_FILESYSTEM;
> +
> +    if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
> +        return false;
> +
> +    if (virDomainGetGuestInfo(dom, types, &params, &nparams, 0) < 0)
> +        goto cleanup;
> +
> +    for (i = 0; i < nparams; i++) {
> +        char *str = vshGetTypedParamValue(ctl, &params[i]);
> +        vshPrint(ctl, "%-20s: %s\n", params[i].field, str);
> +        VIR_FREE(str);
> +    }
> +
> +    ret = true;
> +
> + cleanup:
> +    virshDomainFree(dom);
> +    return ret;
> +}
> +
>   const vshCmdDef domManagementCmds[] = {
>       {.name = "attach-device",
>        .handler = cmdAttachDevice,
> @@ -14653,5 +14732,11 @@ const vshCmdDef domManagementCmds[] = {
>        .info = info_domblkthreshold,
>        .flags = 0
>       },
> +    {.name = "guestinfo",
> +     .handler = cmdGuestInfo,
> +     .opts = opts_guestinfo,
> +     .info = info_guestinfo,
> +     .flags = 0
> +    },
>       {.name = NULL}
>   };

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.