From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgFa-0005E9-Jc for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:47:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlgFX-0002Jg-8I for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:47:02 -0400 Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]:34246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgFW-0002JW-Vb for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:46:59 -0400 Received: by padhy16 with SMTP id hy16so158268314pad.1 for ; Mon, 12 Oct 2015 09:46:58 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Mon, 12 Oct 2015 18:41:16 +0200 Message-Id: <1444668104-22955-23-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> References: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL v2 22/50] ivshmem: use common return List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, drjones@redhat.com, claudio.fontana@huawei.com, stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com, cam@cs.ualberta.ca From: Marc-André Lureau Both if branches return, move this out to common end. Signed-off-by: Marc-André Lureau Reviewed-by: Claudio Fontana --- hw/misc/ivshmem.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index c054e52..fbb6f40 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -525,13 +525,12 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) if (incoming_posn >= 0 && s->vm_id == -1) { /* receive our posn */ s->vm_id = incoming_posn; - return; } else { /* otherwise an fd == -1 means an existing guest has gone away */ IVSHMEM_DPRINTF("posn %ld has gone away\n", incoming_posn); close_guest_eventfds(s, incoming_posn); - return; } + return; } /* if the position is -1, then it's shared memory region fd */ -- 2.4.3