From nobody Tue Feb 10 20:06:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1638541248322634.1017490431711; Fri, 3 Dec 2021 06:20:48 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-602-eeifrKq9PSGWWaWNUy7UAQ-1; Fri, 03 Dec 2021 09:20:43 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7F193100C693; Fri, 3 Dec 2021 14:20:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5E9265D9D5; Fri, 3 Dec 2021 14:20:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3455B1809CB8; Fri, 3 Dec 2021 14:20:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B3EKap1026033 for ; Fri, 3 Dec 2021 09:20:36 -0500 Received: by smtp.corp.redhat.com (Postfix) id ECC8B1121315; Fri, 3 Dec 2021 14:20:35 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E80451121314 for ; Fri, 3 Dec 2021 14:20:30 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2CC5E106655A for ; Fri, 3 Dec 2021 14:20:30 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-256-JmDfkBdyOqOWf_H14-W0-g-1; Fri, 03 Dec 2021 09:20:27 -0500 Received: by mail-pj1-f50.google.com with SMTP id w33-20020a17090a6ba400b001a722a06212so5305704pjj.0 for ; Fri, 03 Dec 2021 06:20:26 -0800 (PST) Received: from localhost ([2400:ddc0:1000::b373:390c]) by smtp.gmail.com with ESMTPSA id lt5sm2566468pjb.43.2021.12.03.06.20.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Dec 2021 06:20:24 -0800 (PST) X-MC-Unique: eeifrKq9PSGWWaWNUy7UAQ-1 X-MC-Unique: JmDfkBdyOqOWf_H14-W0-g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7xTbrVopCfaN1Ag/Wn+ydMElf3jP3thgkWcKYbLnku0=; b=y+CGFF9dj7E6rV2aLcD24Ji9lcKk6pY47HyjnXbjqUfkQqyZOhSrBcOFSLgYcHJs3H zIMqiVI6I1P/pccComWtZq35TSh0iGKX8ZuJH2NJnjeB2tsjfP3Q8LpOMAm9yW4qSxpD g+ucL4iIzEWDS524c9KcJoJJ1ZOr5mtDIuE2f6NxB2rsBbIx8cNW7Vrp/shCFoOt8Wuv Q1UooDQkS9TwcezHVPdCl7qSbo+aOgu9tkabqKosyKeZUFXCC+aYzI77U9ZpbvrJDATc BN4CVKaOF0Es8rltvHBzCksA2iJDbkXTMv6tcU6NUxRvPnODFahJHuwv1aTzltObWFpa uuLw== X-Gm-Message-State: AOAM533NVXd8VGFwfldTkZdj6Pm7rhFfyRCIVGHMDJ9WBG6P3DOFjSgf sWNHnQmd8pwOx20gT/3kFN0gbpSO4mwANr8I X-Google-Smtp-Source: ABdhPJyu+GIuUVfEvDpVQQYNdjKuZAfni+pmlOEm/z9P/oVpaG608BbNZ1SDC5oMsyO/HJt6aNAsaw== X-Received: by 2002:a17:902:8e85:b0:142:7621:e3b3 with SMTP id bg5-20020a1709028e8500b001427621e3b3mr23119799plb.84.1638541225222; Fri, 03 Dec 2021 06:20:25 -0800 (PST) From: Luke Yue To: libvir-list@redhat.com Subject: [PATCH v2 3/4] virsh: Realign some outputs Date: Fri, 3 Dec 2021 22:19:56 +0800 Message-Id: <20211203141957.686148-4-lukedyue@gmail.com> In-Reply-To: <20211203141957.686148-1-lukedyue@gmail.com> References: <20211203141957.686148-1-lukedyue@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1638541249665100001 Content-Type: text/plain; charset="utf-8" As it's now "Security labels:" instead of "Security label:". Signed-off-by: Luke Yue --- tests/virsh-undefine | 8 ++--- tests/virshtest.c | 70 ++++++++++++++++++------------------ tools/virsh-domain-monitor.c | 42 +++++++++++----------- 3 files changed, 59 insertions(+), 61 deletions(-) diff --git a/tests/virsh-undefine b/tests/virsh-undefine index dbbb367391..7feefdec79 100755 --- a/tests/virsh-undefine +++ b/tests/virsh-undefine @@ -35,11 +35,11 @@ $abs_top_builddir/tools/virsh -c test:///default \ test $? =3D 0 || fail=3D1 sed '/^Persistent/n; /:/d' < out1 > out cat <<\EOF > exp || fail=3D1 -Persistent: yes +Persistent: yes =20 Domain 'test' has been undefined =20 -Persistent: no +Persistent: no =20 EOF compare exp out || fail=3D1 @@ -50,11 +50,11 @@ $abs_top_builddir/tools/virsh -c test:///default \ test $? =3D 0 || fail=3D1 sed '/^Persistent/n; /:/d' < out1 > out cat <<\EOF > exp || fail=3D1 -Persistent: yes +Persistent: yes =20 Domain '1' has been undefined =20 -Persistent: no +Persistent: no =20 EOF compare exp out || fail=3D1 diff --git a/tests/virshtest.c b/tests/virshtest.c index c2c892c60d..012edb8601 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -25,52 +25,52 @@ main(void) # define SECURITY_LABEL "libvirt-test (enforcing)" # define FC4_MESSAGES "tainted: network configuration using opaque shell s= cripts" # define FC5_MESSAGES "tainted: running with undesirable elevated privileg= es\n\ - tainted: network configuration using opaque shell scripts\= n\ - tainted: use of host cdrom passthrough\n\ - tainted: custom device tree blob used\n\ - tainted: use of deprecated configuration settings\n\ - deprecated configuration: CPU model Deprecated-Test" + tainted: network configuration using opaque shell scripts= \n\ + tainted: use of host cdrom passthrough\n\ + tainted: custom device tree blob used\n\ + tainted: use of deprecated configuration settings\n\ + deprecated configuration: CPU model Deprecated-Test" # define GET_BLKIO_PARAMETER "/dev/hda,700" # define SET_BLKIO_PARAMETER "/dev/hda,1000" # define EQUAL "=3D" =20 static const char *dominfo_fc4 =3D "\ -Id: 2\n\ -Name: fc4\n\ -UUID: " DOM_FC4_UUID "\n\ -OS Type: linux\n\ -State: running\n\ -CPU(s): 1\n\ -Max memory: 261072 KiB\n\ -Used memory: 131072 KiB\n\ -Persistent: yes\n\ -Autostart: disable\n\ -Managed save: no\n\ -Security model: testSecurity\n\ -Security DOI: \n\ -Security label: " SECURITY_LABEL "\n\ -Messages: " FC4_MESSAGES "\n\ +Id: 2\n\ +Name: fc4\n\ +UUID: " DOM_FC4_UUID "\n\ +OS Type: linux\n\ +State: running\n\ +CPU(s): 1\n\ +Max memory: 261072 KiB\n\ +Used memory: 131072 KiB\n\ +Persistent: yes\n\ +Autostart: disable\n\ +Managed save: no\n\ +Security model: testSecurity\n\ +Security DOI: \n\ +Security labels: " SECURITY_LABEL "\n\ +Messages: " FC4_MESSAGES "\n\ \n"; static const char *domuuid_fc4 =3D DOM_FC4_UUID "\n\n"; static const char *domid_fc4 =3D "2\n\n"; static const char *domname_fc4 =3D "fc4\n\n"; static const char *domstate_fc4 =3D "running\n\n"; static const char *dominfo_fc5 =3D "\ -Id: 3\n\ -Name: fc5\n\ -UUID: " DOM_FC5_UUID "\n\ -OS Type: linux\n\ -State: running\n\ -CPU(s): 4\n\ -Max memory: 2097152 KiB\n\ -Used memory: 2097152 KiB\n\ -Persistent: yes\n\ -Autostart: disable\n\ -Managed save: no\n\ -Security model: testSecurity\n\ -Security DOI: \n\ -Security label: " SECURITY_LABEL "\n\ -Messages: " FC5_MESSAGES "\n\ +Id: 3\n\ +Name: fc5\n\ +UUID: " DOM_FC5_UUID "\n\ +OS Type: linux\n\ +State: running\n\ +CPU(s): 4\n\ +Max memory: 2097152 KiB\n\ +Used memory: 2097152 KiB\n\ +Persistent: yes\n\ +Autostart: disable\n\ +Managed save: no\n\ +Security model: testSecurity\n\ +Security DOI: \n\ +Security labels: " SECURITY_LABEL "\n\ +Messages: " FC5_MESSAGES "\n\ \n"; =20 static const char *get_blkio_parameters =3D "\ diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 1bb3bed1cb..5ddf48cb06 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1233,39 +1233,39 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) =20 id =3D virDomainGetID(dom); if (id =3D=3D ((unsigned int)-1)) - vshPrint(ctl, "%-15s %s\n", _("Id:"), "-"); + vshPrint(ctl, "%-16s %s\n", _("Id:"), "-"); else - vshPrint(ctl, "%-15s %d\n", _("Id:"), id); - vshPrint(ctl, "%-15s %s\n", _("Name:"), virDomainGetName(dom)); + vshPrint(ctl, "%-16s %d\n", _("Id:"), id); + vshPrint(ctl, "%-16s %s\n", _("Name:"), virDomainGetName(dom)); =20 if (virDomainGetUUIDString(dom, &uuid[0]) =3D=3D 0) - vshPrint(ctl, "%-15s %s\n", _("UUID:"), uuid); + vshPrint(ctl, "%-16s %s\n", _("UUID:"), uuid); =20 if ((ostype =3D virDomainGetOSType(dom))) - vshPrint(ctl, "%-15s %s\n", _("OS Type:"), ostype); + vshPrint(ctl, "%-16s %s\n", _("OS Type:"), ostype); =20 if (virDomainGetInfo(dom, &info) =3D=3D 0) { - vshPrint(ctl, "%-15s %s\n", _("State:"), + vshPrint(ctl, "%-16s %s\n", _("State:"), virshDomainStateToString(info.state)); =20 - vshPrint(ctl, "%-15s %d\n", _("CPU(s):"), info.nrVirtCpu); + vshPrint(ctl, "%-16s %d\n", _("CPU(s):"), info.nrVirtCpu); =20 if (info.cpuTime !=3D 0) { double cpuUsed =3D info.cpuTime; =20 cpuUsed /=3D 1000000000.0; =20 - vshPrint(ctl, "%-15s %.1lfs\n", _("CPU time:"), cpuUsed); + vshPrint(ctl, "%-16s %.1lfs\n", _("CPU time:"), cpuUsed); } =20 if (info.maxMem !=3D UINT_MAX) - vshPrint(ctl, "%-15s %lu KiB\n", _("Max memory:"), + vshPrint(ctl, "%-16s %lu KiB\n", _("Max memory:"), info.maxMem); else - vshPrint(ctl, "%-15s %s\n", _("Max memory:"), + vshPrint(ctl, "%-16s %s\n", _("Max memory:"), _("no limit")); =20 - vshPrint(ctl, "%-15s %lu KiB\n", _("Used memory:"), + vshPrint(ctl, "%-16s %lu KiB\n", _("Used memory:"), info.memory); =20 } else { @@ -1277,21 +1277,21 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) vshDebug(ctl, VSH_ERR_DEBUG, "Domain persistent flag value: %d\n", persistent); if (persistent < 0) - vshPrint(ctl, "%-15s %s\n", _("Persistent:"), _("unknown")); + vshPrint(ctl, "%-16s %s\n", _("Persistent:"), _("unknown")); else - vshPrint(ctl, "%-15s %s\n", _("Persistent:"), persistent ? _("yes"= ) : _("no")); + vshPrint(ctl, "%-16s %s\n", _("Persistent:"), persistent ? _("yes"= ) : _("no")); =20 /* Check and display whether the domain autostarts or not */ if (!virDomainGetAutostart(dom, &autostart)) { - vshPrint(ctl, "%-15s %s\n", _("Autostart:"), + vshPrint(ctl, "%-16s %s\n", _("Autostart:"), autostart ? _("enable") : _("disable")); } =20 has_managed_save =3D virDomainHasManagedSaveImage(dom, 0); if (has_managed_save < 0) - vshPrint(ctl, "%-15s %s\n", _("Managed save:"), _("unknown")); + vshPrint(ctl, "%-16s %s\n", _("Managed save:"), _("unknown")); else - vshPrint(ctl, "%-15s %s\n", _("Managed save:"), + vshPrint(ctl, "%-16s %s\n", _("Managed save:"), has_managed_save ? _("yes") : _("no")); =20 /* Security model and label information */ @@ -1305,8 +1305,8 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) } else { /* Only print something if a security model is active */ if (secmodel.model[0] !=3D '\0') { - vshPrint(ctl, "%-15s %s\n", _("Security model:"), secmodel.mod= el); - vshPrint(ctl, "%-15s %s\n", _("Security DOI:"), secmodel.doi); + vshPrint(ctl, "%-16s %s\n", _("Security model:"), secmodel.mod= el); + vshPrint(ctl, "%-16s %s\n", _("Security DOI:"), secmodel.doi); =20 if (fullseclabels) { int len; @@ -1337,7 +1337,7 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) } =20 if (seclabel->label[0] !=3D '\0') - vshPrint(ctl, "%-15s %s (%s)\n", _("Security label:"), + vshPrint(ctl, "%-16s %s (%s)\n", _("Security labels:"), seclabel->label, seclabel->enforcing ? "enforcing" : @@ -1345,15 +1345,13 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) =20 g_clear_pointer(&seclabel, g_free); } - - VIR_FREE(seclabel); } } =20 if (virDomainGetMessages(dom, &messages, 0) > 0) { size_t i; for (i =3D 0; messages[i] !=3D NULL; i++) { - vshPrint(ctl, "%-15s %s\n", + vshPrint(ctl, "%-16s %s\n", i =3D=3D 0 ? _("Messages:") : "", messages[i]); } } --=20 2.34.1