From nobody Sat Apr 27 12:25:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604696724; cv=none; d=zohomail.com; s=zohoarc; b=OY++No7rBOpvUzUIehCYFt0iCUUZCoUA/cZVoec7S248TpvuTM8NrMG0VafbwyHGu0dEID5k5TyGBzpvpb9fNWgPjj/1zzkDEmllfsjexgRs6GkGiRPc9ABWB5A8lBs8Nr7wCo+ml4EI1BVgl31DT1Gh/r1sHxnuC5WObypUATg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604696724; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=H/PXH+B7if04WRAIWkL+Jy54eXHRDtPsYGgcuKex6ec=; b=PMQS2aDlyKs7ZyWIGRsWKQxEJVYdfhgzaNZ3XO387mxTLYfmz5QmAdMorg+Nf9lYvRpRaN6EREvNfhV2U1yIIt9lsg9pBuPaKZmdjrodEW8v7gaBL+ukrIOzqsXBrWwnLxScnZsiXZT6+/Y/2MPCA39ackJ43CjTZN1zSYWW82k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1604696724863459.59265328872596; Fri, 6 Nov 2020 13:05:24 -0800 (PST) Received: from localhost ([::1]:53584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kb8vD-0000kg-8b for importer@patchew.org; Fri, 06 Nov 2020 16:05:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kb8uH-0000GC-7m for qemu-devel@nongnu.org; Fri, 06 Nov 2020 16:04:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:34094) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kb8uE-0007TV-La for qemu-devel@nongnu.org; Fri, 06 Nov 2020 16:04:24 -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-562-It-9kqyZPx-HCm3U8SEjjw-1; Fri, 06 Nov 2020 16:04:17 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5767B803654 for ; Fri, 6 Nov 2020 21:04:16 +0000 (UTC) Received: from localhost (ovpn-112-11.ams2.redhat.com [10.36.112.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12A311A4D8; Fri, 6 Nov 2020 21:04:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604696660; 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; bh=H/PXH+B7if04WRAIWkL+Jy54eXHRDtPsYGgcuKex6ec=; b=ZDU1SHuPAlPWL5AS6+1GiRCgrqquuRA5cAmoYOtCVL9o/klnln6D4STWZbrp92QF2aqav9 ArNAK2+CY4sSUZzyQzRa2N4naOiSyVdP66AbqVuD1vTEtWAU4AfKVxqR5FoKMcAIN7ZBo3 KtSVPwadyoCRu3XYQF/7bAm4z2MBJcE= X-MC-Unique: It-9kqyZPx-HCm3U8SEjjw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH] meson: always include contrib/libvhost-user Date: Fri, 6 Nov 2020 21:03:40 +0000 Message-Id: <20201106210340.698771-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/06 06:30:30 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_H5=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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 --- 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.28.0