External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Simplify vshTableRowAppend() calling in cmdList(), part one

Browse Source 
All calls to vshTableRowAppend() inside of cmdList() share couple
of same arguments: domain ID, domain name and domain state. While
the first one is stored in a variable and then passed to all
vshTableRowAppend() calls, the others are passed as a function
call. Switch the latter to variables too.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2024-08-19 12:02:29 +02:00
parent ab7f877f27
commit cf0e0715e0
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/virsh-domain-monitor.c
View File

@ -1889,6 +1889,9 @@ cmdList(vshControl *ctl, const vshCmd *cmd)
ignore_value(virStrcpyStatic(id_buf, "-"));
if (optTable) {
const char *domName = virDomainGetName(dom);
const char *stateStr = NULL;
state = virshDomainState(ctl, dom, NULL);
/* Domain could've been removed in the meantime */
@ -1896,8 +1899,11 @@ cmdList(vshControl *ctl, const vshCmd *cmd)
continue;
if (managed && state == VIR_DOMAIN_SHUTOFF &&
virDomainHasManagedSaveImage(dom, 0) > 0)
state = -2;
virDomainHasManagedSaveImage(dom, 0) > 0) {
stateStr = _("saved");
} else {
stateStr = virshDomainStateToString(state);
}
if (optTitle && !optUUID) {
g_autofree char *title = NULL;
@ -1905,9 +1911,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd)
if (!(title = virshGetDomainDescription(ctl, dom, true, 0)))
goto cleanup;
if (vshTableRowAppend(table, id_buf,
virDomainGetName(dom),
state == -2 ? _("saved")
: virshDomainStateToString(state),
domName, stateStr,
title, NULL) < 0)
goto cleanup;
} else if (optUUID && !optTitle) {
@ -1916,9 +1920,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd)
goto cleanup;
}
if (vshTableRowAppend(table, id_buf,
virDomainGetName(dom),
state == -2 ? _("saved")
: virshDomainStateToString(state),
domName, stateStr,
uuid, NULL) < 0)
goto cleanup;
} else if (optUUID && optTitle) {
@ -1931,16 +1933,12 @@ cmdList(vshControl *ctl, const vshCmd *cmd)
goto cleanup;
}
if (vshTableRowAppend(table, id_buf,
virDomainGetName(dom),
state == -2 ? _("saved")
: virshDomainStateToString(state),
domName, stateStr,
title, uuid, NULL) < 0)
goto cleanup;
} else {
if (vshTableRowAppend(table, id_buf,
virDomainGetName(dom),
state == -2 ? _("saved")
: virshDomainStateToString(state),
domName, stateStr,
NULL) < 0)
goto cleanup;
}