From nobody Mon May 6 16:23:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1604930629; cv=none; d=zohomail.com; s=zohoarc; b=ios6fY20l/iHIo2Azk6f2gNxQjKJHK6UjeWOPfY1N5y47p4cyeNWMGzkR6C5iNURGBNYGs4jTuq1jR9EH4p8dJs2rrglmlXUT38RgYjdTUoPraE3sp2RJyeZMlq02v72BRl5ZudLyhRITKGFviOXte9yiL/2vgbnOMRsJZI8GXI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604930629; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=iYTUbDCzmH8zTNHNM6gmjID7+hQXYmNIWu0/XgkLc6E=; b=Wj/4a6R42Uk4hbW1fqLesH28FC125C3hKHGyb4Ar81ILjk9jFBz4z8z437VWzY0UenP9l0lnNF9DlY2I667KM+Cf2c44cJYNiOlB4eThbEOC4usNS5yt+wNx2IZ47jn6d3Kj7RqaSPNdWnUMWQ+yTRmmUL/ecUzTG02CmOzKxtg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604930629777292.4550914868139; Mon, 9 Nov 2020 06:03:49 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-231-lJvGAI2IMWSeNUdPKYnfyg-1; Mon, 09 Nov 2020 09:03:45 -0500 Received: by mail-wr1-f72.google.com with SMTP id e18so4359107wrs.23 for ; Mon, 09 Nov 2020 06:03:44 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id 89sm14553920wrp.58.2020.11.09.06.03.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 06:03:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604930627; 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=iYTUbDCzmH8zTNHNM6gmjID7+hQXYmNIWu0/XgkLc6E=; b=HIC4oV2gjzowzqXyGyFiCOZJyzz66cq69JCImVIIPZXGrpEZRfpEr+9n1w6LzKdoPfkv5y V/26XzUzCjUtUlW1g07EY4rFNajcfZTFWeg4TO8WuzsJqLZ7bF+yCoAGYfAGcdRb+lxjWK +oapoXMSV5PH+zqazae07xt9/lqsRXY= X-MC-Unique: lJvGAI2IMWSeNUdPKYnfyg-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:mime-version :content-transfer-encoding; bh=iYTUbDCzmH8zTNHNM6gmjID7+hQXYmNIWu0/XgkLc6E=; b=K8sq39071dt6yWuyYchRtwEAfbsV8LcDtrLumVWpFFUjjZ3QuI0yBEsBCUNzxkH/8/ LK/s0sv3MD0UURf/Z/ejYIaNu9epSOfsvbJn8nrTF0RSBKGutmafnQDvAbgLdRZFB+lh +NDeIV8YtBIGrnY3qmlLCUy91cDPoPDvAIy6lkVaN35fVVGzhzFUk6L++Tfb/GfM0+vt pN+TypMmaUzu06ZhuT/MpQA9XMtvrKGNGQE6STQSPgrXC2Rx+A+tIhiMCvQytk+A45wv 2eCvlza3u9/k4M9xLPWksNkXOxW+yrTcj03fqx/uyfgHZds0TUs+qBx98RWJG7lHtLrj EHtA== X-Gm-Message-State: AOAM531QbP4dtOqgE+HzW2A4ySTQx3mHCx4tm01i/1jNb+HJSmvA/suK NiSJpcyIyq/D+zXwT4GS1imQY58/B/XkWI6os7Gcvch5Ds3BVh7IXp17AcoLQ7r8zKcJeLcm+de iFYtv4eknLQjUsg== X-Received: by 2002:a5d:5105:: with SMTP id s5mr19074478wrt.255.1604930623850; Mon, 09 Nov 2020 06:03:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJwzzRJtTdBoNna2aRkAN9ACA3GkffgzzHNklQOc6oQBayqhC85+hz325M/RZ8871spcXUFHuA== X-Received: by 2002:a5d:5105:: with SMTP id s5mr19074450wrt.255.1604930623651; Mon, 09 Nov 2020 06:03:43 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Michael S . Tsirkin" , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 v2] configure: Check vhost-user is available for vhost-user-blk-server Date: Mon, 9 Nov 2020 15:03:41 +0100 Message-Id: <20201109140341.2598016-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 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) Check vhost-user is available when building vhost-user-blk-server. This fixes: $ ../configure \ --disable-vhost-user --enable-vhost-user-blk-server && \ make qemu-nbd ... [505/505] Linking target qemu-nbd FAILED: qemu-nbd cc -o qemu-nbd qemu-nbd.p/qemu-nbd.c.o -Wl,--as-needed -Wl,--no-undefined= -pie -Wl,--whole-archive libblockdev.fa libblock.fa libcrypto.fa libauthz.= fa libqom.fa libio.fa -Wl,--no-whole-archive -Wl,--warn-common -Wl,-z,relro= -Wl,-z,now -m64 -fstack-protector-strong -Wl,--start-group libqemuutil.a l= ibblockdev.fa libblock.fa libcrypto.fa libauthz.fa libqom.fa libio.fa @bloc= k.syms -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.= 0 -pthread -lgnutls -lutil -lm -lgthread-2.0 -lglib-2.0 -lbz2 -lgthread-2.0= -lglib-2.0 -lssh -lrbd -lrados -lcurl -lxml2 -lzstd -lacl -lgfapi -lgluste= rfs -lgfrpc -lgfxdr -luuid -laio /usr/lib64/libz.so -L/usr/lib64/iscsi -lis= csi -lnettle -lgnutls -lpam -Wl,--end-group /usr/bin/ld: libblockdev.fa(block_export_vhost-user-blk-server.c.o): in fu= nction `vu_blk_process_vq': block/export/vhost-user-blk-server.c:203: undefined reference to `vu_get_q= ueue' /usr/bin/ld: block/export/vhost-user-blk-server.c:208: undefined reference= to `vu_queue_pop' /usr/bin/ld: libblockdev.fa(block_export_vhost-user-blk-server.c.o): in fu= nction `vu_blk_queue_set_started': block/export/vhost-user-blk-server.c:228: undefined reference to `vu_get_q= ueue' /usr/bin/ld: libblockdev.fa(block_export_vhost-user-blk-server.c.o): in fu= nction `vu_blk_req_complete': block/export/vhost-user-blk-server.c:55: undefined reference to `vu_queue_= push' /usr/bin/ld: block/export/vhost-user-blk-server.c:56: undefined reference = to `vu_queue_notify' /usr/bin/ld: libblockdev.fa(block_export_vhost-user-blk-server.c.o): in fu= nction `vu_blk_queue_set_started': block/export/vhost-user-blk-server.c:229: undefined reference to `vu_set_q= ueue_handler' /usr/bin/ld: libqemuutil.a(util_vhost-user-server.c.o): in function `vu_cl= ient_trip': util/vhost-user-server.c:176: undefined reference to `vu_dispatch' /usr/bin/ld: util/vhost-user-server.c:180: undefined reference to `vu_dein= it' /usr/bin/ld: libqemuutil.a(util_vhost-user-server.c.o): in function `vu_ac= cept': util/vhost-user-server.c:291: undefined reference to `vu_init' collect2: error: ld returned 1 exit status ninja: build stopped: subcommand failed. make: *** [Makefile:171: run-ninja] Error 1 Now we get: $ ../configure \ --disable-vhost-user --enable-vhost-user-blk-server && \ ERROR: --enable-vhost-user-blk-server requires --enable-vhost-user Fixes: bc15e44cb21 ("configure: introduce --enable-vhost-user-blk-server") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Since v1: - Addressed Thomas review comments https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg02188.html Supersedes: <20201106190409.10571-1-philmd@redhat.com> --- configure | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 805f7791503..39b65dcd070 100755 --- a/configure +++ b/configure @@ -2375,6 +2375,10 @@ test "$vhost_user_fs" =3D "" && vhost_user_fs=3D$vho= st_user if test "$vhost_user_fs" =3D "yes" && test "$vhost_user" =3D "no"; then error_exit "--enable-vhost-user-fs requires --enable-vhost-user" fi +test "$vhost_user_blk_server" =3D "" && vhost_user_blk_server=3D$vhost_user +if test "$vhost_user_blk_server" =3D "yes" && test "$vhost_user" =3D "no";= then + error_exit "--enable-vhost-user-blk-server requires --enable-vhost-user" +fi #vhost-vdpa backends test "$vhost_net_vdpa" =3D "" && vhost_net_vdpa=3D$vhost_vdpa if test "$vhost_net_vdpa" =3D "yes" && test "$vhost_vdpa" =3D "no"; then @@ -2389,7 +2393,6 @@ if test "$vhost_net" =3D ""; then fi =20 # libvhost-user is Linux-only -test "$vhost_user_blk_server" =3D "" && vhost_user_blk_server=3D$linux if test "$vhost_user_blk_server" =3D "yes" && test "$linux" =3D "no"; then error_exit "--enable-vhost-user-blk-server is only available on Linux" fi --=20 2.26.2