From patchwork Tue Dec 8 11:57:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 7796561 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 37BBDBEEE1 for ; Tue, 8 Dec 2015 11:58:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 342D2204AE for ; Tue, 8 Dec 2015 11:58:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55BB3203DB for ; Tue, 8 Dec 2015 11:58:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752092AbbLHL5w (ORCPT ); Tue, 8 Dec 2015 06:57:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40808 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753438AbbLHL5s (ORCPT ); Tue, 8 Dec 2015 06:57:48 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 3AE0E755; Tue, 8 Dec 2015 11:57:48 +0000 (UTC) Received: from localhost (ovpn-112-72.ams2.redhat.com [10.36.112.72]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tB8Bvi7W001201; Tue, 8 Dec 2015 06:57:46 -0500 From: Stefan Hajnoczi To: netdev@vger.kernel.org Cc: Matt Benjamin , "David S. Miller" , kvm@vger.kernel.org, Christoffer Dall , "Michael S. Tsirkin" , virtualization@lists.linux-foundation.org, matt.ma@linaro.org, Stefan Hajnoczi Subject: [PATCH 1/6] Revert "VSOCK: fix returnvar.cocci warnings" Date: Tue, 8 Dec 2015 19:57:31 +0800 Message-Id: <1449575856-28507-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1449575856-28507-1-git-send-email-stefanha@redhat.com> References: <1449575856-28507-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 0d76d6e8b2507983a2cae4c09880798079007421. Keep virtio-vsock out-of-tree until the virtio-vsock device specification is finalized. Signed-off-by: Stefan Hajnoczi --- drivers/vhost/vsock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index 64bcb10..65b1cf8 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -56,7 +56,8 @@ struct vhost_vsock { static u32 vhost_transport_get_local_cid(void) { - return VHOST_VSOCK_DEFAULT_HOST_CID; + u32 cid = VHOST_VSOCK_DEFAULT_HOST_CID; + return cid; } static struct vhost_vsock *vhost_vsock_get(u32 guest_cid)