Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dd05a3b authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Michael S. Tsirkin
Browse files

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: default avatarStefan 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: default avatarNicholas A. Bellinger <nab@risingtidesystems.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 186e8687

drivers/vhost/net.c

+2 −2
Original line number Diff line number Diff line
@@ -823,14 +823,14 @@ static long vhost_net_ioctl(struct file *f, unsigned int ioctl, 
			return -EFAULT;

		return vhost_net_set_backend(n, backend.index, backend.fd);

	case VHOST_GET_FEATURES:

		features = VHOST_FEATURES;

		features = VHOST_NET_FEATURES;

		if (copy_to_user(featurep, &features, sizeof features))

			return -EFAULT;

		return 0;

	case VHOST_SET_FEATURES:

		if (copy_from_user(&features, featurep, sizeof features))

			return -EFAULT;

		if (features & ~VHOST_FEATURES)

		if (features & ~VHOST_NET_FEATURES)

			return -EOPNOTSUPP;

		return vhost_net_set_features(n, features);

	case VHOST_RESET_OWNER:

drivers/vhost/test.c

+2 −2
Original line number Diff line number Diff line
@@ -261,14 +261,14 @@ static long vhost_test_ioctl(struct file *f, unsigned int ioctl, 
			return -EFAULT;

		return vhost_test_run(n, test);

	case VHOST_GET_FEATURES:

		features = VHOST_FEATURES;

		features = VHOST_NET_FEATURES;

		if (copy_to_user(featurep, &features, sizeof features))

			return -EFAULT;

		return 0;

	case VHOST_SET_FEATURES:

		if (copy_from_user(&features, featurep, sizeof features))

			return -EFAULT;

		if (features & ~VHOST_FEATURES)

		if (features & ~VHOST_NET_FEATURES)

			return -EOPNOTSUPP;

		return vhost_test_set_features(n, features);

	case VHOST_RESET_OWNER:

drivers/vhost/vhost.h

+2 −1
Original line number Diff line number Diff line
@@ -201,7 +201,8 @@ enum { 
	VHOST_FEATURES = (1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) |

			 (1ULL << VIRTIO_RING_F_INDIRECT_DESC) |

			 (1ULL << VIRTIO_RING_F_EVENT_IDX) |

			 (1ULL << VHOST_F_LOG_ALL) |

			 (1ULL << VHOST_F_LOG_ALL),

	VHOST_NET_FEATURES = VHOST_FEATURES |

			 (1ULL << VHOST_NET_F_VIRTIO_NET_HDR) |

			 (1ULL << VIRTIO_NET_F_MRG_RXBUF),

};