From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bxDhf-0001HV-Nn for qemu-devel@nongnu.org; Thu, 20 Oct 2016 09:48:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bxDhe-0005FX-4S for qemu-devel@nongnu.org; Thu, 20 Oct 2016 09:48:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60998) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bxDhd-0005FJ-VS for qemu-devel@nongnu.org; Thu, 20 Oct 2016 09:48:14 -0400 From: "Daniel P. Berrange" Date: Thu, 20 Oct 2016 14:47:57 +0100 Message-Id: <1476971286-10612-2-git-send-email-berrange@redhat.com> In-Reply-To: <1476971286-10612-1-git-send-email-berrange@redhat.com> References: <1476971286-10612-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PULL v1 01/10] io: Fix double shift usages on QIOChannel features List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Felipe Franciosi , "Daniel P . Berrange" From: Felipe Franciosi 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 Signed-off-by: Daniel P. Berrange --- 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); -- 2.7.4