From: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Krishna Kumar <krkumar2@in.ibm.com>,
Carsten Otte <cotte@de.ibm.com>,
lguest@lists.ozlabs.org, Shirley Ma <xma@us.ibm.com>,
kvm@vger.kernel.org, linux-s390@vger.kernel.org,
netdev@vger.kernel.org, habanero@linux.vnet.ibm.com,
Heiko Carstens <heiko.carstens@de.ibm.com>,
linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org, steved@us.ibm.com,
Christian Borntraeger <borntraeger@de.ibm.com>,
Tom Lendacky <tahm@linux.vnet.ibm.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
linux390@de.ibm.com
Subject: [PATCHv2 RFC 4/4] Revert "virtio: make add_buf return capacity remaining:
Date: Thu, 2 Jun 2011 18:43:25 +0300 [thread overview]
Message-ID: <7572d6fb81181e349af4a8b203ea0977f6e91ae1.1307029009.git.mst__9290.58735860071$1307029546$gmane$org@redhat.com> (raw)
In-Reply-To: <cover.1307029008.git.mst@redhat.com>
This reverts commit 3c1b27d5043086a485f8526353ae9fe37bfa1065.
The only user was virtio_net, and it switched to
min_capacity instead.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/virtio/virtio_ring.c | 2 +-
include/linux/virtio.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 23422f1..a6c21eb 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -233,7 +233,7 @@ add_head:
pr_debug("Added buffer head %i to %p\n", head, vq);
END_USE(vq);
- return vq->num_free;
+ return 0;
}
EXPORT_SYMBOL_GPL(virtqueue_add_buf_gfp);
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index 209220d..63c4908 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -34,7 +34,7 @@ struct virtqueue {
* in_num: the number of sg which are writable (after readable ones)
* data: the token identifying the buffer.
* gfp: how to do memory allocations (if necessary).
- * Returns remaining capacity of queue (sg segments) or a negative error.
+ * Returns 0 on success or a negative error.
* virtqueue_kick: update after add_buf
* vq: the struct virtqueue
* After one or more add_buf calls, invoke this to kick the other side.
--
1.7.5.53.gc233e
next prev parent reply other threads:[~2011-06-02 15:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1307029008.git.mst@redhat.com>
2011-06-02 15:42 ` [PATCHv2 RFC 1/4] virtio_ring: add capacity check API Michael S. Tsirkin
2011-06-02 15:43 ` [PATCHv2 RFC 2/4] virtio_net: fix tx capacity checks using new API Michael S. Tsirkin
2011-06-02 15:43 ` [PATCHv2 RFC 3/4] virtio_net: limit xmit polling Michael S. Tsirkin
2011-06-02 15:43 ` Michael S. Tsirkin [this message]
2011-06-02 17:17 ` [PATCHv2 RFC 0/4] virtio and vhost-net capacity handling Michael S. Tsirkin
[not found] ` <a80199422de16ae355e56ee1b2abc9b2bf91a7f6.1307029009.git.mst@redhat.com>
2011-06-02 18:09 ` [PATCHv2 RFC 3/4] virtio_net: limit xmit polling Sridhar Samudrala
[not found] ` <1307038193.2321.38.camel@w-sridhar.beaverton.ibm.com>
2011-06-02 19:23 ` Michael S. Tsirkin
2011-06-07 15:59 ` Michael S. Tsirkin
[not found] ` <20110602171721.GA13215@redhat.com>
2011-06-06 3:39 ` [PATCHv2 RFC 0/4] virtio and vhost-net capacity handling Rusty Russell
[not found] ` <7572d6fb81181e349af4a8b203ea0977f6e91ae1.1307029009.git.mst@redhat.com>
2011-06-07 15:54 ` [PATCHv2 RFC 4/4] Revert "virtio: make add_buf return capacity remaining: Michael S. Tsirkin
[not found] ` <20110607155457.GA17436@redhat.com>
2011-06-08 0:19 ` Rusty Russell
2011-06-07 16:08 ` [PATCHv2 RFC 0/4] virtio and vhost-net capacity handling Michael S. Tsirkin
[not found] ` <20110607160830.GB17581@redhat.com>
2011-06-13 13:32 ` Krishna Kumar2
[not found] ` <OFE36F9C2B.43D9DB04-ON652578AE.0048E1AB-652578AE.004A1462@in.ibm.com>
2011-06-13 13:35 ` Michael S. Tsirkin
2011-06-13 13:38 ` Krishna Kumar2
[not found] ` <20110613133513.GA29884@redhat.com>
2011-06-13 13:44 ` Krishna Kumar2
2011-06-19 8:53 ` Michael S. Tsirkin
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='7572d6fb81181e349af4a8b203ea0977f6e91ae1.1307029009.git.mst__9290.58735860071$1307029546$gmane$org@redhat.com' \
--to=mst@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cotte@de.ibm.com \
--cc=habanero@linux.vnet.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=krkumar2@in.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=lguest@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux390@de.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=schwidefsky@de.ibm.com \
--cc=steved@us.ibm.com \
--cc=tahm@linux.vnet.ibm.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=xma@us.ibm.com \
/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).