From patchwork Tue Feb 25 15:15:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 1244357 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=SmcH+XmX; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48RjQW5z7Cz9sNg for ; Wed, 26 Feb 2020 02:24:18 +1100 (AEDT) Received: from localhost ([::1]:58744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6c4G-00015X-2h for incoming@patchwork.ozlabs.org; Tue, 25 Feb 2020 10:24:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56187) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6bvU-0002ki-PF for qemu-devel@nongnu.org; Tue, 25 Feb 2020 10:15:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6bvT-00024e-Pz for qemu-devel@nongnu.org; Tue, 25 Feb 2020 10:15:12 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:55477 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6bvT-00023r-Kd for qemu-devel@nongnu.org; Tue, 25 Feb 2020 10:15:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582643710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=e+2ubfbEqLiNZyFIpP2Z+jeoSNKaTGCUsXcUvlVb6BQ=; b=SmcH+XmX0bD+93Ggke+LY4VNhmKb2kTI3v1dp/dYrwxdmaa/G5NWk5gP/s/hpLnVO1XapG qkMRFe0BJtFBDgbZcmr7cnAfy6W1Fp5Imx0tRrz2o+Lhc7BnqZiBtPaDYqJ1Enz7u4uRie EiV+KnSrVPNj5SQvDceVzb19o5ZT66Q= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-481-qNi1Kg1xP-uYtFn2iMONMg-1; Tue, 25 Feb 2020 10:15:08 -0500 X-MC-Unique: qNi1Kg1xP-uYtFn2iMONMg-1 Received: by mail-qt1-f200.google.com with SMTP id j5so4857813qtp.19 for ; Tue, 25 Feb 2020 07:15:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=c2crKeR2n2YvQ5rYnZd1NJPOMK8zXZOtMWZi9s0fZkM=; b=ITwrnfjXSD9CgG8dixm1sE50ipHcP4If2m20QBvbHfu7DZvyAC14/zW+iomRpUI/9l rlBO6hgihdcdlZXlzeujWUhw3vpHGjBVWMEtqm4RZg4XTDqYx3FqSMEtB0ztn/1kJx5N PHunoGwYsqiicMShZ745MDjpBA0qjS1wvfAofyNdgWUXYKebel3HAV70S59sjWO9HWXg DhGK1gl3JASTrs2tL9CvKY/HaM7vTTVKZBlEx6q2gvXW9a2VT8NlUheaq5uZCJice1ZZ VPL+zcCu0hvsmUgP2JU/UQJLacEjBrsNKbAt30/UKEz8P2Ib1Zh4Kp0qXCTdx4QxIJIS RCRw== X-Gm-Message-State: APjAAAWPrVJu/KOOxPRhieZf5+mo3yD5nww5GasTF4bOad4mjj3hKqwv TAqvZaeBRbZGLSFeSZWd6uHLmFwi0ERGmlreu0jjOsjoXIH/LkiaX/0CEIzWlzQAHotuv1QMk0/ EmS4ZI16cmEnPn54= X-Received: by 2002:ac8:1a8c:: with SMTP id x12mr56686242qtj.297.1582643707887; Tue, 25 Feb 2020 07:15:07 -0800 (PST) X-Google-Smtp-Source: APXvYqx7LbWoyyK9MoLk8toBltaGld046Gy5z24rpUEqBNjgJR5n4NzAfYJ6FqJ/fdrwFIgWokXShA== X-Received: by 2002:ac8:1a8c:: with SMTP id x12mr56686183qtj.297.1582643707487; Tue, 25 Feb 2020 07:15:07 -0800 (PST) Received: from redhat.com (bzq-79-178-2-214.red.bezeqint.net. [79.178.2.214]) by smtp.gmail.com with ESMTPSA id j127sm7471687qkc.36.2020.02.25.07.15.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 07:15:06 -0800 (PST) Date: Tue, 25 Feb 2020 10:15:02 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 31/32] virtiofsd: add it to the tools list Message-ID: <20200225151210.647797-32-mst@redhat.com> References: <20200225151210.647797-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200225151210.647797-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , Juan Quintela , Alex =?utf-8?q?Benn=C3=A9e?= , "Dr . David Alan Gilbert" , Stefan Hajnoczi , Paolo Bonzini , Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Laurent Vivier it will be built only when tools are enabled (always enabled by default) Signed-off-by: Laurent Vivier Reviewed-by: Dr. David Alan Gilbert Message-Id: <20200207095412.794912-2-lvivier@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Juan Quintela Reviewed-by: Stefan Hajnoczi --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 218b8259a4..ba8ffc9331 100644 --- a/Makefile +++ b/Makefile @@ -327,7 +327,7 @@ HELPERS-y += vhost-user-gpu$(EXESUF) vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json endif -ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) +ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG)$(CONFIG_TOOLS),yyyy) HELPERS-y += virtiofsd$(EXESUF) vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json endif @@ -697,7 +697,7 @@ rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) $(call LINK, $^) # relies on Linux-specific syscalls -ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) +ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG)$(CONFIG_TOOLS),yyyy) virtiofsd$(EXESUF): $(virtiofsd-obj-y) libvhost-user.a $(COMMON_LDADDS) $(call LINK, $^) endif