From nobody Mon Feb 9 12:15:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604868432; cv=none; d=zohomail.com; s=zohoarc; b=cLlvfAwz5XlPaSr+t9qj78OAJkBP8dlCYhy8Y1mUoLpAonIzNbpcuSMBVygSnCtiAPA9dA1NBRRF23rQmvTjZTZdKC5rCudbjsHBSbcLQXit0VbFC1eXsO6dfDpt9wiSWTlkebhJhRZ1L6bW4ll9LjoDwWzZVrbeDYfvyZ5mdf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604868432; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=5NBaRkUn5YAYhPpHLZeqVOEAZ8strin9MJlCWv9hP5E=; b=kqNk3/pNYjcQrLAaycKuB4lO/UZvSdfU3f7j882iRoctTKXgra+LoXbW7PJ/lcVPIl+Ez64FAmPRtGoWiqG/sdW44qf1jMBtSg1eikLFjfAHtAvgBnTf8Qw8CVZdEDVz/rUGpzpUhRxeUOfDHAg9ZHk0ZENWEy6jve1DNhianmE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604868432805223.59659883495397; Sun, 8 Nov 2020 12:47:12 -0800 (PST) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-400-xHsFpjZxPWaSSQcwVuihDQ-1; Sun, 08 Nov 2020 15:47:10 -0500 Received: by mail-wr1-f69.google.com with SMTP id 67so3401577wra.2 for ; Sun, 08 Nov 2020 12:47:10 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id d63sm10307371wmd.12.2020.11.08.12.47.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 12:47:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604868431; 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=5NBaRkUn5YAYhPpHLZeqVOEAZ8strin9MJlCWv9hP5E=; b=SMAGQgMts6iwypjUqrhxBH6topKX5AP8m7OvUs4By7F6O3/7Kj3BKeTZ/D1RwT/R42xZVT L/HcGc42j2Vw6bUQ+kK4cwrDZBx9Wwy8iXKCf9+V2Op8FsGua0WjwbOlY5OMc/LYZA/N4f SScTI5cinGMCPm5rHmEsOiJc24NbJ3c= X-MC-Unique: xHsFpjZxPWaSSQcwVuihDQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5NBaRkUn5YAYhPpHLZeqVOEAZ8strin9MJlCWv9hP5E=; b=aodQF+y9z1cACTDOGw2kSLuj9Abf2hP2fyX8IrJY3Tb1sGohnQ5ZTea6WReSbwZrZk wjacva49dEOwNEi9mjMbjCKyffXIPFLNscq5HP1QcxSKDsJAvAkXMD2l2Vktaqzb77Rk CJC6A5zx8D60Yj4tjqzt7N15nUVN4iJ7+KRHyhT7TrpJoGF6voCQtlvcmHTJGpf6+C6r h19W4nzT6Fl6ojn18u7kktN57XFFh7CV26qWNwt+fnaBxvDf8xyo+wnvZQg9YeydUMSV nivIjp4iu+R/bUKTcUd4n7IZRNw4vPALGMkLWzIN9hrQ6fH/CQUJoU2d5p7bfF+svYYk vzNg== X-Gm-Message-State: AOAM531xrz7dCZPWkO6JbgQTLqwgkKETod7wDMyhpcjgmypuuMHM4g6T kadootvqJauIMaKxWTgDZMr+SD6B7on3ltibQdugkRaJmPYqWHvSD8ziZJtizq6j/qqowCW0F0T GO9ADfhz87bvZtw== X-Received: by 2002:a5d:5082:: with SMTP id a2mr14202757wrt.417.1604868427645; Sun, 08 Nov 2020 12:47:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwknkLe87CG9Vs2damW/2NhZh5JvrWKcBdxiiHNL69MXrc1f+vsepWoNI1MEUzdyCP3wyocKQ== X-Received: by 2002:a5d:5082:: with SMTP id a2mr14202736wrt.417.1604868427458; Sun, 08 Nov 2020 12:47:07 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Igor Mammedov , "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Wainer dos Santos Moschetta , Aurelien Jarno , Thomas Huth , Eduardo Habkost , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aleksandar Rikalo , Richard Henderson , Fam Zheng , "Daniel P . Berrange" , Stefan Hajnoczi Subject: [PATCH-for-5.2 v4 02/17] meson: always include contrib/libvhost-user Date: Sun, 8 Nov 2020 21:45:20 +0100 Message-Id: <20201108204535.2319870-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108204535.2319870-1-philmd@redhat.com> References: <20201108204535.2319870-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: Philippe Mathieu-Daud=C3=A9 --- meson.build | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meson.build b/meson.build index f5175010dfa..b4736203219 100644 --- a/meson.build +++ b/meson.build @@ -1450,11 +1450,7 @@ '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.26.2