From 09999a5f7fc8e3636feda4358a79a25a09467594 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Wed, 22 Jul 2015 12:32:25 +0300 Subject: virtio: set any_layout in virtio core Exceptions: - virtio-blk - compat machine types Signed-off-by: Michael S. Tsirkin --- hw/net/virtio-net.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'hw/net') diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 304d3ddde1..e2030582ce 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1777,8 +1777,6 @@ static void virtio_net_instance_init(Object *obj) } static Property virtio_net_properties[] = { - DEFINE_PROP_BIT("any_layout", VirtIONet, host_features, - VIRTIO_F_ANY_LAYOUT, true), DEFINE_PROP_BIT("csum", VirtIONet, host_features, VIRTIO_NET_F_CSUM, true), DEFINE_PROP_BIT("guest_csum", VirtIONet, host_features, VIRTIO_NET_F_GUEST_CSUM, true), -- cgit v1.2.3 From 9d5b731dd2d64deb3bc798ef4e3c08603d54ae02 Mon Sep 17 00:00:00 2001 From: Jason Wang Date: Mon, 27 Jul 2015 17:49:19 +0800 Subject: virtio: get_features() can fail Signed-off-by: Jason Wang Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Acked-by: Paolo Bonzini --- hw/net/virtio-net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/net') diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index e2030582ce..1510839547 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -446,7 +446,8 @@ static void virtio_net_set_queues(VirtIONet *n) static void virtio_net_set_multiqueue(VirtIONet *n, int multiqueue); -static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features) +static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features, + Error **errp) { VirtIONet *n = VIRTIO_NET(vdev); NetClientState *nc = qemu_get_queue(n->nic); -- cgit v1.2.3