Merge remote-tracking branch 'origin/master' into threadpool

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/net/tap-win32.c b/net/tap-win32.c
index 22dad3f..8d2d32b 100644
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -752,3 +752,13 @@ struct vhost_net *tap_get_vhost_net(NetClientState *nc)
 {
     return NULL;
 }
+
+int tap_has_vnet_hdr_len(NetClientState *nc, int len)
+{
+    return 0;
+}
+
+void tap_set_vnet_hdr_len(NetClientState *nc, int len)
+{
+    assert(0);
+}