SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

monitor: Simplify monitor_fd_param()'s error handling

Browse Source 
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20221121085054.683122-5-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2022-11-21 09:50:48 +01:00
parent 05e385d2a9
commit 457552fc7d
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
monitor/misc.c
View File

@ -1086,6 +1086,7 @@ int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp)
} }
fd = monfd->fd; fd = monfd->fd;
assert(fd >= 0);
/* caller takes ownership of fd */ /* caller takes ownership of fd */
QLIST_REMOVE(monfd, next); QLIST_REMOVE(monfd, next);
@ -1403,23 +1404,16 @@ void monitor_fdset_dup_fd_remove(int dup_fd)
int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp) int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp)
{ {
int fd; int fd;
Error *local_err = NULL;
if (!qemu_isdigit(fdname[0]) && mon) { if (!qemu_isdigit(fdname[0]) && mon) {
fd = monitor_get_fd(mon, fdname, &local_err); fd = monitor_get_fd(mon, fdname, errp);
} else { } else {
fd = qemu_parse_fd(fdname); fd = qemu_parse_fd(fdname);
if (fd == -1) { if (fd < 0) {
error_setg(&local_err, "Invalid file descriptor number '%s'", error_setg(errp, "Invalid file descriptor number '%s'",
fdname); fdname);
} }
} }
if (local_err) {
error_propagate(errp, local_err);
assert(fd == -1);
} else {
assert(fd != -1);
}
return fd; return fd;
} }