lkml.org 
[lkml]   [2009]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCHv9 3/3] vhost_net: a kernel-level virtio server
    On Tue, Nov 10, 2009 at 01:49:09PM +1030, Rusty Russell wrote:
    > One fix:
    >
    > vhost: fix TUN=m VHOST_NET=y
    >
    > drivers/built-in.o: In function `get_tun_socket':
    > net.c:(.text+0x15436e): undefined reference to `tun_get_socket'
    >
    > Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    > ---
    > drivers/vhost/Kconfig | 2 +-
    > 1 file changed, 1 insertion(+), 1 deletion(-)
    >
    > diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig
    > --- a/drivers/vhost/Kconfig
    > +++ b/drivers/vhost/Kconfig
    > @@ -1,6 +1,6 @@
    > config VHOST_NET
    > tristate "Host kernel accelerator for virtio net (EXPERIMENTAL)"
    > - depends on NET && EVENTFD && EXPERIMENTAL
    > + depends on NET && EVENTFD && TUN && EXPERIMENTAL
    > ---help---
    > This kernel module can be loaded in host kernel to accelerate
    > guest networking with virtio_net. Not to be confused with virtio_net

    In fact, vhost can be built with TUN=n VHOST_NET=y as well
    (tun_get_socket is stubbed out in that case).
    So I think this is better (it looks strange
    until you realize that for tristate variables
    boolean logic math does not apply):

    --->

    From: Michael S. Tsirkin <mst@redhat.com>
    Subject: vhost: fix TUN=m VHOST_NET=y

    drivers/built-in.o: In function `get_tun_socket':
    net.c:(.text+0x15436e): undefined reference to `tun_get_socket'

    If tun is a module, vhost must be a module, too.
    If tun is built-in or disabled, vhost can be built-in.

    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

    ---

    diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig
    index 9f409f4..9e93553 100644
    --- a/drivers/vhost/Kconfig
    +++ b/drivers/vhost/Kconfig
    @@ -1,6 +1,6 @@
    config VHOST_NET
    tristate "Host kernel accelerator for virtio net (EXPERIMENTAL)"
    - depends on NET && EVENTFD && EXPERIMENTAL
    + depends on NET && EVENTFD && (TUN || !TUN) && EXPERIMENTAL
    ---help---
    This kernel module can be loaded in host kernel to accelerate
    guest networking with virtio_net. Not to be confused with virtio_net

    --
    MST


    \
     
     \ /
      Last update: 2009-11-10 12:43    [W:0.022 / U:3.620 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site