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>
This commit is contained in:
parent
565f65d271
commit
1677f4c66c
@ -552,8 +552,7 @@ static void get_real_device(AssignedDevice *pci_dev, Error **errp)
|
|||||||
snprintf(name, sizeof(name), "%sconfig", dir);
|
snprintf(name, sizeof(name), "%sconfig", dir);
|
||||||
|
|
||||||
if (pci_dev->configfd_name && *pci_dev->configfd_name) {
|
if (pci_dev->configfd_name && *pci_dev->configfd_name) {
|
||||||
dev->config_fd = monitor_handle_fd_param2(cur_mon,
|
dev->config_fd = monitor_fd_param(cur_mon, pci_dev->configfd_name,
|
||||||
pci_dev->configfd_name,
|
|
||||||
&local_err);
|
&local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
error_propagate(errp, local_err);
|
error_propagate(errp, local_err);
|
||||||
|
@ -214,7 +214,7 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (vs->conf.vhostfd) {
|
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) {
|
if (vhostfd == -1) {
|
||||||
error_setg(errp, "vhost-scsi: unable to parse vhostfd: %s",
|
error_setg(errp, "vhost-scsi: unable to parse vhostfd: %s",
|
||||||
error_get_pretty(err));
|
error_get_pretty(err));
|
||||||
|
@ -34,8 +34,7 @@ int monitor_read_block_device_key(Monitor *mon, const char *device,
|
|||||||
void *opaque);
|
void *opaque);
|
||||||
|
|
||||||
int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp);
|
int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp);
|
||||||
int monitor_handle_fd_param(Monitor *mon, const char *fdname);
|
int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp);
|
||||||
int monitor_handle_fd_param2(Monitor *mon, const char *fdname, Error **errp);
|
|
||||||
|
|
||||||
void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
|
void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
|
||||||
GCC_FMT_ATTR(2, 0);
|
GCC_FMT_ATTR(2, 0);
|
||||||
|
15
monitor.c
15
monitor.c
@ -2570,20 +2570,7 @@ void monitor_fdset_dup_fd_remove(int dup_fd)
|
|||||||
monitor_fdset_dup_fd_find_remove(dup_fd, true);
|
monitor_fdset_dup_fd_find_remove(dup_fd, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int monitor_handle_fd_param(Monitor *mon, const char *fdname)
|
int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp)
|
||||||
{
|
|
||||||
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 fd;
|
int fd;
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
|
@ -695,6 +695,7 @@ static int net_socket_udp_init(NetClientState *peer,
|
|||||||
int net_init_socket(const NetClientOptions *opts, const char *name,
|
int net_init_socket(const NetClientOptions *opts, const char *name,
|
||||||
NetClientState *peer)
|
NetClientState *peer)
|
||||||
{
|
{
|
||||||
|
Error *err = NULL;
|
||||||
const NetdevSocketOptions *sock;
|
const NetdevSocketOptions *sock;
|
||||||
|
|
||||||
assert(opts->kind == NET_CLIENT_OPTIONS_KIND_SOCKET);
|
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) {
|
if (sock->has_fd) {
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
fd = monitor_handle_fd_param(cur_mon, sock->fd);
|
fd = monitor_fd_param(cur_mon, sock->fd, &err);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
|
error_report_err(err);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
qemu_set_nonblock(fd);
|
qemu_set_nonblock(fd);
|
||||||
|
11
net/tap.c
11
net/tap.c
@ -605,6 +605,7 @@ static int net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
|
|||||||
const char *downscript, const char *vhostfdname,
|
const char *downscript, const char *vhostfdname,
|
||||||
int vnet_hdr, int fd)
|
int vnet_hdr, int fd)
|
||||||
{
|
{
|
||||||
|
Error *err = NULL;
|
||||||
TAPState *s;
|
TAPState *s;
|
||||||
int vhostfd;
|
int vhostfd;
|
||||||
|
|
||||||
@ -643,8 +644,9 @@ static int net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
|
|||||||
options.force = tap->has_vhostforce && tap->vhostforce;
|
options.force = tap->has_vhostforce && tap->vhostforce;
|
||||||
|
|
||||||
if (tap->has_vhostfd || tap->has_vhostfds) {
|
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) {
|
if (vhostfd == -1) {
|
||||||
|
error_report_err(err);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -704,6 +706,7 @@ int net_init_tap(const NetClientOptions *opts, const char *name,
|
|||||||
/* for the no-fd, no-helper case */
|
/* for the no-fd, no-helper case */
|
||||||
const char *script = NULL; /* suppress wrong "uninit'd use" gcc warning */
|
const char *script = NULL; /* suppress wrong "uninit'd use" gcc warning */
|
||||||
const char *downscript = NULL;
|
const char *downscript = NULL;
|
||||||
|
Error *err = NULL;
|
||||||
const char *vhostfdname;
|
const char *vhostfdname;
|
||||||
char ifname[128];
|
char ifname[128];
|
||||||
|
|
||||||
@ -729,8 +732,9 @@ int net_init_tap(const NetClientOptions *opts, const char *name,
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
fd = monitor_handle_fd_param(cur_mon, tap->fd);
|
fd = monitor_fd_param(cur_mon, tap->fd, &err);
|
||||||
if (fd == -1) {
|
if (fd == -1) {
|
||||||
|
error_report_err(err);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -768,8 +772,9 @@ int net_init_tap(const NetClientOptions *opts, const char *name,
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < nfds; i++) {
|
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) {
|
if (fd == -1) {
|
||||||
|
error_report_err(err);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user