From: Stefan Hajnoczi <stefanha@redhat.com>
To: netdev@vger.kernel.org
Cc: Matt Benjamin <mbenjamin@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
kvm@vger.kernel.org,
Christoffer Dall <christoffer.dall@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
virtualization@lists.linux-foundation.org, matt.ma@linaro.org,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PATCH 1/6] Revert "VSOCK: fix returnvar.cocci warnings"
Date: Tue, 8 Dec 2015 19:57:31 +0800 [thread overview]
Message-ID: <1449575856-28507-2-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1449575856-28507-1-git-send-email-stefanha@redhat.com>
This reverts commit 0d76d6e8b2507983a2cae4c09880798079007421.
Keep virtio-vsock out-of-tree until the virtio-vsock device
specification is finalized.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
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)
--
2.5.0
next prev parent reply other threads:[~2015-12-08 11:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-08 11:57 [PATCH 0/6] VSOCK: revert virtio-vsock until device spec is finalized Stefan Hajnoczi
2015-12-08 11:57 ` Stefan Hajnoczi [this message]
2015-12-08 11:57 ` [PATCH 2/6] Revert "VSOCK: Add Makefile and Kconfig" Stefan Hajnoczi
2015-12-08 11:57 ` [PATCH 3/6] Revert "VSOCK: Introduce vhost-vsock.ko" Stefan Hajnoczi
2015-12-08 11:57 ` [PATCH 4/6] Revert "VSOCK: Introduce virtio-vsock.ko" Stefan Hajnoczi
2015-12-08 11:57 ` [PATCH 5/6] Revert "VSOCK: Introduce virtio-vsock-common.ko" Stefan Hajnoczi
2015-12-08 11:57 ` [PATCH 6/6] Revert "VSOCK: Introduce vsock_find_unbound_socket and vsock_bind_dgram_generic" Stefan Hajnoczi
2015-12-08 16:26 ` [PATCH 0/6] VSOCK: revert virtio-vsock until device spec is finalized David Miller
2015-12-09 2:39 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449575856-28507-2-git-send-email-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=christoffer.dall@linaro.org \
--cc=davem@davemloft.net \
--cc=kvm@vger.kernel.org \
--cc=matt.ma@linaro.org \
--cc=mbenjamin@redhat.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).