From patchwork Tue Mar 2 18:43:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 46691 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D0FABB7D40 for ; Wed, 3 Mar 2010 05:57:40 +1100 (EST) Received: from localhost ([127.0.0.1]:53146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NmXHM-0002F2-BQ for incoming@patchwork.ozlabs.org; Tue, 02 Mar 2010 13:57:12 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NmX7S-0005sz-Oy for qemu-devel@nongnu.org; Tue, 02 Mar 2010 13:47:00 -0500 Received: from [199.232.76.173] (port=39594 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NmX7R-0005sX-HM for qemu-devel@nongnu.org; Tue, 02 Mar 2010 13:46:57 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NmX7P-0003pC-PM for qemu-devel@nongnu.org; Tue, 02 Mar 2010 13:46:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:24905) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NmX7P-0003p8-96 for qemu-devel@nongnu.org; Tue, 02 Mar 2010 13:46:55 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o22IkrLs025782 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 2 Mar 2010 13:46:53 -0500 Received: from redhat.com (dhcp-0-94.tlv.redhat.com [10.35.0.94]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id o22Ikoq4000811; Tue, 2 Mar 2010 13:46:51 -0500 Date: Tue, 2 Mar 2010 20:43:33 +0200 From: "Michael S. Tsirkin" To: Anthony Liguori , qemu-devel@nongnu.org Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mutt-Fcc: =sent User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: amit.shah@redhat.com, kraxel@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCHv3 03/12] notifier: event notifier implementation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org event notifiers are slightly generalized eventfd descriptors. Current implementation depends on eventfd because vhost is the only user, and vhost depends on eventfd anyway, but a stub is provided for non-eventfd case. We'll be able to further generalize this when another user comes along and we see how to best do this. Signed-off-by: Michael S. Tsirkin --- Makefile.target | 1 + hw/notifier.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/notifier.h | 16 ++++++++++++++ qemu-common.h | 1 + 4 files changed, 80 insertions(+), 0 deletions(-) create mode 100644 hw/notifier.c create mode 100644 hw/notifier.h diff --git a/Makefile.target b/Makefile.target index 320f807..1f5aa9d 100644 --- a/Makefile.target +++ b/Makefile.target @@ -172,6 +172,7 @@ obj-y = vl.o async.o monitor.o pci.o pci_host.o pcie_host.o machine.o gdbstub.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o +obj-y += notifier.o obj-y += rwhandler.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_ISA_MMIO) += isa_mmio.o diff --git a/hw/notifier.c b/hw/notifier.c new file mode 100644 index 0000000..c6db3c3 --- /dev/null +++ b/hw/notifier.c @@ -0,0 +1,62 @@ +/* + * 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. See + * the COPYING file in the top-level directory. + */ + +#include "hw.h" +#include "notifier.h" +#ifdef CONFIG_EVENTFD +#include +#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/hw/notifier.h b/hw/notifier.h new file mode 100644 index 0000000..24117ea --- /dev/null +++ b/hw/notifier.h @@ -0,0 +1,16 @@ +#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 diff --git a/qemu-common.h b/qemu-common.h index 805be1a..f12a8f5 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -227,6 +227,7 @@ typedef struct uWireSlave uWireSlave; typedef struct I2SCodec I2SCodec; typedef struct DeviceState DeviceState; typedef struct SSIBus SSIBus; +typedef struct EventNotifier EventNotifier; typedef uint64_t pcibus_t;