virsh: add --disk informations to guestinfo command

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Tested-by: Han Han <hhan@redhat.com>
This commit is contained in:
Marc-André Lureau 2020-11-20 22:09:48 +04:00 committed by Michal Privoznik
parent 0cb2d9f05d
commit 172b830435
2 changed files with 18 additions and 1 deletions

View File

@ -2679,6 +2679,7 @@ guestinfo
:: ::
guestinfo domain [--user] [--os] [--timezone] [--hostname] [--filesystem] guestinfo domain [--user] [--os] [--timezone] [--hostname] [--filesystem]
[--disks]
Print information about the guest from the point of view of the guest agent. Print information about the guest from the point of view of the guest agent.
Note that this command requires a guest agent to be configured and running in Note that this command requires a guest agent to be configured and running in
@ -2689,7 +2690,7 @@ are supported by the guest agent. You can limit the types of information that
are returned by specifying one or more flags. If a requested information are returned by specifying one or more flags. If a requested information
type is not supported, the processes will provide an exit code of 1. type is not supported, the processes will provide an exit code of 1.
Available information types flags are *--user*, *--os*, Available information types flags are *--user*, *--os*,
*--timezone*, *--hostname*, and *--filesystem*. *--timezone*, *--hostname*, *--filesystem* and *--disks*.
Note that depending on the hypervisor type and the version of the guest agent Note that depending on the hypervisor type and the version of the guest agent
running within the domain, not all of the following information may be running within the domain, not all of the following information may be
@ -2746,6 +2747,16 @@ returned:
* ``fs.<num>.disk.<num>.serial`` - the serial number of disk <num> * ``fs.<num>.disk.<num>.serial`` - the serial number of disk <num>
* ``fs.<num>.disk.<num>.device`` - the device node of disk <num> * ``fs.<num>.disk.<num>.device`` - the device node of disk <num>
*--disks* returns:
* ``disks.count`` - the number of disks defined on this domain
* ``disks.<num>.name`` - device node (Linux) or device UNC (Windows)
* ``disks.<num>.partition`` - whether this is a partition or disk
* ``disks.<num>.dependencies.count`` - the number of device dependencies
* ``disks.<num>.dependencies.<num>.name`` - a dependency name
* ``disks.<num>.alias`` - the device alias of the disk (e.g. sda)
* ``disks.<num>.guest_alias`` - optional alias assigned to the disk
guestvcpus guestvcpus
---------- ----------

View File

@ -14209,6 +14209,10 @@ static const vshCmdOptDef opts_guestinfo[] = {
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("report filesystem information"), .help = N_("report filesystem information"),
}, },
{.name = "disks",
.type = VSH_OT_BOOL,
.help = N_("report disks information"),
},
{.name = NULL} {.name = NULL}
}; };
@ -14232,6 +14236,8 @@ cmdGuestInfo(vshControl *ctl, const vshCmd *cmd)
types |= VIR_DOMAIN_GUEST_INFO_HOSTNAME; types |= VIR_DOMAIN_GUEST_INFO_HOSTNAME;
if (vshCommandOptBool(cmd, "filesystem")) if (vshCommandOptBool(cmd, "filesystem"))
types |= VIR_DOMAIN_GUEST_INFO_FILESYSTEM; types |= VIR_DOMAIN_GUEST_INFO_FILESYSTEM;
if (vshCommandOptBool(cmd, "disks"))
types |= VIR_DOMAIN_GUEST_INFO_DISKS;
if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
return false; return false;