From patchwork Mon Jul 16 10:42:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 171158 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 384AB2C00C0 for ; Mon, 16 Jul 2012 20:43:48 +1000 (EST) Received: from localhost ([::1]:52998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SqimI-00020e-7X for incoming@patchwork.ozlabs.org; Mon, 16 Jul 2012 06:43:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sqilw-0001n7-V0 for qemu-devel@nongnu.org; Mon, 16 Jul 2012 06:43:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sqilq-0002W2-IE for qemu-devel@nongnu.org; Mon, 16 Jul 2012 06:43:24 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:59243) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sqilq-0002VZ-CH for qemu-devel@nongnu.org; Mon, 16 Jul 2012 06:43:18 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so10309848pbb.4 for ; Mon, 16 Jul 2012 03:43:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Ljp0k6ADTQ8HWnJAnTRtD7GUZXd0oPARq7WGJLU9BtE=; b=fDEooHTZ0TNYHBia4MDiQ3EQ2JTNlgm1ZFYDHi1/xP4B8jYpZr0ccIkSuf7pOBXZWG 9RAnLISEwMxOJUWVt7y3DAfdp4DiAV2Cqez/FNg6Z5BCm3ooFUEr/iNfUsH6zF6/yV7x jJ8NEfqqrkCSEa6uK1rU3YRHOVovG3BWgB77806Ga4kvNdFk5R9Rj5pw1sOGe1vLRnV/ emjcMbypzl0CKPnWhoRMlMTRNQlZkvXNRVvK7jI+tDXfq0TYtsGRNieJnnfOTJjlpqKF ZTWMUL0NW38hVt+6CIDmkkJ4WpKOXFWezzh4NL/LbwU63KMcyDHEgIdgshligqyrFuub 8A7g== Received: by 10.68.220.104 with SMTP id pv8mr25733450pbc.119.1342435397705; Mon, 16 Jul 2012 03:43:17 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-189-113.ip51.fastwebnet.it. [93.34.189.113]) by mx.google.com with ESMTPS id qi8sm11672097pbc.36.2012.07.16.03.43.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 16 Jul 2012 03:43:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 16 Jul 2012 12:42:47 +0200 Message-Id: <1342435377-25897-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342435377-25897-1-git-send-email-pbonzini@redhat.com> References: <1342435377-25897-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: kwolf@redhat.com, aliguori@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, sw@weilnetz.de Subject: [Qemu-devel] [PATCH 02/12] event_notifier: add Win32 implementation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The Win32 implementation of EventNotifier is a trivial wrapper around manual-reset events. Signed-off-by: Paolo Bonzini --- Makefile.objs | 4 +- event_notifier.c => event_notifier-posix.c | 0 event_notifier-win32.c | 59 ++++++++++++++++++++++++++++ event_notifier.h | 17 +++++++- 4 files changed, 77 insertions(+), 3 deletions(-) rename event_notifier.c => event_notifier-posix.c (100%) create mode 100644 event_notifier-win32.c diff --git a/Makefile.objs b/Makefile.objs index 625c4d5..ecdfaf9 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -45,6 +45,8 @@ block-obj-y = cutils.o cache-utils.o qemu-option.o module.o async.o block-obj-y += nbd.o block.o aio.o aes.o qemu-config.o qemu-progress.o qemu-sockets.o block-obj-y += $(coroutine-obj-y) $(qobject-obj-y) $(version-obj-y) block-obj-$(CONFIG_POSIX) += posix-aio-compat.o +block-obj-$(CONFIG_POSIX) += event_notifier-posix.o +block-obj-$(CONFIG_WIN32) += event_notifier-win32.o block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o block-obj-y += block/ @@ -90,7 +92,7 @@ common-obj-y += bt-host.o bt-vhci.o 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 common-obj-$(CONFIG_SLIRP) += slirp/ diff --git a/event_notifier.c b/event_notifier-posix.c similarity index 100% rename from event_notifier.c rename to event_notifier-posix.c diff --git a/event_notifier-win32.c b/event_notifier-win32.c new file mode 100644 index 0000000..c723dad --- /dev/null +++ b/event_notifier-win32.c @@ -0,0 +1,59 @@ +/* + * event notifier support for Win32 + * + * Copyright Red Hat, Inc. 2012 + * + * Authors: + * Paolo Bonzini + * + * 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-common.h" +#include "event_notifier.h" +#include "main-loop.h" + +int event_notifier_init(EventNotifier *e, int active) +{ + e->event = CreateEvent(NULL, FALSE, FALSE, NULL); + assert(e->event); + return 0; +} + +void event_notifier_cleanup(EventNotifier *e) +{ + CloseHandle(e->event); +} + +HANDLE event_notifier_get_handle(EventNotifier *e) +{ + return e->event; +} + +int event_notifier_set_handler(EventNotifier *e, + EventNotifierHandler *handler) +{ + if (handler) { + return qemu_add_wait_object(e->event, (IOHandler *)handler, e); + } else { + qemu_del_wait_object(e->event, (IOHandler *)handler, e); + return 0; + } +} + +int event_notifier_set(EventNotifier *e) +{ + SetEvent(e->event); + return 0; +} + +int event_notifier_test_and_clear(EventNotifier *e) +{ + int ret = WaitForSingleObject(e->event, 0); + if (ret == WAIT_OBJECT_0) { + ResetEvent(e->event); + return true; + } + return false; +} diff --git a/event_notifier.h b/event_notifier.h index f04d12d..88b57af 100644 --- a/event_notifier.h +++ b/event_notifier.h @@ -15,19 +15,32 @@ #include "qemu-common.h" +#ifdef _WIN32 +#include +#endif + struct EventNotifier { +#ifdef _WIN32 + HANDLE event; +#else int rfd; int wfd; +#endif }; typedef void EventNotifierHandler(EventNotifier *); -void event_notifier_init_fd(EventNotifier *, int fd); int event_notifier_init(EventNotifier *, int active); void event_notifier_cleanup(EventNotifier *); -int event_notifier_get_fd(EventNotifier *); int event_notifier_set(EventNotifier *); int event_notifier_test_and_clear(EventNotifier *); int event_notifier_set_handler(EventNotifier *, EventNotifierHandler *); +#ifdef CONFIG_POSIX +void event_notifier_init_fd(EventNotifier *, int fd); +int event_notifier_get_fd(EventNotifier *); +#else +HANDLE event_notifier_get_handle(EventNotifier *); +#endif + #endif