[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/4] Revert "virtio-net: enable virtio 1.0"
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 3/4] Revert "virtio-net: enable virtio 1.0" |
Date: |
Mon, 13 Jul 2015 15:23:45 +0300 |
From: Jason Wang <address@hidden>
This reverts commit df91055db5c9cee93d70ca8c08d72119a240b987.
This is because:
- vhost support virtio 1.0 now
- transport code (e.g virtio-pci) set this feature when modern is
enabled, setting this unconditionally will break disable-modern=on.
Cc: Cornelia Huck <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/net/virtio-net.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index d728233..e3c2db3 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -466,7 +466,6 @@ static uint64_t virtio_net_get_features(VirtIODevice *vdev,
uint64_t features)
}
if (!get_vhost_net(nc->peer)) {
- virtio_add_feature(&features, VIRTIO_F_VERSION_1);
return features;
}
return vhost_net_get_features(get_vhost_net(nc->peer), features);
--
MST
- [Qemu-devel] [PULL 0/4] pc,virtio: fixes for 2.4, Michael S. Tsirkin, 2015/07/13
- [Qemu-devel] [PULL 0/4] pc,virtio: fixes for 2.4, Michael S. Tsirkin, 2015/07/13
- [Qemu-devel] [PULL 1/4] qdev: fix 64 bit properties, Michael S. Tsirkin, 2015/07/13
- [Qemu-devel] [PULL 3/4] Revert "virtio-net: enable virtio 1.0",
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 2/4] virtio-pci: don't crash on illegal length, Michael S. Tsirkin, 2015/07/13
- [Qemu-devel] [PULL 4/4] pc: fix reuse of pc-i440fx-2.4 in pc-i440fx-2.3, Michael S. Tsirkin, 2015/07/13
- Re: [Qemu-devel] [PULL 0/4] pc,virtio: fixes for 2.4, Peter Maydell, 2015/07/13