diff options
author | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2012-07-21 02:55:36 -0400 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2012-07-21 18:21:53 -0400 |
commit | 0dd05a3b60ddf0e216fbd9e5116a5273966fd9db (patch) | |
tree | 43ff17c3511b5cdbb3c8ccc00d24005c3e07aaf5 /drivers/vhost/net.c | |
parent | 186e868786f97c8026f0a81400b451ace306b3a4 (diff) |
vhost: Separate vhost-net features from vhost features
In order for other vhost devices to use the VHOST_FEATURES bits the
vhost-net specific bits need to be moved to their own VHOST_NET_FEATURES
constant.
(Asias: Update drivers/vhost/test.c to use VHOST_NET_FEATURES)
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Cc: Zhi Yong Wu <wuzhy@cn.ibm.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Asias He <asias@redhat.com>
Signed-off-by: Nicholas A. Bellinger <nab@risingtidesystems.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vhost/net.c')
-rw-r--r-- | drivers/vhost/net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index f82a7394756e..072cbbadbc36 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c | |||
@@ -823,14 +823,14 @@ static long vhost_net_ioctl(struct file *f, unsigned int ioctl, | |||
823 | return -EFAULT; | 823 | return -EFAULT; |
824 | return vhost_net_set_backend(n, backend.index, backend.fd); | 824 | return vhost_net_set_backend(n, backend.index, backend.fd); |
825 | case VHOST_GET_FEATURES: | 825 | case VHOST_GET_FEATURES: |
826 | features = VHOST_FEATURES; | 826 | features = VHOST_NET_FEATURES; |
827 | if (copy_to_user(featurep, &features, sizeof features)) | 827 | if (copy_to_user(featurep, &features, sizeof features)) |
828 | return -EFAULT; | 828 | return -EFAULT; |
829 | return 0; | 829 | return 0; |
830 | case VHOST_SET_FEATURES: | 830 | case VHOST_SET_FEATURES: |
831 | if (copy_from_user(&features, featurep, sizeof features)) | 831 | if (copy_from_user(&features, featurep, sizeof features)) |
832 | return -EFAULT; | 832 | return -EFAULT; |
833 | if (features & ~VHOST_FEATURES) | 833 | if (features & ~VHOST_NET_FEATURES) |
834 | return -EOPNOTSUPP; | 834 | return -EOPNOTSUPP; |
835 | return vhost_net_set_features(n, features); | 835 | return vhost_net_set_features(n, features); |
836 | case VHOST_RESET_OWNER: | 836 | case VHOST_RESET_OWNER: |