From nobody Mon Feb 9 02:28:25 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605006788; cv=none; d=zohomail.com; s=zohoarc; b=U1YaphcKKxn3o5tig+mwhIFYuc2QvKUHMA0QNizaPSCBuP/Ll7KGiSlMYuFQcMt71qEKuTIXvgyT/zh58fdnv1obdeADtPmCYYLMKNKSWGXclTZXzv7a24Ynmg8uflqPDwQX9acJ5fdhMFouV3Sg0WnkIABWWHNJ41sCIwxFb+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605006788; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/UKzrkAmiiKjEejuCRdRdDKhHfnLoGaNHvoNpTaUF7A=; b=UGyfCeTMDDDlvaUJRnBNtHRyh0+FQuHcW4xLWDKCxm1UFacDuJoN2t/8NwmWv1FEP8MqUrOsDOR6MP+0mEXWD934CD0IFgKcpinXEKk+dM5s+O+gRpi19ePoF+MRCr67cEksFTOCZQ9ZLyGmvbANLont9zIMCkAIHMJejeuaVoY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605006788193376.0749080253478; Tue, 10 Nov 2020 03:13:08 -0800 (PST) Received: from localhost ([::1]:52940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRaF-00008m-15 for importer@patchew.org; Tue, 10 Nov 2020 06:13:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRYy-0006sf-Qp for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:11:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47626) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcRYv-0004Vx-Vs for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:11:48 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-539-IvC7JJR3O0mYOm-kb5rJrA-1; Tue, 10 Nov 2020 06:11:40 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 973BF1006713; Tue, 10 Nov 2020 11:11:39 +0000 (UTC) Received: from thuth.com (ovpn-113-192.ams2.redhat.com [10.36.113.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2BC521002C11; Tue, 10 Nov 2020 11:11:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605006705; 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=/UKzrkAmiiKjEejuCRdRdDKhHfnLoGaNHvoNpTaUF7A=; b=WQxAiQh6M0jcV2nkbzPIAxxdaxIX2U+Br1+zJ0NdK5+M3r8SYBQ7cFyDY3JrlBjmB1xqZ/ cWfY5RJtgqF7ViSI6zBKfPu3eKjddGEHxy0u0LjzkDkQk42qJ++0RASV8/ZSr7Z0PDcOau xJlGhCI3VXMqvjRKa5Q/YH+BWk0L5uM= X-MC-Unique: IvC7JJR3O0mYOm-kb5rJrA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 01/19] meson: always include contrib/libvhost-user Date: Tue, 10 Nov 2020 12:11:14 +0100 Message-Id: <20201110111132.559399-2-thuth@redhat.com> In-Reply-To: <20201110111132.559399-1-thuth@redhat.com> References: <20201110111132.559399-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/10 02:00:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Alexander Bulekov , Cornelia Huck Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Stefan Hajnoczi libvhost-user is needed when CONFIG_LINUX is set. The CONFIG_VHOST_USER check in meson.build is incorrect. In fact, no explicit check is needed since this dependency is not built by default. If something declares a dependency on libvhost-user then it will be built, otherwise it won't be built (i.e. on non-Linux hosts). This fixes ./configure --disable-vhost-user && make. Fixes: bc15e44cb2191bbb2318878acdf5038134e56394 ("configure: introduce --en= able-vhost-user-blk-server") Reported-by: Philippe Mathieu-Daud=C3=A9 Reported-by: Michael S. Tsirkin Signed-off-by: Stefan Hajnoczi Message-Id: <20201106210340.698771-1-stefanha@redhat.com> Signed-off-by: Thomas Huth --- meson.build | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meson.build b/meson.build index f5175010df..b473620321 100644 --- a/meson.build +++ b/meson.build @@ -1450,11 +1450,7 @@ trace_events_subdirs +=3D [ 'util', ] =20 -vhost_user =3D not_found -if 'CONFIG_VHOST_USER' in config_host - subdir('contrib/libvhost-user') -endif - +subdir('contrib/libvhost-user') subdir('qapi') subdir('qobject') subdir('stubs') --=20 2.18.4