Skip to contentSkip to conversation

tap-win32: stubs to fix win32 build

PATCH Applied Michael S. Tsirkin 3 participants 5 messages Oct 30, 2012 – Oct 31, 2012 Networking

lore
Share & tools
lore

Michael S. Tsirkin

author
#0 lore raw

PATCH 1/1 tap-win32: stubs to fix win32 build

Add missing stubs to win32 to fix link failure.

Signed-off-by Michael S. Tsirkin <[email protected]>
Reported-by Paolo Bonzini <[email protected]>
---
 net/tap-win32.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
net/tap-win32.c +10 -0
index 22dad3f..8d2d32b 100644
@@ -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);
+}
Signature · 1 line
MST
#1 lore raw
Quoted 16 lines · Michael S. Tsirkin

Add missing stubs to win32 to fix link failure.

Signed-off-by Michael S. Tsirkin <[email protected]>
Reported-by Paolo Bonzini <[email protected]>
---
 net/tap-win32.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
net/tap-win32.c +0 -0
index 22dad3f..8d2d32b 100644
@@ -752,3 +752,13 @@ struct vhost_net *tap_get_vhost_net(NetClientState *nc)
 {
     return NULL;
 }

net/tap-win32.c struct vhost_net *tap_get_vhost_net(NetClientState *nc) · line 764

Quoted 10 lines
net/tap-win32.c +10 -0
+
+int tap_has_vnet_hdr_len(NetClientState *nc, int len)
+{
+    return 0;
+}
+
+void tap_set_vnet_hdr_len(NetClientState *nc, int len)
+{
+    assert(0);
+}

How do we get link failures here on win32? The only object that needs these functions is vhost_net.o when CONFIG_VHOST_NET is defined.

Stefan

author
#2 lore raw
Quoted 31 lines · Stefan Hajnoczi
Quoted 16 lines · Michael S. Tsirkin

Add missing stubs to win32 to fix link failure.

Signed-off-by Michael S. Tsirkin <[email protected]>
Reported-by Paolo Bonzini <[email protected]>
---
 net/tap-win32.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
net/tap-win32.c +0 -0
index 22dad3f..8d2d32b 100644
@@ -752,3 +752,13 @@ struct vhost_net *tap_get_vhost_net(NetClientState *nc)
 {
     return NULL;
 }

net/tap-win32.c struct vhost_net *tap_get_vhost_net(NetClientState *nc) · line 764

Quoted 10 lines
net/tap-win32.c +10 -0
+
+int tap_has_vnet_hdr_len(NetClientState *nc, int len)
+{
+    return 0;
+}
+
+void tap_set_vnet_hdr_len(NetClientState *nc, int len)
+{
+    assert(0);
+}

How do we get link failures here on win32? The only object that needs these functions is vhost_net.o when CONFIG_VHOST_NET is defined.

Quoted 1 line

Stefan

No, virtio-net uses them too.

#3 lore raw
Quoted 32 lines · Michael S. Tsirkin
Quoted 31 lines · Stefan Hajnoczi
Quoted 16 lines · Michael S. Tsirkin

Add missing stubs to win32 to fix link failure.

Signed-off-by Michael S. Tsirkin <[email protected]>
Reported-by Paolo Bonzini <[email protected]>
---
 net/tap-win32.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
net/tap-win32.c +0 -0
index 22dad3f..8d2d32b 100644
@@ -752,3 +752,13 @@ struct vhost_net *tap_get_vhost_net(NetClientState *nc)
 {
     return NULL;
 }

net/tap-win32.c struct vhost_net *tap_get_vhost_net(NetClientState *nc) · line 764

Quoted 10 lines
net/tap-win32.c +10 -0
+
+int tap_has_vnet_hdr_len(NetClientState *nc, int len)
+{
+    return 0;
+}
+
+void tap_set_vnet_hdr_len(NetClientState *nc, int len)
+{
+    assert(0);
+}

How do we get link failures here on win32? The only object that needs these functions is vhost_net.o when CONFIG_VHOST_NET is defined.

Quoted 3 lines
Quoted 1 line

Stefan

No, virtio-net uses them too.

Weird, git-grep(1) on qemu.git/master doesn't show calls to these functions from anywhere other than vhost_net.o.

Stefan

Applied
#4 lore raw
In reply to Michael S. Tsirkin

Thanks, applied.

Quoted 29 lines · Michael S. Tsirkin

Add missing stubs to win32 to fix link failure.

Signed-off-by Michael S. Tsirkin <[email protected]>
Reported-by Paolo Bonzini <[email protected]>
---
 net/tap-win32.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
net/tap-win32.c +10 -1
index 22dad3f..8d2d32b 100644
@@ -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);
+}
--

MST