From patchwork Wed Sep 28 12:36:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Franciosi X-Patchwork-Id: 9353795 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B0A8760756 for ; Wed, 28 Sep 2016 12:36:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2C881FFC9 for ; Wed, 28 Sep 2016 12:36:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9783C2892B; Wed, 28 Sep 2016 12:36:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 4ECBB1FFC9 for ; Wed, 28 Sep 2016 12:36:48 +0000 (UTC) Received: from localhost ([::1]:58469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpE6R-0000P9-Fm for patchwork-qemu-devel@patchwork.kernel.org; Wed, 28 Sep 2016 08:36:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52548) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpE5v-0000Jo-2q for qemu-devel@nongnu.org; Wed, 28 Sep 2016 08:36:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpE5p-0005w2-Th for qemu-devel@nongnu.org; Wed, 28 Sep 2016 08:36:13 -0400 Received: from 206-15-90-246.static.twtelecom.net ([206.15.90.246]:64088 helo=felipe-franciosi.localdomain) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpE5p-0005vH-Nj for qemu-devel@nongnu.org; Wed, 28 Sep 2016 08:36:09 -0400 Received: by felipe-franciosi.localdomain (Postfix, from userid 500) id 55B99103FA1; Wed, 28 Sep 2016 05:36:08 -0700 (PDT) From: Felipe Franciosi To: berrange@redhat.com, marcandre.lureau@redhat.com Date: Wed, 28 Sep 2016 05:36:05 -0700 Message-Id: <1475066167-17635-2-git-send-email-felipe@nutanix.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1475066167-17635-1-git-send-email-felipe@nutanix.com> References: <1475066167-17635-1-git-send-email-felipe@nutanix.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 206.15.90.246 Subject: [Qemu-devel] [PATCH v2 1/3] io: Fix double shift usages on QIOChannel features 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: pbonzini@redhat.com, qemu-devel@nongnu.org, Felipe Franciosi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP When QIOChannels were introduced in 666a3af9, the feature bits were already defined shifted. However, when using them, the code was shifting them again. The incorrect use was consistent until 74b6ce43, where QIO_CHANNEL_FEATURE_LISTEN was defined shifted but tested unshifted. This patch changes the definition to be unshifted and fixes the incorrect usage introduced on 74b6ce43. Signed-off-by: Felipe Franciosi --- include/io/channel.h | 6 +++--- io/channel-socket.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/io/channel.h b/include/io/channel.h index 752e89f..5368604 100644 --- a/include/io/channel.h +++ b/include/io/channel.h @@ -40,9 +40,9 @@ typedef struct QIOChannelClass QIOChannelClass; typedef enum QIOChannelFeature QIOChannelFeature; enum QIOChannelFeature { - QIO_CHANNEL_FEATURE_FD_PASS = (1 << 0), - QIO_CHANNEL_FEATURE_SHUTDOWN = (1 << 1), - QIO_CHANNEL_FEATURE_LISTEN = (1 << 2), + QIO_CHANNEL_FEATURE_FD_PASS, + QIO_CHANNEL_FEATURE_SHUTDOWN, + QIO_CHANNEL_FEATURE_LISTEN, }; diff --git a/io/channel-socket.c b/io/channel-socket.c index 196a4f1..6710b2e 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -403,7 +403,7 @@ static void qio_channel_socket_finalize(Object *obj) QIOChannelSocket *ioc = QIO_CHANNEL_SOCKET(obj); if (ioc->fd != -1) { - if (QIO_CHANNEL(ioc)->features & QIO_CHANNEL_FEATURE_LISTEN) { + if (QIO_CHANNEL(ioc)->features & (1 << QIO_CHANNEL_FEATURE_LISTEN)) { Error *err = NULL; socket_listen_cleanup(ioc->fd, &err);