[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/11] monitor: Clean up around monitor_handle_fd_par
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 04/11] monitor: Clean up around monitor_handle_fd_param() |
Date: |
Wed, 18 Feb 2015 11:34:15 +0100 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
hw/i386/kvm/pci-assign.c | 5 ++---
hw/scsi/vhost-scsi.c | 2 +-
include/monitor/monitor.h | 3 +--
monitor.c | 15 +--------------
net/socket.c | 4 +++-
net/tap.c | 11 ++++++++---
6 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index 29ce2c4..bd92c69 100644
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -552,9 +552,8 @@ static void get_real_device(AssignedDevice *pci_dev, Error
**errp)
snprintf(name, sizeof(name), "%sconfig", dir);
if (pci_dev->configfd_name && *pci_dev->configfd_name) {
- dev->config_fd = monitor_handle_fd_param2(cur_mon,
- pci_dev->configfd_name,
- &local_err);
+ dev->config_fd = monitor_fd_param(cur_mon, pci_dev->configfd_name,
+ &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index 567f350..484f4a8 100644
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -214,7 +214,7 @@ static void vhost_scsi_realize(DeviceState *dev, Error
**errp)
}
if (vs->conf.vhostfd) {
- vhostfd = monitor_handle_fd_param2(cur_mon, vs->conf.vhostfd, &err);
+ vhostfd = monitor_fd_param(cur_mon, vs->conf.vhostfd, &err);
if (vhostfd == -1) {
error_setg(errp, "vhost-scsi: unable to parse vhostfd: %s",
error_get_pretty(err));
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);
diff --git a/monitor.c b/monitor.c
index c3cc060..ac2a4ab 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2570,20 +2570,7 @@ void monitor_fdset_dup_fd_remove(int dup_fd)
monitor_fdset_dup_fd_find_remove(dup_fd, true);
}
-int monitor_handle_fd_param(Monitor *mon, const char *fdname)
-{
- int fd;
- Error *local_err = NULL;
-
- fd = monitor_handle_fd_param2(mon, fdname, &local_err);
- if (local_err) {
- qerror_report_err(local_err);
- error_free(local_err);
- }
- return fd;
-}
-
-int monitor_handle_fd_param2(Monitor *mon, const char *fdname, Error **errp)
+int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp)
{
int fd;
Error *local_err = NULL;
diff --git a/net/socket.c b/net/socket.c
index 68a93cd..c30e03f 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -695,6 +695,7 @@ static int net_socket_udp_init(NetClientState *peer,
int net_init_socket(const NetClientOptions *opts, const char *name,
NetClientState *peer)
{
+ Error *err = NULL;
const NetdevSocketOptions *sock;
assert(opts->kind == NET_CLIENT_OPTIONS_KIND_SOCKET);
@@ -715,8 +716,9 @@ int net_init_socket(const NetClientOptions *opts, const
char *name,
if (sock->has_fd) {
int fd;
- fd = monitor_handle_fd_param(cur_mon, sock->fd);
+ fd = monitor_fd_param(cur_mon, sock->fd, &err);
if (fd == -1) {
+ error_report_err(err);
return -1;
}
qemu_set_nonblock(fd);
diff --git a/net/tap.c b/net/tap.c
index 1fe0edf..968df46 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -605,6 +605,7 @@ static int net_init_tap_one(const NetdevTapOptions *tap,
NetClientState *peer,
const char *downscript, const char *vhostfdname,
int vnet_hdr, int fd)
{
+ Error *err = NULL;
TAPState *s;
int vhostfd;
@@ -643,8 +644,9 @@ static int net_init_tap_one(const NetdevTapOptions *tap,
NetClientState *peer,
options.force = tap->has_vhostforce && tap->vhostforce;
if (tap->has_vhostfd || tap->has_vhostfds) {
- vhostfd = monitor_handle_fd_param(cur_mon, vhostfdname);
+ vhostfd = monitor_fd_param(cur_mon, vhostfdname, &err);
if (vhostfd == -1) {
+ error_report_err(err);
return -1;
}
} else {
@@ -704,6 +706,7 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
/* for the no-fd, no-helper case */
const char *script = NULL; /* suppress wrong "uninit'd use" gcc warning */
const char *downscript = NULL;
+ Error *err = NULL;
const char *vhostfdname;
char ifname[128];
@@ -729,8 +732,9 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
return -1;
}
- fd = monitor_handle_fd_param(cur_mon, tap->fd);
+ fd = monitor_fd_param(cur_mon, tap->fd, &err);
if (fd == -1) {
+ error_report_err(err);
return -1;
}
@@ -768,8 +772,9 @@ int net_init_tap(const NetClientOptions *opts, const char
*name,
}
for (i = 0; i < nfds; i++) {
- fd = monitor_handle_fd_param(cur_mon, fds[i]);
+ fd = monitor_fd_param(cur_mon, fds[i], &err);
if (fd == -1) {
+ error_report_err(err);
return -1;
}
--
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, 2015/02/18
- [Qemu-devel] [PULL 04/11] monitor: Clean up around monitor_handle_fd_param(),
Markus Armbruster <=
- [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