diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-10-24 07:08:18 -0400 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-12-09 05:05:28 -0500 |
| commit | bd82752a831bc3c7a66b59572f82e06154f19e27 (patch) | |
| tree | a050cd50eb8cc237fa1c2d161d16627fab799a99 /drivers/vhost | |
| parent | 9465a7a6f12c2b5315c4070e50209a3b04eaf224 (diff) | |
vhost: make features 64 bit
We need to use bit 32 for virtio 1.0.
Make vhost_has_feature bool to avoid discarding high bits.
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/vhost.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 3eda654b8f5a..55a95c976f48 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h | |||
| @@ -106,7 +106,7 @@ struct vhost_virtqueue { | |||
| 106 | /* Protected by virtqueue mutex. */ | 106 | /* Protected by virtqueue mutex. */ |
| 107 | struct vhost_memory *memory; | 107 | struct vhost_memory *memory; |
| 108 | void *private_data; | 108 | void *private_data; |
| 109 | unsigned acked_features; | 109 | u64 acked_features; |
| 110 | /* Log write descriptors */ | 110 | /* Log write descriptors */ |
| 111 | void __user *log_base; | 111 | void __user *log_base; |
| 112 | struct vhost_log *log; | 112 | struct vhost_log *log; |
| @@ -172,8 +172,8 @@ enum { | |||
| 172 | (1ULL << VHOST_F_LOG_ALL), | 172 | (1ULL << VHOST_F_LOG_ALL), |
| 173 | }; | 173 | }; |
| 174 | 174 | ||
| 175 | static inline int vhost_has_feature(struct vhost_virtqueue *vq, int bit) | 175 | static inline bool vhost_has_feature(struct vhost_virtqueue *vq, int bit) |
| 176 | { | 176 | { |
| 177 | return vq->acked_features & (1 << bit); | 177 | return vq->acked_features & (1ULL << bit); |
| 178 | } | 178 | } |
| 179 | #endif | 179 | #endif |
