2e83913
verify that peer is tap before checking for vhost net
2e83913
2e83913
Reported-by: Shirley Ma <mashirle@us.ibm.com>
2e83913
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2e83913
---
2e83913
 hw/virtio-net.c |    4 ++++
2e83913
 1 files changed, 4 insertions(+), 0 deletions(-)
2e83913
2e83913
diff --git a/hw/virtio-net.c b/hw/virtio-net.c
2e83913
index 088029b..b28fd92 100644
2e83913
--- a/hw/virtio-net.c
2e83913
+++ b/hw/virtio-net.c
2e83913
@@ -179,6 +179,10 @@ static uint32_t virtio_net_get_features(VirtIODevice *vdev, uint32_t features)
2e83913
         features &= ~(0x1 << VIRTIO_NET_F_HOST_UFO);
2e83913
     }
2e83913
 
2e83913
+    if (!n->nic->nc.peer ||
2e83913
+	n->nic->nc.peer->info->type != NET_CLIENT_TYPE_TAP) {
2e83913
+        return features;
2e83913
+    }
2e83913
     if (!tap_get_vhost_net(n->nic->nc.peer)) {
2e83913
         return features;
2e83913
     }
2e83913
-- 
2e83913
1.6.6.144.g5c3af