Commit 443916d1 authored by Stefan Berger's avatar Stefan Berger Committed by Anthony Liguori
Browse files

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: default avatarStefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent f809c0d6

cutils.c

+12 −0
Original line number Diff line number Diff line
@@ -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;

}

net.c

+1 −6
Original line number Diff line number Diff line
@@ -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;

qemu-common.h

+1 −0
Original line number Diff line number Diff line
@@ -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