From patchwork Tue Nov 8 13:55:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 692319 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tCrTw3Njpz9t2b for ; Wed, 9 Nov 2016 00:57:24 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AM47+Dp4"; dkim-atps=neutral Received: from localhost ([::1]:33184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c46tu-0008Rp-7m for incoming@patchwork.ozlabs.org; Tue, 08 Nov 2016 08:57:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c46s9-00076N-W0 for qemu-devel@nongnu.org; Tue, 08 Nov 2016 08:55:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c46s7-0004IT-OF for qemu-devel@nongnu.org; Tue, 08 Nov 2016 08:55:34 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:35903) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c46s7-0004HU-HX; Tue, 08 Nov 2016 08:55:31 -0500 Received: by mail-wm0-x242.google.com with SMTP id c17so22733046wmc.3; Tue, 08 Nov 2016 05:55:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Pl+vm4+b2dFvrV9Zdrme7gY+3WBEb5u3CfBSzGlvTT8=; b=AM47+Dp4lcrNiY9s5evQg16xgM9x5csJpYY2PlM1mBEeXc6X8kTPGzIuIfTtGT/hQh 9zV1JgBM+ZMTYxAG4k+cNOvgsfXh59UrWLHDGoMSoT24VyJhPzzBMFpOi7V9cXrAs3JT outOzQM4WSKnpS0QCDamU9cwjjZp/NmAq5tj0pV34wg/Cd5EsRkcvabZS1UXY7LvE88b zaflYfRWkwt+5LZFaWmlvRPWR0gbtVsXwS1LhgmMy6klyzQ1ScTlrtJSEeubgAHM74ku YKzBYdAGI4wJuV6PkM2VuTKthV3WddFOlp5TgC2Wnghihlmf0ASGH+vUh5uv6nNNS5rP NdJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Pl+vm4+b2dFvrV9Zdrme7gY+3WBEb5u3CfBSzGlvTT8=; b=ch38R9FszcmAtbTdegOn81ScL0gl/zZVXZX/r3QmjM8JfuwFeKtOHQ+m+dIEqHhU7d YOLSiWBVJ1iy2eTKXw7pyGNL4EObXzTusV7IS89QltKGOOIOclOqp9bYogEDiViIfNoV CxatyLe5YI8W2W5lHjpOXjc5oSsL9oBE2A9FyQ3uiNO4wQ8O5urkOXhvdJBpoCaKHxTI oIMLd2R7jtMaQ6z+IfbyYYnyTKuV0XbX6TttMjv0O1K3usb1ZTjdk9nrg6vdWm2L3Ck8 0oDTHISD1gYn8/aNrlH4W/dlIqnic+PniCJ68HMwMw9+BClXHgTSUlxb0S+RB/W5rMa5 9o2A== X-Gm-Message-State: ABUngvfhgNermwB1gnD9l2Z2NjSGUci3801+BlwZ5RDgy+gl2sD6ehk1JgDQRuPugE6I/w== X-Received: by 10.28.25.68 with SMTP id 65mr12151656wmz.93.1478613329998; Tue, 08 Nov 2016 05:55:29 -0800 (PST) Received: from donizetti.lan (dynamic-adsl-78-12-246-178.clienti.tiscali.it. [78.12.246.178]) by smtp.gmail.com with ESMTPSA id i10sm37269952wjd.15.2016.11.08.05.55.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Nov 2016 05:55:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 8 Nov 2016 14:55:24 +0100 Message-Id: <20161108135524.25927-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161108135524.25927-1-pbonzini@redhat.com> References: <20161108135524.25927-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PATCH 2/2] aio-posix: simplify aio_epoll_update 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: kwolf@redhat.com, famz@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Extract common code out of the "if". Reviewed-by: Fam Zheng Signed-off-by: Paolo Bonzini --- aio-posix.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/aio-posix.c b/aio-posix.c index ec908f7..d54553d 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -81,29 +81,22 @@ static void aio_epoll_update(AioContext *ctx, AioHandler *node, bool is_new) { struct epoll_event event; int r; + int ctl; if (!ctx->epoll_enabled) { return; } if (!node->pfd.events) { - r = epoll_ctl(ctx->epollfd, EPOLL_CTL_DEL, node->pfd.fd, &event); - if (r) { - aio_epoll_disable(ctx); - } + ctl = EPOLL_CTL_DEL; } else { event.data.ptr = node; event.events = epoll_events_from_pfd(node->pfd.events); - if (is_new) { - r = epoll_ctl(ctx->epollfd, EPOLL_CTL_ADD, node->pfd.fd, &event); - if (r) { - aio_epoll_disable(ctx); - } - } else { - r = epoll_ctl(ctx->epollfd, EPOLL_CTL_MOD, node->pfd.fd, &event); - if (r) { - aio_epoll_disable(ctx); - } - } + ctl = is_new ? EPOLL_CTL_ADD : EPOLL_CTL_MOD; + } + + r = epoll_ctl(ctx->epollfd, ctl, node->pfd.fd, &event); + if (r) { + aio_epoll_disable(ctx); } }