[libvirt] [PATCH] qemu_agent|monitor: use different log on hangup event
Michal Privoznik
mprivozn at redhat.com
Mon Sep 19 11:08:25 UTC 2016
On 19.09.2016 08:24, Chen Hanxiao wrote:
> From: Chen Hanxiao <chenhanxiao at gmail.com>
>
> Both qemu monitor and agent print the same
> log on HUANGUP event, which woud be confused
> when reading libvirtd log.
>
> This patch will give a different log for them.
>
> Signed-off-by: Chen Hanxiao <chenhanxiao at gmail.com>
> ---
> src/qemu/qemu_agent.c | 2 +-
> src/qemu/qemu_monitor.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
> index eeede6b..babd8f2 100644
> --- a/src/qemu/qemu_agent.c
> +++ b/src/qemu/qemu_agent.c
> @@ -633,7 +633,7 @@ qemuAgentIO(int watch, int fd, int events, void *opaque)
> if (!error &&
> events & VIR_EVENT_HANDLE_HANGUP) {
> virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> - _("End of file from monitor"));
> + _("End of file from agent monitor"));
> eof = true;
> events &= ~VIR_EVENT_HANDLE_HANGUP;
> }
> diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
> index 4171914..d92a359 100644
> --- a/src/qemu/qemu_monitor.c
> +++ b/src/qemu/qemu_monitor.c
> @@ -692,7 +692,7 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque)
> hangup = true;
> if (!error) {
> virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> - _("End of file from monitor"));
> + _("End of file from qemu monitor"));
> eof = true;
> events &= ~VIR_EVENT_HANDLE_HANGUP;
> }
>
Okay, I've ACKed this and pushed.
Michal
More information about the libvir-list
mailing list