From bb756eebdac6fd24e8919e2c43f7d2c8c4091f59 Mon Sep 17 00:00:00 2001 From: RajithaY Date: Tue, 25 Apr 2017 03:31:15 -0700 Subject: Adding qemu as a submodule of KVMFORNFV This Patch includes the changes to add qemu as a submodule to kvmfornfv repo and make use of the updated latest qemu for the execution of all testcase Change-Id: I1280af507a857675c7f81d30c95255635667bdd7 Signed-off-by:RajithaY --- qemu/util/event_notifier-posix.c | 132 --------------------------------------- 1 file changed, 132 deletions(-) delete mode 100644 qemu/util/event_notifier-posix.c (limited to 'qemu/util/event_notifier-posix.c') diff --git a/qemu/util/event_notifier-posix.c b/qemu/util/event_notifier-posix.c deleted file mode 100644 index c1f0d79b3..000000000 --- a/qemu/util/event_notifier-posix.c +++ /dev/null @@ -1,132 +0,0 @@ -/* - * event notifier support - * - * Copyright Red Hat, Inc. 2010 - * - * Authors: - * Michael S. Tsirkin - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - */ - -#include "qemu/osdep.h" -#include "qemu-common.h" -#include "qemu/cutils.h" -#include "qemu/event_notifier.h" -#include "sysemu/char.h" -#include "qemu/main-loop.h" - -#ifdef CONFIG_EVENTFD -#include -#endif - -#ifdef CONFIG_EVENTFD -/* - * Initialize @e with existing file descriptor @fd. - * @fd must be a genuine eventfd object, emulation with pipe won't do. - */ -void event_notifier_init_fd(EventNotifier *e, int fd) -{ - e->rfd = fd; - e->wfd = fd; -} -#endif - -int event_notifier_init(EventNotifier *e, int active) -{ - int fds[2]; - int ret; - -#ifdef CONFIG_EVENTFD - ret = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); -#else - ret = -1; - errno = ENOSYS; -#endif - if (ret >= 0) { - e->rfd = e->wfd = ret; - } else { - if (errno != ENOSYS) { - return -errno; - } - if (qemu_pipe(fds) < 0) { - return -errno; - } - ret = fcntl_setfl(fds[0], O_NONBLOCK); - if (ret < 0) { - ret = -errno; - goto fail; - } - ret = fcntl_setfl(fds[1], O_NONBLOCK); - if (ret < 0) { - ret = -errno; - goto fail; - } - e->rfd = fds[0]; - e->wfd = fds[1]; - } - if (active) { - event_notifier_set(e); - } - return 0; - -fail: - close(fds[0]); - close(fds[1]); - return ret; -} - -void event_notifier_cleanup(EventNotifier *e) -{ - if (e->rfd != e->wfd) { - close(e->rfd); - } - close(e->wfd); -} - -int event_notifier_get_fd(const EventNotifier *e) -{ - return e->rfd; -} - -int event_notifier_set_handler(EventNotifier *e, - bool is_external, - EventNotifierHandler *handler) -{ - aio_set_fd_handler(iohandler_get_aio_context(), e->rfd, is_external, - (IOHandler *)handler, NULL, e); - return 0; -} - -int event_notifier_set(EventNotifier *e) -{ - static const uint64_t value = 1; - ssize_t ret; - - do { - ret = write(e->wfd, &value, sizeof(value)); - } while (ret < 0 && errno == EINTR); - - /* EAGAIN is fine, a read must be pending. */ - if (ret < 0 && errno != EAGAIN) { - return -errno; - } - return 0; -} - -int event_notifier_test_and_clear(EventNotifier *e) -{ - int value; - ssize_t len; - char buffer[512]; - - /* Drain the notify pipe. For eventfd, only 8 bytes will be read. */ - value = 0; - do { - len = read(e->rfd, buffer, sizeof(buffer)); - value |= (len > 0); - } while ((len == -1 && errno == EINTR) || len == sizeof(buffer)); - - return value; -} -- cgit 1.2.3-korg