Commit 4e9fa50c authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

vhost: move features to core 



virtio 1 and any layout are core features, move them
there. This fixes vhost test.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent ddab2c0e

drivers/vhost/net.c

+1 −2
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ MODULE_PARM_DESC(experimental_zcopytx, "Enable Zero Copy TX;" 
enum {

	VHOST_NET_FEATURES = VHOST_FEATURES |

			 (1ULL << VHOST_NET_F_VIRTIO_NET_HDR) |

			 (1ULL << VIRTIO_NET_F_MRG_RXBUF) |

			 (1ULL << VIRTIO_F_VERSION_1),

			 (1ULL << VIRTIO_NET_F_MRG_RXBUF)

};



enum {

drivers/vhost/scsi.c

+1 −3
Original line number Diff line number Diff line
@@ -166,9 +166,7 @@ enum { 
/* Note: can't set VIRTIO_F_VERSION_1 yet, since that implies ANY_LAYOUT. */

enum {

	VHOST_SCSI_FEATURES = VHOST_FEATURES | (1ULL << VIRTIO_SCSI_F_HOTPLUG) |

					       (1ULL << VIRTIO_SCSI_F_T10_PI) |

					       (1ULL << VIRTIO_F_ANY_LAYOUT) |

					       (1ULL << VIRTIO_F_VERSION_1)

					       (1ULL << VIRTIO_SCSI_F_T10_PI)

};



#define VHOST_SCSI_MAX_TARGET	256

drivers/vhost/test.c

+3 −0
Original line number Diff line number Diff line
@@ -277,10 +277,13 @@ static long vhost_test_ioctl(struct file *f, unsigned int ioctl, 
			return -EFAULT;

		return 0;

	case VHOST_SET_FEATURES:

		printk(KERN_ERR "1\n");

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

			return -EFAULT;

		printk(KERN_ERR "2\n");

		if (features & ~VHOST_FEATURES)

			return -EOPNOTSUPP;

		printk(KERN_ERR "3\n");

		return vhost_test_set_features(n, features);

	case VHOST_RESET_OWNER:

		return vhost_test_reset_owner(n);

drivers/vhost/vhost.h

+3 −1
Original line number Diff line number Diff line
@@ -173,7 +173,9 @@ 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) |

			 (1ULL << VIRTIO_F_ANY_LAYOUT) |

			 (1ULL << VIRTIO_F_VERSION_1)

};



static inline bool vhost_has_feature(struct vhost_virtqueue *vq, int bit)