From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ea0he-0003le-EK for qemu-devel@nongnu.org; Fri, 12 Jan 2018 09:53:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ea0hd-0005gE-3E for qemu-devel@nongnu.org; Fri, 12 Jan 2018 09:53:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33562) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ea0hc-0005fX-Sc for qemu-devel@nongnu.org; Fri, 12 Jan 2018 09:53:05 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F0B2712E4E9 for ; Fri, 12 Jan 2018 14:53:03 +0000 (UTC) From: Gerd Hoffmann Date: Fri, 12 Jan 2018 15:52:54 +0100 Message-Id: <20180112145258.10578-6-kraxel@redhat.com> In-Reply-To: <20180112145258.10578-1-kraxel@redhat.com> References: <20180112145258.10578-1-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 5/9] spice: remove only written event_mask field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Frediano Ziglio , Gerd Hoffmann From: Frediano Ziglio Signed-off-by: Frediano Ziglio Message-id: 20171122135625.16625-3-fziglio@redhat.com Signed-off-by: Gerd Hoffmann --- ui/spice-core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ui/spice-core.c b/ui/spice-core.c index 85b9ea2127..6d579faaae 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -89,7 +89,6 @@ static void timer_remove(SpiceTimer *timer) struct SpiceWatch { int fd; - int event_mask; SpiceWatchFunc func; void *opaque; }; @@ -111,11 +110,10 @@ static void watch_update_mask(SpiceWatch *watch, int event_mask) IOHandler *on_read = NULL; IOHandler *on_write = NULL; - watch->event_mask = event_mask; - if (watch->event_mask & SPICE_WATCH_EVENT_READ) { + if (event_mask & SPICE_WATCH_EVENT_READ) { on_read = watch_read; } - if (watch->event_mask & SPICE_WATCH_EVENT_WRITE) { + if (event_mask & SPICE_WATCH_EVENT_WRITE) { on_write = watch_write; } qemu_set_fd_handler(watch->fd, on_read, on_write, watch); -- 2.9.3