diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-09-19 14:31:34 +0200 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2016-09-20 12:13:14 +0000 |
| commit | e83b7d5d01f8c0033f60b12f1af84e69bc85aade (patch) | |
| tree | a404e8814c27f6cb70b85913951dac4d21202367 /vnet | |
| parent | 3bb0c504621ba300e843cc4c9f5fe433375b22b7 (diff) | |
vhost-user: announce VIRTIO_F_VERSION_1
On some setups with QEMU 2.7.0 and xenial guests following
error message is reported in guest dmesg:
[ 0.895944] virtio_net virtio3: virtio: device uses modern interface
but does not have VIRTIO_F_VERSION_1
Change-Id: I5a0b3beffe75c9b0344d377098d94923b2ad7ae9
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet')
| -rw-r--r-- | vnet/vnet/devices/virtio/vhost-user.c | 3 | ||||
| -rw-r--r-- | vnet/vnet/devices/virtio/vhost-user.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/vnet/vnet/devices/virtio/vhost-user.c b/vnet/vnet/devices/virtio/vhost-user.c index 59daf871200..76c682f53b7 100644 --- a/vnet/vnet/devices/virtio/vhost-user.c +++ b/vnet/vnet/devices/virtio/vhost-user.c @@ -390,7 +390,8 @@ vhost_user_socket_read (unix_file_t * uf) (1 << FEAT_VIRTIO_F_INDIRECT_DESC) | (1 << FEAT_VHOST_F_LOG_ALL) | (1 << FEAT_VIRTIO_NET_F_GUEST_ANNOUNCE) | - (1 << FEAT_VHOST_USER_F_PROTOCOL_FEATURES); + (1 << FEAT_VHOST_USER_F_PROTOCOL_FEATURES) | + (1UL << FEAT_VIRTIO_F_VERSION_1); msg.u64 &= vui->feature_mask; msg.size = sizeof (msg.u64); diff --git a/vnet/vnet/devices/virtio/vhost-user.h b/vnet/vnet/devices/virtio/vhost-user.h index fa41403874b..0108ffa9ba3 100644 --- a/vnet/vnet/devices/virtio/vhost-user.h +++ b/vnet/vnet/devices/virtio/vhost-user.h @@ -55,7 +55,8 @@ _ (VIRTIO_F_INDIRECT_DESC, 28) \ _ (VHOST_F_LOG_ALL, 26) \ _ (VIRTIO_NET_F_GUEST_ANNOUNCE, 21) \ - _ (VHOST_USER_F_PROTOCOL_FEATURES, 30) + _ (VHOST_USER_F_PROTOCOL_FEATURES, 30) \ + _ (VIRTIO_F_VERSION_1, 32) typedef enum |