mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-22 22:13:18 +00:00
virsh: Add timestamps to QEMU monitor events
Implement a --timestamp option for 'virsh qemu-monitor-event', similar to the one for 'virsh event'. When the option is used, the human-readable timestamp will be printed before the message, and the timing information provided by QEMU will not be displayed.
This commit is contained in:
parent
8223bd22ed
commit
75a96e0cc4
@ -9173,6 +9173,7 @@ struct virshQemuEventData {
|
|||||||
vshControl *ctl;
|
vshControl *ctl;
|
||||||
bool loop;
|
bool loop;
|
||||||
bool pretty;
|
bool pretty;
|
||||||
|
bool timestamp;
|
||||||
int count;
|
int count;
|
||||||
};
|
};
|
||||||
typedef struct virshQemuEventData virshQemuEventData;
|
typedef struct virshQemuEventData virshQemuEventData;
|
||||||
@ -9197,8 +9198,20 @@ virshEventQemuPrint(virConnectPtr conn ATTRIBUTE_UNUSED,
|
|||||||
if (pretty && (str = virJSONValueToString(pretty, true)))
|
if (pretty && (str = virJSONValueToString(pretty, true)))
|
||||||
details = str;
|
details = str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (data->timestamp) {
|
||||||
|
char timestamp[VIR_TIME_STRING_BUFLEN];
|
||||||
|
|
||||||
|
if (virTimeStringNowRaw(timestamp) < 0)
|
||||||
|
timestamp[0] = '\0';
|
||||||
|
|
||||||
|
vshPrint(data->ctl, "%s: event %s for domain %s: %s\n",
|
||||||
|
timestamp, event, virDomainGetName(dom), NULLSTR(details));
|
||||||
|
} else {
|
||||||
vshPrint(data->ctl, "event %s at %lld.%06u for domain %s: %s\n",
|
vshPrint(data->ctl, "event %s at %lld.%06u for domain %s: %s\n",
|
||||||
event, seconds, micros, virDomainGetName(dom), NULLSTR(details));
|
event, seconds, micros, virDomainGetName(dom), NULLSTR(details));
|
||||||
|
}
|
||||||
|
|
||||||
data->count++;
|
data->count++;
|
||||||
if (!data->loop)
|
if (!data->loop)
|
||||||
vshEventDone(data->ctl);
|
vshEventDone(data->ctl);
|
||||||
@ -9245,6 +9258,10 @@ static const vshCmdOptDef opts_qemu_monitor_event[] = {
|
|||||||
.type = VSH_OT_BOOL,
|
.type = VSH_OT_BOOL,
|
||||||
.help = N_("treat event case-insensitively")
|
.help = N_("treat event case-insensitively")
|
||||||
},
|
},
|
||||||
|
{.name = "timestamp",
|
||||||
|
.type = VSH_OT_BOOL,
|
||||||
|
.help = N_("show timestamp for each printed event")
|
||||||
|
},
|
||||||
{.name = NULL}
|
{.name = NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -9268,6 +9285,7 @@ cmdQemuMonitorEvent(vshControl *ctl, const vshCmd *cmd)
|
|||||||
data.ctl = ctl;
|
data.ctl = ctl;
|
||||||
data.loop = vshCommandOptBool(cmd, "loop");
|
data.loop = vshCommandOptBool(cmd, "loop");
|
||||||
data.pretty = vshCommandOptBool(cmd, "pretty");
|
data.pretty = vshCommandOptBool(cmd, "pretty");
|
||||||
|
data.timestamp = vshCommandOptBool(cmd, "timestamp");
|
||||||
data.count = 0;
|
data.count = 0;
|
||||||
if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0)
|
if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0)
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user