Linux virtualization list
 help / color / mirror / Atom feed
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: [PATCH 03/18] vhost: fix 64 bit features
Date: Wed, 4 May 2011 23:50:52 +0300	[thread overview]
Message-ID: <c69b269bd53b79aba852a124e96afdb8e64d1c82.1304541919.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1304541918.git.mst@redhat.com>

Update vhost_has_feature to make it work correctly for bit > 32.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 drivers/vhost/vhost.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index b3363ae..0f1bf33 100644
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -117,7 +117,7 @@ struct vhost_dev {
 	struct vhost_memory __rcu *memory;
 	struct mm_struct *mm;
 	struct mutex mutex;
-	unsigned acked_features;
+	u64 acked_features;
 	struct vhost_virtqueue *vqs;
 	int nvqs;
 	struct file *log_file;
@@ -169,14 +169,14 @@ enum {
 			 (1 << VIRTIO_NET_F_MRG_RXBUF),
 };
 
-static inline int vhost_has_feature(struct vhost_dev *dev, int bit)
+static inline bool vhost_has_feature(struct vhost_dev *dev, int bit)
 {
-	unsigned acked_features;
+	u64 acked_features;
 
 	/* TODO: check that we are running from vhost_worker or dev mutex is
 	 * held? */
 	acked_features = rcu_dereference_index_check(dev->acked_features, 1);
-	return acked_features & (1 << bit);
+	return acked_features & (1ull << bit);
 }
 
 #endif
-- 
1.7.5.53.gc233e

  parent reply	other threads:[~2011-05-04 20:50 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1304541918.git.mst@redhat.com>
2011-05-04 20:50 ` [PATCH 01/18] virtio: 64 bit features Michael S. Tsirkin
2011-05-04 20:50 ` [PATCH 02/18] virtio_test: update for " Michael S. Tsirkin
2011-05-04 20:50 ` Michael S. Tsirkin [this message]
2011-05-04 20:51 ` [PATCH 04/18] virtio: don't delay avail index update Michael S. Tsirkin
2011-05-04 20:51 ` [PATCH 05/18] virtio: used event index interface Michael S. Tsirkin
2011-05-04 21:56   ` Tom Lendacky
     [not found]   ` <201105041656.11009.tahm@linux.vnet.ibm.com>
2011-05-05  9:38     ` Michael S. Tsirkin
2011-05-04 20:51 ` [PATCH 06/18] virtio_ring: avail " Michael S. Tsirkin
2011-05-09  4:13   ` Rusty Russell
     [not found]   ` <87aaewh5pg.fsf@rustcorp.com.au>
2011-05-15 12:47     ` Michael S. Tsirkin
     [not found]     ` <20110515124727.GA24932@redhat.com>
2011-05-16  6:23       ` Rusty Russell
     [not found]       ` <87k4drduzs.fsf@rustcorp.com.au>
2011-05-17  6:00         ` Michael S. Tsirkin
     [not found]         ` <20110517060052.GB26989@redhat.com>
2011-05-18  0:08           ` Rusty Russell
2011-05-04 20:51 ` [PATCH 07/18] virtio ring: inline function to check for events Michael S. Tsirkin
2011-05-04 20:51 ` [PATCH 08/18] virtio_ring: support for used_event idx feature Michael S. Tsirkin
2011-05-09  4:17   ` Rusty Russell
     [not found]   ` <878vugh5ib.fsf@rustcorp.com.au>
2011-05-15 12:47     ` Michael S. Tsirkin
2011-05-04 20:51 ` [PATCH 09/18] virtio: use avail_event index Michael S. Tsirkin
2011-05-04 21:58   ` Tom Lendacky
     [not found]   ` <201105041658.19917.tahm@linux.vnet.ibm.com>
2011-05-05  9:34     ` Michael S. Tsirkin
2011-05-09  4:33   ` Rusty Russell
     [not found]   ` <874o54h4rt.fsf@rustcorp.com.au>
2011-05-15 13:55     ` Michael S. Tsirkin
     [not found]     ` <20110515135541.GF24932@redhat.com>
2011-05-16  7:12       ` Rusty Russell
     [not found]       ` <87ei3zdsq2.fsf@rustcorp.com.au>
2011-05-17  6:10         ` Michael S. Tsirkin
2011-05-17 16:23         ` Tom Lendacky
     [not found]         ` <20110517061031.GC26989@redhat.com>
2011-05-18  0:19           ` Rusty Russell
     [not found]           ` <87tycsn9lt.fsf@rustcorp.com.au>
2011-05-18  5:43             ` Michael S. Tsirkin
2011-05-19  7:27             ` Michael S. Tsirkin
2011-05-04 20:51 ` [PATCH 10/18] vhost: utilize used_event index Michael S. Tsirkin
2011-05-04 20:52 ` [PATCH 11/18] vhost: support avail_event idx Michael S. Tsirkin
2011-05-04 20:52 ` [PATCH 12/18] virtio_test: support used_event index Michael S. Tsirkin
2011-05-04 20:52 ` [PATCH 13/18] virtio_test: avail_event index support Michael S. Tsirkin
2011-05-04 20:52 ` [PATCH 14/18] virtio: add api for delayed callbacks Michael S. Tsirkin
2011-05-09  5:57   ` Rusty Russell
     [not found]   ` <871v08h0vm.fsf@rustcorp.com.au>
2011-05-15 12:48     ` Michael S. Tsirkin
     [not found]     ` <20110515124818.GD24932@redhat.com>
2011-05-16  7:13       ` Rusty Russell
     [not found]       ` <87boz3dsoe.fsf@rustcorp.com.au>
2011-05-19  7:24         ` Michael S. Tsirkin
     [not found]         ` <20110519072412.GA31253@redhat.com>
2011-05-20  7:43           ` Rusty Russell
2011-05-04 20:52 ` [PATCH 15/18] virtio_net: delay TX callbacks Michael S. Tsirkin
2011-05-04 20:52 ` [PATCH 16/18] virtio_ring: Add capacity check API Michael S. Tsirkin
2011-05-04 20:53 ` [PATCH 17/18] virtio_net: fix TX capacity checks using new API Michael S. Tsirkin
2011-05-04 20:53 ` [PATCH 18/18] virtio_net: limit xmit polling Michael S. Tsirkin
     [not found] ` <cc4596a5ecdbf8dd37b5567a36667e3841f18ca3.1304541919.git.mst@redhat.com>
2011-05-05  8:34   ` [PATCH 07/18] virtio ring: inline function to check for events Stefan Hajnoczi
     [not found]   ` <BANLkTi=eH-iK7L2LBAm0eqidapqXqhSqxw@mail.gmail.com>
2011-05-05  8:56     ` Michael S. Tsirkin
2011-05-05 15:07 ` [PATCH 0/3] virtio and vhost-net performance enhancements Michael S. Tsirkin
2011-05-11 17:10 ` [PATCH 00/18] " Krishna Kumar2

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=c69b269bd53b79aba852a124e96afdb8e64d1c82.1304541919.git.mst@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