| Message ID | 20121030140450.GA27739@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Oct 30, 2012 at 04:04:50PM +0200, Michael S. Tsirkin wrote: > Add missing stubs to win32 to fix link failure. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > Reported-by: Paolo Bonzini <pbonzini@redhat.com> > --- > net/tap-win32.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > 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); > +} 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
On Tue, Oct 30, 2012 at 05:16:45PM +0100, Stefan Hajnoczi wrote: > On Tue, Oct 30, 2012 at 04:04:50PM +0200, Michael S. Tsirkin wrote: > > Add missing stubs to win32 to fix link failure. > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > Reported-by: Paolo Bonzini <pbonzini@redhat.com> > > --- > > net/tap-win32.c | 10 ++++++++++ > > 1 file changed, 10 insertions(+) > > > > 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); > > +} > > 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 No, virtio-net uses them too.
Thanks, applied. On Tue, Oct 30, 2012 at 2:04 PM, Michael S. Tsirkin <mst@redhat.com> wrote: > Add missing stubs to win32 to fix link failure. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > Reported-by: Paolo Bonzini <pbonzini@redhat.com> > --- > net/tap-win32.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > 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); > +} > -- > MST >
On Tue, Oct 30, 2012 at 06:22:45PM +0200, Michael S. Tsirkin wrote: > On Tue, Oct 30, 2012 at 05:16:45PM +0100, Stefan Hajnoczi wrote: > > On Tue, Oct 30, 2012 at 04:04:50PM +0200, Michael S. Tsirkin wrote: > > > Add missing stubs to win32 to fix link failure. > > > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > > Reported-by: Paolo Bonzini <pbonzini@redhat.com> > > > --- > > > net/tap-win32.c | 10 ++++++++++ > > > 1 file changed, 10 insertions(+) > > > > > > 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); > > > +} > > > > 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 > > 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
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); +}
Add missing stubs to win32 to fix link failure. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reported-by: Paolo Bonzini <pbonzini@redhat.com> --- net/tap-win32.c | 10 ++++++++++ 1 file changed, 10 insertions(+)