From patchwork Thu Sep 24 11:37:23 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: 522267 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 541A1140281 for ; Thu, 24 Sep 2015 21:54:02 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=f8hdjRRl; dkim-atps=neutral Received: from localhost ([::1]:58135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zf568-0000S6-A6 for incoming@patchwork.ozlabs.org; Thu, 24 Sep 2015 07:54:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zf4rR-0007w9-Mm for qemu-devel@nongnu.org; Thu, 24 Sep 2015 07:38:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zf4rQ-0006qU-L8 for qemu-devel@nongnu.org; Thu, 24 Sep 2015 07:38:49 -0400 Received: from mail-qk0-x22a.google.com ([2607:f8b0:400d:c09::22a]:32831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zf4rQ-0006qI-AV for qemu-devel@nongnu.org; Thu, 24 Sep 2015 07:38:48 -0400 Received: by qkdw123 with SMTP id w123so28223132qkd.0 for ; Thu, 24 Sep 2015 04:38:48 -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=pvvuvXiT9St4BpRnmGMIj96OvE5qZ7jyuITkc1/yMl4=; b=f8hdjRRlmaQhlUM5dBIXZNjO+K8KCUvuDCXQ2OfUm5VFqvaOjR5q+Ptu6OP4O4zNZ/ eOlFj5rnYjZDjYU3Jjp0qB7DcD8soFjQ+wuuvekcIYWg9PCfhCxd4PwxYG8CxG8hJhRX 5kw1p5megj7v0mh4NejyqW/lVVptuzjmaBkHwhPNxyKgVqEj7XvgcOz5IDXK6yBG9l/R QiTEbsegzk1K+l9JiPJlB8nypHR8bYxONwWi8fWcCUelUqxezzUhGDyPYhTTUkH5RzkK QZ7FMeuxkqBDJhy//6xWeECfhWkN6HZrunNKtWjxLON78yshWDqkYBgyljk7FqPKgyyc KMtg== X-Received: by 10.55.15.3 with SMTP id z3mr42164502qkg.29.1443094728034; Thu, 24 Sep 2015 04:38:48 -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 f61sm3251717qga.44.2015.09.24.04.38.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2015 04:38:47 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Thu, 24 Sep 2015 13:37:23 +0200 Message-Id: <1443094669-4144-22-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1443094669-4144-1-git-send-email-marcandre.lureau@redhat.com> References: <1443094669-4144-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:c09::22a Cc: 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 Subject: [Qemu-devel] [PATCH v4 21/47] 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 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 c59d9ed..8ebc907 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 */