Commit 949d31e6 authored by Jes Sorensen's avatar Jes Sorensen Committed by Blue Swirl
Browse files

We only support eventfd under POSIX, move qemu_eventfd() to os-posix.c 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 70e72ce4

os-posix.c

+32 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ 
#include <sys/prctl.h>

#endif



#ifdef CONFIG_EVENTFD

#include <sys/eventfd.h>

#endif



static struct passwd *user_pwd;

static const char *chroot_dir;

static int daemonize;
@@ -329,3 +333,31 @@ void os_set_line_buffering(void) 
{

    setvbuf(stdout, NULL, _IOLBF, 0);

}



/*

 * Creates an eventfd that looks like a pipe and has EFD_CLOEXEC set.

 */

int qemu_eventfd(int fds[2])

{

#ifdef CONFIG_EVENTFD

    int ret;



    ret = eventfd(0, 0);

    if (ret >= 0) {

        fds[0] = ret;

        qemu_set_cloexec(ret);

        if ((fds[1] = dup(ret)) == -1) {

            close(ret);

            return -1;

        }

        qemu_set_cloexec(fds[1]);

        return 0;

    }



    if (errno != ENOSYS) {

        return -1;

    }

#endif



    return qemu_pipe(fds);

}

osdep.c

+0 −34
Original line number Diff line number Diff line
@@ -44,10 +44,6 @@ 
extern int madvise(caddr_t, size_t, int);

#endif



#ifdef CONFIG_EVENTFD

#include <sys/eventfd.h>

#endif



#ifdef _WIN32

#include <windows.h>

#elif defined(CONFIG_BSD)
@@ -207,36 +203,6 @@ ssize_t qemu_write_full(int fd, const void *buf, size_t count) 
    return total;

}



#ifndef _WIN32

/*

 * Creates an eventfd that looks like a pipe and has EFD_CLOEXEC set.

 */

int qemu_eventfd(int fds[2])

{

#ifdef CONFIG_EVENTFD

    int ret;



    ret = eventfd(0, 0);

    if (ret >= 0) {

        fds[0] = ret;

        qemu_set_cloexec(ret);

        if ((fds[1] = dup(ret)) == -1) {

            close(ret);

            return -1;

        }

        qemu_set_cloexec(fds[1]);

        return 0;

    }



    if (errno != ENOSYS) {

        return -1;

    }

#endif



    return qemu_pipe(fds);

}

#endif



/*

 * Opens a socket with FD_CLOEXEC set

 */