1:41 p.m.
I've reviewed and fixed some patches from MR's:
Assaf Admi (1):
docs: Document that 'vcpu.delay' statistic is in nanoseconds
https://gitlab.com/libvirt/libvirt/-/merge_requests/352
Bronek Kozicki (1):
tools: Move libvirt-guests lock file out of subsys directory
https://gitlab.com/libvirt/libvirt/-/merge_requests/448
Philipp Schuster (1):
virsh: pool-list: remove unnecessary spaces to align behavior
https://gitlab.com/libvirt/libvirt/-/merge_requests/452
docs/manpages/virsh.rst | 2 +-
src/libvirt-domain.c | 2 +-
tools/libvirt-guests.sh.in | 2 +-
tools/virsh-pool.c | 7 +------
4 files changed, 4 insertions(+), 9 deletions(-)
--
2.48.1
1:41 p.m.
New subject: [PATCH 1/3] docs: Document that 'vcpu.delay' statistic is in nanoseconds
From: Assaf Admi <aadmi(a)redhat.com>
Add nanoseconds units for vcpu.delay doc, as it's based on
'/proc/<pid>/task/<tid>/schedstat' (see
'qemuGetSchedstatDelay()').
'schedstat' is in nanoseconds, according to
https://docs.kernel.org/scheduler/sched-stats.html#proc-pid-schedstat.
Signed-off-by: aadmi <aadmi(a)redhat.com>
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
---
docs/manpages/virsh.rst | 2 +-
src/libvirt-domain.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
index bf0436621b..868b354b2f 100644
--- a/docs/manpages/virsh.rst
+++ b/docs/manpages/virsh.rst
@@ -2441,7 +2441,7 @@ When selecting the *--state* group the following fields are
returned:
no (may indicate the processor is idle or even disabled,
depending on the architecture)
* ``vcpu.<num>.delay`` - time the vCPU <num> thread was enqueued by the
- host scheduler, but was waiting in the queue instead of running.
+ host scheduler, but was waiting in the queue instead of running (in nanoseconds).
Exposed to the VM as a steal time.
This group of statistics also reports additional hypervisor-originating per-vCPU
diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index efccafc4d2..088e486b6b 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -12331,7 +12331,7 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
* "vcpu.<num>.delay" - time the vCPU <num> thread was enqueued
by the
* host scheduler, but was waiting in the queue
* instead of running. Exposed to the VM as a steal
- * time.
+ * time. (in nanoseconds)
*
* This group of statistics also reports additional hypervisor-originating
* per-vCPU stats. The hypervisor-specific statistics in this group have the
--
2.48.1
1:41 p.m.
New subject: [PATCH 2/3] virsh: pool-list: remove unnecessary spaces to align behavior
From: Philipp Schuster <philipp.schuster(a)cyberus-technology.de>
By removing the unnecessary spaces, the behavior is aligned with
`virsh list --all --name` and `virsh net-list --all --name`.
Without this change, one can't do something like the following easily:
`virsh pool-list --all --name | xargs -I {} virsh pool-start \"{}\"`
as no pool `"foo "` (with all the spaces) actually exist.
Although the removed comment states that the additional spaces were kept
to maintain backwards compatibility, the commit [0] and the old behavior
are from 2010 when libvirt was at version 0.8.1. For the sake of sanity,
the behavior should be aligned with other parts of the CLI.
[0] https://gitlab.com/libvirt/libvirt/-/commit/415b14903e816aeb98d6f9c16fba0...
Signed-off-by: Philipp Schuster <philipp.schuster(a)cyberus-technology.de>
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
---
tools/virsh-pool.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index f9aad8ded0..4cd7b7ba0b 100644
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -1270,11 +1270,6 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED)
}
}
- /* If the --details option wasn't selected, we output the pool
- * info using the fixed string format from previous versions to
- * maintain backward compatibility.
- */
-
/* Output basic info then return if --details option not selected */
if (!details) {
if (uuid || name) {
@@ -1287,7 +1282,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED)
if (name) {
const char *name_str =
virStoragePoolGetName(list->pools[i]);
- vshPrint(ctl, "%-20s\n", name_str);
+ vshPrint(ctl, "%s\n", name_str);
}
}
ret = true;
--
2.48.1
1:41 p.m.
New subject: [PATCH 3/3] tools: Move libvirt-guests lock file out of subsys directory
From: Bronek Kozicki <brok(a)incorrekt.com>
This directory might not exist on systems not supporting old SystemV interfaces.
Signed-off-by: Bronek Kozicki <brok(a)incorrekt.com>
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
---
tools/libvirt-guests.sh.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
index c3c5954e17..f2db1282ad 100644
--- a/tools/libvirt-guests.sh.in
+++ b/tools/libvirt-guests.sh.in
@@ -44,7 +44,7 @@ test -f "$initconfdir"/libvirt-guests &&
. "$initconfdir"/libvirt-guests
LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
-VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests
+VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests
RETVAL=0
--
2.48.1
1
days inactive
1
days old
3 comments
1 participants
participants (1)
-
Peter Krempa