diff options
| author | Stefan Berger <stefanb@linux.vnet.ibm.com> | 2011-09-28 06:41:32 -0400 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-11-01 16:52:08 -0500 |
| commit | 443916d1d9f1094a43d28c6b8cc60e3e7e27eb36 (patch) | |
| tree | 960cdab08620defed8855e9d8101418fc78b03c6 | |
| parent | f809c0d66bf1d9a8a4282b5a089b7eead45428fc (diff) | |
| download | focaccia-qemu-443916d1d9f1094a43d28c6b8cc60e3e7e27eb36.tar.gz focaccia-qemu-443916d1d9f1094a43d28c6b8cc60e3e7e27eb36.zip | |
Move filedescriptor parsing code from net.c into qemu_parse_fd()
Move the parsing of a filedescriptor into a common function qemu_parse_fd() so others can use it as well. Have net.c call this function. v2: - moving qemu_parse_fd into cutils.c Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | cutils.c | 12 | ||||
| -rw-r--r-- | net.c | 7 | ||||
| -rw-r--r-- | qemu-common.h | 1 |
3 files changed, 14 insertions, 6 deletions
diff --git a/cutils.c b/cutils.c index c91f88732e..5d995bc4e5 100644 --- a/cutils.c +++ b/cutils.c @@ -415,3 +415,15 @@ int64_t strtosz(const char *nptr, char **end) { return strtosz_suffix(nptr, end, STRTOSZ_DEFSUFFIX_MB); } + +int qemu_parse_fd(const char *param) +{ + int fd; + char *endptr = NULL; + + fd = strtol(param, &endptr, 10); + if (*endptr || (fd == 0 && param == endptr)) { + return -1; + } + return fd; +} diff --git a/net.c b/net.c index d05930c91f..cb52050bfd 100644 --- a/net.c +++ b/net.c @@ -733,12 +733,7 @@ int net_handle_fd_param(Monitor *mon, const char *param) return -1; } } else { - char *endptr = NULL; - - fd = strtol(param, &endptr, 10); - if (*endptr || (fd == 0 && param == endptr)) { - return -1; - } + fd = qemu_parse_fd(param); } return fd; diff --git a/qemu-common.h b/qemu-common.h index 1c15cb17a7..2ce47aa12d 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -129,6 +129,7 @@ time_t mktimegm(struct tm *tm); int qemu_fls(int i); int qemu_fdatasync(int fd); int fcntl_setfl(int fd, int flag); +int qemu_parse_fd(const char *param); /* * strtosz() suffixes used to specify the default treatment of an |