External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "qemu: monitor: do not report error on shutdown"

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1536461

This reverts commit aeda1b8c56.

Problem is that we need mon->lastError to be set because it's
used all over the place. Also, there's nothing wrong with
reporting error if one occurred. I mean, if there's a thread
executing an API and which currently is talking on monitor it
definitely wants the error reported.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2018-01-19 13:53:57 +01:00
parent 0b54c37d50
commit 72adaf2f10
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_monitor.c
View File

@ -78,7 +78,6 @@ struct _qemuMonitor {
* < 0: an error occurred during the registration of @fd */ * < 0: an error occurred during the registration of @fd */
int watch; int watch;
int hasSendFD; int hasSendFD;
int willhangup;
virDomainObjPtr vm; virDomainObjPtr vm;
@ -716,10 +715,8 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque)
if (events & VIR_EVENT_HANDLE_HANGUP) { if (events & VIR_EVENT_HANDLE_HANGUP) {
hangup = true; hangup = true;
if (!error) { if (!error) {
if (!mon->willhangup) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("End of file from qemu monitor"));
_("End of file from qemu monitor"));
}
eof = true; eof = true;
events &= ~VIR_EVENT_HANDLE_HANGUP; events &= ~VIR_EVENT_HANDLE_HANGUP;
} }
@ -758,7 +755,7 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque)
if (mon->lastError.code != VIR_ERR_OK) { if (mon->lastError.code != VIR_ERR_OK) {
/* Already have an error, so clear any new error */ /* Already have an error, so clear any new error */
virResetLastError(); virResetLastError();
} else if (!mon->willhangup) { } else {
virErrorPtr err = virGetLastError(); virErrorPtr err = virGetLastError();
if (!err) if (!err)
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -1352,7 +1349,6 @@ qemuMonitorEmitShutdown(qemuMonitorPtr mon, virTristateBool guest)
{ {
int ret = -1; int ret = -1;
VIR_DEBUG("mon=%p guest=%u", mon, guest); VIR_DEBUG("mon=%p guest=%u", mon, guest);
mon->willhangup = 1;
QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm, guest); QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm, guest);
return ret; return ret;