| Message ID | 1455705264-17744-1-git-send-email-ian.campbell@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 2016-02-17 at 10:34 +0000, Ian Campbell wrote: > Dom0 is handled separately (via print_dom0_uptime) and the domU > variant doesn't work for dom0 since libxl_vm_get_start_time() doesn't. > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Ping? (and for 2/2 "xl: NULL terminate buf when reading dom0 /proc/uptime") > --- > tools/libxl/xl_cmdimpl.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c > index f38e3dd..89fa42c 100644 > --- a/tools/libxl/xl_cmdimpl.c > +++ b/tools/libxl/xl_cmdimpl.c > @@ -7055,8 +7055,10 @@ static void print_uptime(int short_mode, uint32_t > doms[], int nb_doms) > fprintf(stderr, "Could not list vms.\n"); > return; > } > - for (i = 0; i < nb_vm; i++) > + for (i = 0; i < nb_vm; i++) { > + if (info[i].domid == 0) continue; > print_domU_uptime(info[i].domid, short_mode, now); > + } > libxl_vminfo_list_free(info, nb_vm); > } else { > for (i = 0; i < nb_doms; i++) {
Ian Campbell writes ("[PATCH 1/2] xl: uptime: skip dom0 when calling print_domU_uptime"):
> Dom0 is handled separately (via print_dom0_uptime) and the domU
> variant doesn't work for dom0 since libxl_vm_get_start_time() doesn't.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
and queued
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index f38e3dd..89fa42c 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7055,8 +7055,10 @@ static void print_uptime(int short_mode, uint32_t doms[], int nb_doms) fprintf(stderr, "Could not list vms.\n"); return; } - for (i = 0; i < nb_vm; i++) + for (i = 0; i < nb_vm; i++) { + if (info[i].domid == 0) continue; print_domU_uptime(info[i].domid, short_mode, now); + } libxl_vminfo_list_free(info, nb_vm); } else { for (i = 0; i < nb_doms; i++) {
Dom0 is handled separately (via print_dom0_uptime) and the domU variant doesn't work for dom0 since libxl_vm_get_start_time() doesn't. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- tools/libxl/xl_cmdimpl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)