diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-08-21 20:52:07 +0000 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2012-09-07 09:15:08 +0300 |
commit | a96ed02fc73e23748c8b3e38880eeac91f83ab9f (patch) | |
tree | 86a10ae01782252461f841c9a1e14fa2f8298f8a /monitor.c | |
parent | 0e180d9c8a7429c55d23d2e7855f1e490a063aaa (diff) | |
download | qemu-a96ed02fc73e23748c8b3e38880eeac91f83ab9f.zip qemu-a96ed02fc73e23748c8b3e38880eeac91f83ab9f.tar.gz qemu-a96ed02fc73e23748c8b3e38880eeac91f83ab9f.tar.bz2 |
monitor: Rename+move net_handle_fd_param -> monitor_handle_fd_param
This patch renames+moves the net_handle_fd_param() caller used to
obtain a file descriptor from either qemu_parse_fd() (the normal case)
or from monitor_get_fd() (migration case) into a generically prefixed
monitor_handle_fd_param() to be used by vhost-scsi code.
Also update net/[socket,tap].c consumers to use the new prefix.
Reported-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 18 |
1 files changed, 18 insertions, 0 deletions
@@ -2651,6 +2651,24 @@ int monitor_fdset_dup_fd_remove(int dup_fd) return monitor_fdset_dup_fd_find_remove(dup_fd, true); } +int monitor_handle_fd_param(Monitor *mon, const char *fdname) +{ + int fd; + + if (!qemu_isdigit(fdname[0]) && mon) { + + fd = monitor_get_fd(mon, fdname); + if (fd == -1) { + error_report("No file descriptor named %s found", fdname); + return -1; + } + } else { + fd = qemu_parse_fd(fdname); + } + + return fd; +} + /* mon_cmds and info_cmds would be sorted at runtime */ static mon_cmd_t mon_cmds[] = { #include "hmp-commands.h" |