summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-02-09 14:03:19 +0100
committerMarkus Armbruster <armbru@redhat.com>2015-02-18 10:51:28 +0100
commit1677f4c66cf2228eb14f1b0571d0e3b38d0d6606 (patch)
tree7c103f0cc73fd4c8eb6e8a70483e740377cd4229 /include
parent565f65d271984a32eed2c324ff6ef8be33f7f3d2 (diff)
downloadhqemu-1677f4c66cf2228eb14f1b0571d0e3b38d0d6606.zip
hqemu-1677f4c66cf2228eb14f1b0571d0e3b38d0d6606.tar.gz
monitor: Clean up around monitor_handle_fd_param()
monitor_handle_fd_param() is a wrapper around monitor_handle_fd_param2() that feeds errors to qerror_report_err() instead of returning them. qerror_report_err() is inappropriate in many contexts. monitor_handle_fd_param() looks simpler than monitor_handle_fd_param2(), which tempts use. Remove the temptation: drop the wrapper and open-code the (trivial) error handling instead. Replace the open-coded qerror_report_err() by error_report_err() in places that already use error_report(). Turns out that's everywhere. While there, rename monitor_handle_fd_param2() to monitor_fd_param(). Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/monitor/monitor.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index 47606d0..1c06bed 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -34,8 +34,7 @@ int monitor_read_block_device_key(Monitor *mon, const char *device,
void *opaque);
int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp);
-int monitor_handle_fd_param(Monitor *mon, const char *fdname);
-int monitor_handle_fd_param2(Monitor *mon, const char *fdname, Error **errp);
+int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp);
void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
GCC_FMT_ATTR(2, 0);
OpenPOWER on IntegriCloud