From patchwork Tue Oct 6 19:19:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 526946 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:4830:134:3::10]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 21C62140D89 for ; Wed, 7 Oct 2015 06:34:17 +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=c+OKyRRl; dkim-atps=neutral Received: from lists.gnu.org ([208.118.235.17]:60726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjY07-0004Oa-3z for incoming@patchwork.ozlabs.org; Tue, 06 Oct 2015 15:34:15 -0400 Received: from localhost ([::1]:53406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjY07-00037R-0B for incoming@patchwork.ozlabs.org; Tue, 06 Oct 2015 15:34:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXo9-0001Y0-Ok for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:22:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjXnN-0004nw-R0 for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:21:53 -0400 Received: from mail-qg0-x231.google.com ([2607:f8b0:400d:c04::231]:36781) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXnN-0004l0-6p for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:21:05 -0400 Received: by qgx61 with SMTP id 61so184004156qgx.3 for ; Tue, 06 Oct 2015 12:21:04 -0700 (PDT) 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 :mime-version:content-type:content-transfer-encoding; bh=xRo6h4tqObZ7cpolwECtBCEpG6Vrj/4rqUKRfOi881w=; b=c+OKyRRlrCuGTE7hWo3H2a0WZn5/y2pmA8NZpdY/8QB4xxLvVcIYY1hFgUbU9PmyGd ekr4mUzDplF0aA/1JWKY0fLWd/Juuc0cnjii/tG1g287hX2+6iCQ5Vq9IRO3THrpN32E +9iE/P+p+7XscYNHtlYtjdlDAzmtFZYBgNu7Vy+FHHFCrk0csIpwQrNQTZeM1p6baV6K 8/evt1AREJaax/SDd53kI1HaCda7MbhwDwX1Ug6iOAmjA/SOgC3+dZSGbStrB1knnfC9 i+3pHURDLRDqsoNCf8AXQtjLzr47SsQIOt6d6I8OJXXVb07s/rHr7ETwWlJsuvxxX2hU DTHQ== X-Received: by 10.141.28.69 with SMTP id f66mr49106437qhe.67.1444159264683; Tue, 06 Oct 2015 12:21:04 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id t77sm14524974qgt.24.2015.10.06.12.21.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 12:21:03 -0700 (PDT) From: marcandre.lureau@redhat.com To: peter.maydell@linaro.org Date: Tue, 6 Oct 2015 21:19:17 +0200 Message-Id: <1444159184-18153-22-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1444159184-18153-1-git-send-email-marcandre.lureau@redhat.com> References: <1444159184-18153-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::231 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 21/48] ivshmem: use common return X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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 */