Commit 8570a6e7 authored by Asias He's avatar Asias He Committed by Michael S. Tsirkin
Browse files

vhost: Move VHOST_NET_FEATURES to net.c 



vhost.h should not depend on device specific marcos like
VHOST_NET_F_VIRTIO_NET_HDR and VIRTIO_NET_F_MRG_RXBUF.

Signed-off-by: default avatarAsias He <asias@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent b1ad8496

drivers/vhost/net.c

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,12 @@ MODULE_PARM_DESC(experimental_zcopytx, "Enable Zero Copy TX;" 


#define VHOST_DMA_IS_DONE(len) ((len) >= VHOST_DMA_DONE_LEN)



enum {

	VHOST_NET_FEATURES = VHOST_FEATURES |

			 (1ULL << VHOST_NET_F_VIRTIO_NET_HDR) |

			 (1ULL << VIRTIO_NET_F_MRG_RXBUF),

};



enum {

	VHOST_NET_VQ_RX = 0,

	VHOST_NET_VQ_TX = 1,

drivers/vhost/vhost.h

+0 −3
Original line number Diff line number Diff line
@@ -178,9 +178,6 @@ enum { 
			 (1ULL << VIRTIO_RING_F_INDIRECT_DESC) |

			 (1ULL << VIRTIO_RING_F_EVENT_IDX) |

			 (1ULL << VHOST_F_LOG_ALL),

	VHOST_NET_FEATURES = VHOST_FEATURES |

			 (1ULL << VHOST_NET_F_VIRTIO_NET_HDR) |

			 (1ULL << VIRTIO_NET_F_MRG_RXBUF),

};



static inline int vhost_has_feature(struct vhost_dev *dev, int bit)