[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/11] vhost-scsi: Improve error reporting for invali
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 01/11] vhost-scsi: Improve error reporting for invalid vhostfd |
Date: |
Wed, 18 Feb 2015 11:34:12 +0100 |
We get two error messages: one from monitor_handle_fd_param2(), and
another one from vhost_scsi_realize(). The second one gets suppressed
in QMP context.
That's because monitor_handle_fd_param() calls qerror_report_err().
Calling qerror_report_err() is always inappropriate in realize
methods, because it doesn't return the Error object. It either
reports the error to stderr or the human monitor, or it stores it in
the QMP monitor, where it makes the QMP command fail even when the
realize method ignores the error and succeeds. Fortunately,
vhost_scsi_realize() doesn't do that.
Fix by switching to monitor_handle_fd_param2().
Signed-off-by: Markus Armbruster <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
---
hw/scsi/vhost-scsi.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index dcb2bc5..567f350 100644
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -214,9 +214,11 @@ static void vhost_scsi_realize(DeviceState *dev, Error
**errp)
}
if (vs->conf.vhostfd) {
- vhostfd = monitor_handle_fd_param(cur_mon, vs->conf.vhostfd);
+ vhostfd = monitor_handle_fd_param2(cur_mon, vs->conf.vhostfd, &err);
if (vhostfd == -1) {
- error_setg(errp, "vhost-scsi: unable to parse vhostfd");
+ error_setg(errp, "vhost-scsi: unable to parse vhostfd: %s",
+ error_get_pretty(err));
+ error_free(err);
return;
}
} else {
--
1.9.3
- [Qemu-devel] [PULL 00/11] Clean up around error_get_pretty(), qerror_report_err(), Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL 09/11] vl: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL 10/11] qemu-img: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL 01/11] vhost-scsi: Improve error reporting for invalid vhostfd,
Markus Armbruster <=
- [Qemu-devel] [PULL 04/11] monitor: Clean up around monitor_handle_fd_param(), Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL 02/11] error: New convenience function error_report_err(), Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL 03/11] error: Use error_report_err() where appropriate, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL 08/11] tpm: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL 06/11] net: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL 05/11] monitor: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL 11/11] qemu-char: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL 07/11] numa: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- Re: [Qemu-devel] [PULL 00/11] Clean up around error_get_pretty(), qerror_report_err(), Markus Armbruster, 2015/02/18