52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
|
From a3bea49c6960a468ee28b6d8dd0664c1ebcbcd02 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <a3bea49c6960a468ee28b6d8dd0664c1ebcbcd02@dist-git>
|
||
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Date: Tue, 4 Feb 2020 15:07:46 +0100
|
||
|
|
Subject: [PATCH] qemu: monitor: Improve error message when QEMU reply is too
|
||
|
|
large
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Don't use ERANGE as it doesn't make much sense in the error message.
|
||
|
|
Also point out that the reply from qemu was too large which is not
|
||
|
|
obvious from the original error:
|
||
|
|
|
||
|
|
error: No complete monitor response found in 10485760 bytes: Numerical result out of range
|
||
|
|
|
||
|
|
The new message will read:
|
||
|
|
|
||
|
|
error: internal error: QEMU monitor reply exceeds buffer size (10485760 bytes)
|
||
|
|
|
||
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
(cherry picked from commit 29d43bf96a3e5886f1b32c78bbb16d1507bd0d9e)
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1524278
|
||
|
|
Message-Id: <0e03a38f096e556cb82eecdb72e7dd5f86eec752.1580824112.git.pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_monitor.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
|
||
|
|
index 4f547bf5ec..0e67851690 100644
|
||
|
|
--- a/src/qemu/qemu_monitor.c
|
||
|
|
+++ b/src/qemu/qemu_monitor.c
|
||
|
|
@@ -485,9 +485,9 @@ qemuMonitorIORead(qemuMonitorPtr mon)
|
||
|
|
|
||
|
|
if (avail < 1024) {
|
||
|
|
if (mon->bufferLength >= QEMU_MONITOR_MAX_RESPONSE) {
|
||
|
|
- virReportSystemError(ERANGE,
|
||
|
|
- _("No complete monitor response found in %d bytes"),
|
||
|
|
- QEMU_MONITOR_MAX_RESPONSE);
|
||
|
|
+ virReportError(VIR_ERR_INTERNAL_ERROR,
|
||
|
|
+ _("QEMU monitor reply exceeds buffer size (%d bytes)"),
|
||
|
|
+ QEMU_MONITOR_MAX_RESPONSE);
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
if (VIR_REALLOC_N(mon->buffer,
|
||
|
|
--
|
||
|
|
2.25.0
|
||
|
|
|