From patchwork Tue Dec 8 15:46:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7799341 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 12AB49F1C2 for ; Tue, 8 Dec 2015 15:46:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A231204D6 for ; Tue, 8 Dec 2015 15:46:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2BB6D204B5 for ; Tue, 8 Dec 2015 15:46:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965170AbbLHPqX (ORCPT ); Tue, 8 Dec 2015 10:46:23 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:65005 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965079AbbLHPqV (ORCPT ); Tue, 8 Dec 2015 10:46:21 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue003) with ESMTPSA (Nemesis) id 0Lx3Yj-1aLjha2H7J-016flB; Tue, 08 Dec 2015 16:46:11 +0100 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: "Michael S. Tsirkin" , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Asias He , Stefan Hajnoczi , "David S. Miller" Subject: [PATCH] vhost: vsock: select CONFIG_VHOST Date: Tue, 08 Dec 2015 16:46:08 +0100 Message-ID: <36261336.7BBY96nNaM@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:oDKXN2plk966QPUZllPBYtftlXLhB4f8JzgLbyLhsHbgGTvjBPr S3nmtFapJOqp9cDvmjXyIjDAaosa15siENuKgCgBo7ZmiPG3C9EiMnlbFtKDTDm1kN59UsT hh1BlS6N9BBWAMfTdbBJLmeOzdGOkvHoSNFu2FYzPw9R1BsbDw6FlhAKmGy5wCoJyV8qD/I 0G3kA1rBTUSndOAIodHgA== X-UI-Out-Filterresults: notjunk:1; V01:K0:VYPRTZv1DEI=:iDkTOf7yFhRNpB6dTg2diB +DZbi8/knsIICgkzSUtTbqGO1fI0+PgSZJ5stJGpAUL1TeGxKv1uLKkmIc/CU3lybBtp84hTW uOdg5yqsCOc1JBqsYlunRwdQZmds8o7hWXr+T9WTe1boEZfFWx7mEd26U+xozgcqDR0TGwYEW Ult0PeHBssOF3/puOwEWcYctCewEXEXC3oZRpx06ihL8SCXxrMqLd5edPZ+N3fjgZzpK8GDRU TD/v8+HbQZwCfuLxCRFLkFmLh/866cawz8g1KEjftMgP81vJ6COMZZjNylrVT/c3SjIJDnkFa uRwqvepdsORctRcHwSZvG8LIouprZtlfrj0cqRhXyuigrQviqI4j8WX3FhDIumu0MikkNmS+r uWFtQilfk540lz9q+18MW/Yah82DEk4nHr/zv+NyM1lOCOz1BkYYleXSsH2/5ytiK24lDYg6Y I1nMyxQxQtMMdxfn7ZrMh+kOlI2ztQhNzHgJbj/aTM+5m7wavk1z14e32COCH7QLCrOUs+yky JnK51+w9Qxp8GhdWRDkis8DIPtii/ClUZFlv51pSck9Dzm78IOMp7wSh1Umro3ccqn1vadyhE cu21/qQEGdQJCyM2GXjLuQEEMtb0F81JACh3J8AKrKOVOYAfnM9s29zbZne4FJ5qBcfi997C7 q95DArIYcIWIKpcB8IKffTUxmLvgtDBZShj2x/P0mychOhAYh44e+KuzY5cxFxv/0gfkf9Krm e5rRRv+KXgWCd44S Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When building the new vsock code without vhost, we get a build error: drivers/built-in.o: In function `vhost_vsock_flush': :(.text+0x24d29c): undefined reference to `vhost_poll_flush' This adds an explicit 'select' like we have for the other vhost drivers. Signed-off-by: Arnd Bergmann Acked-by: Michael S. Tsirkin --- drivers/vhost/Kconfig.vsock | 2 ++ 1 file changed, 2 insertions(+) The patch causing the problem is currently in net-next, so the fix should be applied on top of that. diff --git a/drivers/vhost/Kconfig.vsock b/drivers/vhost/Kconfig.vsock index 3491865d3eb9..bfb9edc4b5d6 100644 --- a/drivers/vhost/Kconfig.vsock +++ b/drivers/vhost/Kconfig.vsock @@ -2,6 +2,8 @@ config VHOST_VSOCK tristate "vhost virtio-vsock driver" depends on VSOCKETS && EVENTFD select VIRTIO_VSOCKETS_COMMON + select VHOST + select VHOST_RING default n ---help--- Say M here to enable the vhost-vsock for virtio-vsock guests