diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-13 13:35:51 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-13 13:35:51 +0100 |
| commit | f3a1b5068cea303a55e2a21a97e66d057eaae638 (patch) | |
| tree | 63fa73c263a51b643c5f6e29776c7fc7c6734645 /hw/net | |
| parent | 6e3c0c6edbdddb8dd676bec1ac51b5faffc19a77 (diff) | |
| parent | 4421c6a38a37d558b8e6f82d2d54aee30350f57f (diff) | |
| download | qemu-f3a1b5068cea303a55e2a21a97e66d057eaae638.zip qemu-f3a1b5068cea303a55e2a21a97e66d057eaae638.tar.gz qemu-f3a1b5068cea303a55e2a21a97e66d057eaae638.tar.bz2 | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc,virtio: fixes for 2.4
pc and virtio changes, bugfixes only.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon Jul 13 13:03:38 2015 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
pc: fix reuse of pc-i440fx-2.4 in pc-i440fx-2.3
Revert "virtio-net: enable virtio 1.0"
virtio-pci: don't crash on illegal length
qdev: fix 64 bit properties
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net')
| -rw-r--r-- | hw/net/virtio-net.c | 1 |
1 files changed, 0 insertions, 1 deletions
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); |