From patchwork Fri Apr 22 10:56:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 8909631 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AC4FA9F1D3 for ; Fri, 22 Apr 2016 10:57:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D2A820149 for ; Fri, 22 Apr 2016 10:57:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 671CB20145 for ; Fri, 22 Apr 2016 10:57:43 +0000 (UTC) Received: from localhost ([::1]:59182 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atYmM-0000Vg-Pg for patchwork-qemu-devel@patchwork.kernel.org; Fri, 22 Apr 2016 06:57:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atYkr-00068Y-Py for qemu-devel@nongnu.org; Fri, 22 Apr 2016 06:56:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1atYkr-0005uu-0Q for qemu-devel@nongnu.org; Fri, 22 Apr 2016 06:56:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36840) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atYko-0005uQ-SC; Fri, 22 Apr 2016 06:56:06 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6AC6C37E64; Fri, 22 Apr 2016 10:56:06 +0000 (UTC) Received: from ad.usersys.redhat.com (dhcp-15-133.nay.redhat.com [10.66.15.133]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3MAu0WC018089; Fri, 22 Apr 2016 06:56:03 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 22 Apr 2016 18:56:00 +0800 Message-Id: <1461322564-17440-2-git-send-email-famz@redhat.com> In-Reply-To: <1461322564-17440-1-git-send-email-famz@redhat.com> References: <1461322564-17440-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 for-2.6 1/5] iohandler: Introduce iohandler_get_aio_context X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, "Michael S. Tsirkin" , Jeff Cody , Max Reitz , Stefan Hajnoczi , Paolo Bonzini Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Fam Zheng Reviewed-by: Michael S. Tsirkin --- include/qemu/main-loop.h | 1 + iohandler.c | 6 ++++++ stubs/Makefile.objs | 1 + stubs/iohandler.c | 8 ++++++++ 4 files changed, 16 insertions(+) create mode 100644 stubs/iohandler.c diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index 9976909..19b5de3 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -204,6 +204,7 @@ void qemu_set_fd_handler(int fd, void *opaque); GSource *iohandler_get_g_source(void); +AioContext *iohandler_get_aio_context(void); #ifdef CONFIG_POSIX /** * qemu_add_child_watch: Register a child process for reaping. diff --git a/iohandler.c b/iohandler.c index 3f23433..f2fc8a9 100644 --- a/iohandler.c +++ b/iohandler.c @@ -44,6 +44,12 @@ static void iohandler_init(void) } } +AioContext *iohandler_get_aio_context(void) +{ + iohandler_init(); + return iohandler_ctx; +} + GSource *iohandler_get_g_source(void) { iohandler_init(); diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index b6d1e65..4b258a6 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -40,3 +40,4 @@ stub-obj-y += qmp_pc_dimm_device_list.o stub-obj-y += target-monitor-defs.o stub-obj-y += target-get-monitor-def.o stub-obj-y += vhost.o +stub-obj-y += iohandler.o diff --git a/stubs/iohandler.c b/stubs/iohandler.c new file mode 100644 index 0000000..22b0ee5 --- /dev/null +++ b/stubs/iohandler.c @@ -0,0 +1,8 @@ +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "qemu/main-loop.h" + +AioContext *iohandler_get_aio_context(void) +{ + abort(); +}