From patchwork Fri Oct 26 14:05:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 194518 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 069132C0093 for ; Sat, 27 Oct 2012 02:39:41 +1100 (EST) Received: from localhost ([::1]:35106 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRkcs-0008MG-Am for incoming@patchwork.ozlabs.org; Fri, 26 Oct 2012 10:11:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRkbi-0006dK-R7 for qemu-devel@nongnu.org; Fri, 26 Oct 2012 10:09:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TRkbb-0005f6-Cn for qemu-devel@nongnu.org; Fri, 26 Oct 2012 10:09:54 -0400 Received: from mail-bk0-f45.google.com ([209.85.214.45]:61615) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRkbb-0005Sp-5T for qemu-devel@nongnu.org; Fri, 26 Oct 2012 10:09:47 -0400 Received: by mail-bk0-f45.google.com with SMTP id jf3so1090170bkc.4 for ; Fri, 26 Oct 2012 07:09:46 -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=N4IEA83u0p9a3Q2EC4aTC81nZTjJ7CjoyhnfLGx8z58=; b=aaj2mpbQxxXAIAuBWPQJJZpp7InEaJYib6M1IbnBEXbyOCtzKRM5p073WFEEJs7RCQ kLGeEEuMR5iTmQDauUKMtO96FAhvx6S6Auzo1WmLcIl1f64w3ZI81oxeC5cHAiQT5Wco xCm2K9YN6y/WTeleuyjjUvC6DTDPawg1GHSm9GVR33xJieWNFAJAYUgr1sA/o56f6LjY qPjpt3KbBJNiISgRQ/DThoEK3Hg78IDcRuyaOqIIvXqtR1mCuQxw2g5A3sYY/Gtqclqo Z4M+91DYlWXCnv0kPu0rzMN6/ekDv2pzS+pqjRQBiZMO1Ujjq5UCENexT5orBH/M35hr qBJw== Received: by 10.204.128.138 with SMTP id k10mr7273957bks.27.1351260586812; Fri, 26 Oct 2012 07:09:46 -0700 (PDT) Received: from yakj.usersys.redhat.com (nat-pool-mxp-t.redhat.com. [209.132.186.18]) by mx.google.com with ESMTPS id s20sm1082468bkw.15.2012.10.26.07.09.45 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 26 Oct 2012 07:09:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 26 Oct 2012 16:05:44 +0200 Message-Id: <1351260355-19802-15-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1351260355-19802-1-git-send-email-pbonzini@redhat.com> References: <1351260355-19802-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.214.45 Cc: aliguori@us.ibm.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH 14/25] main-loop: use GSource to poll AIO file descriptors 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 This lets us remove the hooks for the main loop in async.c. Reviewed-by: Anthony Liguori Signed-off-by: Paolo Bonzini --- main-loop.c | 23 ++++++----------------- main-loop.h | 1 - 2 file modificati, 6 inserzioni(+), 18 rimozioni(-) diff --git a/main-loop.c b/main-loop.c index b290c79..209f699 100644 --- a/main-loop.c +++ b/main-loop.c @@ -205,6 +205,7 @@ static AioContext *qemu_aio_context; int main_loop_init(void) { int ret; + GSource *src; qemu_mutex_lock_iothread(); ret = qemu_signal_init(); @@ -219,6 +220,9 @@ int main_loop_init(void) } qemu_aio_context = aio_context_new(); + src = aio_get_g_source(qemu_aio_context); + g_source_attach(src, NULL); + g_source_unref(src); return 0; } @@ -481,8 +485,6 @@ int main_loop_wait(int nonblocking) if (nonblocking) { timeout = 0; - } else { - aio_bh_update_timeout(qemu_aio_context, &timeout); } /* poll any events */ @@ -505,10 +507,6 @@ int main_loop_wait(int nonblocking) qemu_run_all_timers(); - /* Check bottom-halves last in case any of the earlier events triggered - them. */ - qemu_bh_poll(); - return ret; } @@ -519,11 +517,6 @@ QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque) return aio_bh_new(qemu_aio_context, cb, opaque); } -int qemu_bh_poll(void) -{ - return aio_bh_poll(qemu_aio_context); -} - void qemu_aio_flush(void) { aio_flush(qemu_aio_context); @@ -543,16 +536,12 @@ void qemu_aio_set_fd_handler(int fd, { aio_set_fd_handler(qemu_aio_context, fd, io_read, io_write, io_flush, opaque); - - qemu_set_fd_handler2(fd, NULL, io_read, io_write, opaque); } +#endif void qemu_aio_set_event_notifier(EventNotifier *notifier, EventNotifierHandler *io_read, AioFlushEventNotifierHandler *io_flush) { - qemu_aio_set_fd_handler(event_notifier_get_fd(notifier), - (IOHandler *)io_read, NULL, - (AioFlushHandler *)io_flush, notifier); + aio_set_event_notifier(qemu_aio_context, notifier, io_read, io_flush); } -#endif diff --git a/main-loop.h b/main-loop.h index a337096..c58f38b 100644 --- a/main-loop.h +++ b/main-loop.h @@ -312,6 +312,5 @@ void qemu_iohandler_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds, int rc QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque); void qemu_bh_schedule_idle(QEMUBH *bh); -int qemu_bh_poll(void); #endif