From nobody Sat May 4 18:18:48 2024 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=1604930857; cv=none; d=zohomail.com; s=zohoarc; b=FZxSN1oIAtr4w3SD38ZUmNpMcMeGuIj4R+ixalwXGFB5p7FxvZ9cScPLnJFRysLGL1UeXRil7c130tpxF3altcD/J6/ApVM+jolT1brz2pSkdfhx5ckpGrKs//vD2QlGPNuVZlIpWXqFpHpdDbPk7/0RtP5byrBZCncDzmtfF7M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604930857; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=1VQyBj6lMnBA6tZH49jGG2rJ56sZOzdv92YtsNDmmrE=; b=nTN0Ln9AB/L+UuHrGZRIGW7DWAnaXyBDQ6MCB/w5RUlTDRguDY9aEYkL7slc7OrQuQkLwS5QE2rn9fK77b+AGFq86oRTeK5rl9tgBkij56CnRXZgun4H0JiUojyusZ1hT+9KhbRyE8ZDBwuvRI0uu0ZGYu/idZThAWFwAEFl+HA= 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 160493085764162.42179907012155; Mon, 9 Nov 2020 06:07:37 -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-298-46WKenI2MGWG82qVAi6RQA-1; Mon, 09 Nov 2020 09:07:34 -0500 Received: by mail-wr1-f69.google.com with SMTP id b6so4345598wrn.17 for ; Mon, 09 Nov 2020 06:07:33 -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 j13sm13140771wrt.80.2020.11.09.06.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 06:07:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604930855; 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=1VQyBj6lMnBA6tZH49jGG2rJ56sZOzdv92YtsNDmmrE=; b=IbByaOLdAVKkG9fXgL6lIneC5h9ZnVlhQ7RjBCEPtkw2Qbe/DvpNz6nT+fdzivFS6cqXVL HnR1xptO0e9JZ4zmGVVpya4c0rFpIT5mQYWcNuwuP863ZvHO0S+E8JNtLeck1tDbXkBWE0 E0GfRk76Eg3P32nkxBjteu9XTzktTcg= X-MC-Unique: 46WKenI2MGWG82qVAi6RQA-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=1VQyBj6lMnBA6tZH49jGG2rJ56sZOzdv92YtsNDmmrE=; b=Xo4q7RCyy4Y0zGDvOizYMcet3SzXvNHNY2cUa6LNocA4YibEwJdpjQxSlNCZoSy8sw UECBDG0K3B83GgbQkk9x4f1aL0wVNWMkR+zA40KDSQc3Bde+tL9eHaZUOzxnkHrgmq/j Of+SHz2Q+FADwOLrsGmcfdyK9QiztlRhh3EhNLpAvRGDN06HLWle8y/NPLAbmEDz92uK Nutyd0C5ktHJ0IPugHjIHm24FHGpUcKY3zQcUmkj50J5/l4JU5mNimRzmi9YLZIATo7N St3DUSyvATsgLn0ENu8K0UVpSlqHKyHu/5zAeiD/rO78EjUc121snJ+I17jvE/8apx0H 6hLw== X-Gm-Message-State: AOAM533Hz6WtNvmmvVh4WqBgPR5ma2iKWZxVn8ljVd5YsQ1KTbmEk4tz oiy+3POKb6Vh2GN1voZj8WRrLu8WjALhucNCrEz34yuioHAZFCXNK9fQefauN+lGJZEcD2hm/S1 dEfTNzgfpUTWl6A== X-Received: by 2002:a5d:51c1:: with SMTP id n1mr12501914wrv.395.1604930852804; Mon, 09 Nov 2020 06:07:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJyrjkesMI/jvWt/mqoK7xzbxZAMEtd2LMBU3vTU0str2W/t58EulDls+HDTgylbTMjxUYJw7g== X-Received: by 2002:a5d:51c1:: with SMTP id n1mr12501888wrv.395.1604930852452; Mon, 09 Nov 2020 06:07:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , "Michael S . Tsirkin" , Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 v3] configure: Check vhost-user is available for vhost-user-blk-server Date: Mon, 9 Nov 2020 15:07:30 +0100 Message-Id: <20201109140730.2600017-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 --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure index 805f7791503..3124be82da1 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 --=20 2.26.2