Obsoleted by QemuEvent. Signed-off-by: Jan Kiszka <jan.kis...@siemens.com> --- Makefile.objs | 2 +- event_notifier.c | 61 ------------------------------------------------------ event_notifier.h | 28 ------------------------ 3 files changed, 1 insertions(+), 90 deletions(-) delete mode 100644 event_notifier.c delete mode 100644 event_notifier.h
diff --git a/Makefile.objs b/Makefile.objs index 377bfe2..755b672 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -183,7 +183,7 @@ common-obj-$(CONFIG_VNC) += $(addprefix ui/, $(vnc-obj-y)) common-obj-y += iov.o acl.o common-obj-$(CONFIG_POSIX) += compatfd.o -common-obj-y += notify.o event_notifier.o +common-obj-y += notify.o common-obj-y += qemu-timer.o qemu-timer-common.o slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o diff --git a/event_notifier.c b/event_notifier.c deleted file mode 100644 index 0b82981..0000000 --- a/event_notifier.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * event notifier support - * - * Copyright Red Hat, Inc. 2010 - * - * Authors: - * Michael S. Tsirkin <m...@redhat.com> - * - * 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 "event_notifier.h" -#ifdef CONFIG_EVENTFD -#include <sys/eventfd.h> -#endif - -int event_notifier_init(EventNotifier *e, int active) -{ -#ifdef CONFIG_EVENTFD - int fd = eventfd(!!active, EFD_NONBLOCK | EFD_CLOEXEC); - if (fd < 0) - return -errno; - e->fd = fd; - return 0; -#else - return -ENOSYS; -#endif -} - -void event_notifier_cleanup(EventNotifier *e) -{ - close(e->fd); -} - -int event_notifier_get_fd(EventNotifier *e) -{ - return e->fd; -} - -int event_notifier_test_and_clear(EventNotifier *e) -{ - uint64_t value; - int r = read(e->fd, &value, sizeof(value)); - return r == sizeof(value); -} - -int event_notifier_test(EventNotifier *e) -{ - uint64_t value; - int r = read(e->fd, &value, sizeof(value)); - if (r == sizeof(value)) { - /* restore previous value. */ - int s = write(e->fd, &value, sizeof(value)); - /* never blocks because we use EFD_SEMAPHORE. - * If we didn't we'd get EAGAIN on overflow - * and we'd have to write code to ignore it. */ - assert(s == sizeof(value)); - } - return r == sizeof(value); -} diff --git a/event_notifier.h b/event_notifier.h deleted file mode 100644 index 886222c..0000000 --- a/event_notifier.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * event notifier support - * - * Copyright Red Hat, Inc. 2010 - * - * Authors: - * Michael S. Tsirkin <m...@redhat.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - */ - -#ifndef QEMU_EVENT_NOTIFIER_H -#define QEMU_EVENT_NOTIFIER_H - -#include "qemu-common.h" - -struct EventNotifier { - int fd; -}; - -int event_notifier_init(EventNotifier *, int active); -void event_notifier_cleanup(EventNotifier *); -int event_notifier_get_fd(EventNotifier *); -int event_notifier_test_and_clear(EventNotifier *); -int event_notifier_test(EventNotifier *); - -#endif -- 1.7.3.4