From patchwork Fri Jan 21 15:41:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12719875 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5A738C433F5 for ; Fri, 21 Jan 2022 15:44:00 +0000 (UTC) Received: from localhost ([::1]:38806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAw51-0003si-8H for qemu-devel@archiver.kernel.org; Fri, 21 Jan 2022 10:43:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAw2q-0001A9-OQ for qemu-devel@nongnu.org; Fri, 21 Jan 2022 10:41:46 -0500 Received: from [2a00:1450:4864:20::335] (port=54901 helo=mail-wm1-x335.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAw2p-0007fl-3G for qemu-devel@nongnu.org; Fri, 21 Jan 2022 10:41:44 -0500 Received: by mail-wm1-x335.google.com with SMTP id p18so18423611wmg.4 for ; Fri, 21 Jan 2022 07:41:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qHVrZYilprbADKL6sDkzZ5rkDTLaol2IUVJ3O0h2GR0=; b=NJikODvwK+s3FfOKIBhzVEryyZtVsTdZv1sYEICrKQf2TFqr8kvnJxekabx3FoIYd5 SBwsRVe4jZMkUQ3JkfsSPKNaIYj/Cx+GyrD1I2nOy0IjVc4Le1YXMwZhUw3DJS+lJrf2 uH5I3zJsvrE2whEGMJ5rNbZOjuhdDxGptFR/+s58BFO/TvXsKnCPzq0MCPNSY0hU/E5h bnQg3qD+ZJrnxXa0/vDhSL+R++Yt3f+A4sMw886ep4JXv9BNbm4BA0aR0swKSOQYy6RZ PvGsD4ESrMvQ9uw+v1JBdkimAvWqbOEkx5nlroxvvntMBt6T2KyXZZRjfWM2Fqr2bhLs v40Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qHVrZYilprbADKL6sDkzZ5rkDTLaol2IUVJ3O0h2GR0=; b=U6mRaKvSHrVjGS8Eo8N7akAAjoYJ4GNBCqwzIZF0GydVttTqFvpIK9m6utCvn2SMM1 D21WmhwDbCZLq1Yr5tfcP3DJEs85CtvGAy8voDiifyjz+NO5Jx2h5nWLkZiNdh13XFhB VRYZJtSIfL25qwxoGDwyGwgZO5dqWtqW5lABNRsuX1BMKxwIsdkHkSlgc3j2lE8ShIMi jetH0DxVYZjFTFpXGqLBktt17dOl2x9nvjuaCRHIZGJ07iTVvCN1ADDfwYgGbhxakAEm 2XxLY3cQ1m+syD4OxsntxBmlYZ5UYjKlPw97wA7pqqhFosVCmiMXOQbM5rEVcerVZSLi rPqg== X-Gm-Message-State: AOAM532k6dhdkseafs/fN4vipOvVhLB8g5q+wWQ6jQqMU4j4oygGcyC0 d9Sg1mxGBq2H7YXc+13PA+HFGBLBKKo= X-Google-Smtp-Source: ABdhPJzH365UhrzFIFDzweZ6bvAFcLAGOAmrOhv0hWf+YSXZY3yBZv03HXHreD0EEz/qXb7rvz/x8Q== X-Received: by 2002:a7b:c747:: with SMTP id w7mr1295858wmk.54.1642779701641; Fri, 21 Jan 2022 07:41:41 -0800 (PST) Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id f10sm6607140wri.50.2022.01.21.07.41.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:41:41 -0800 (PST) To: qemu-devel@nongnu.org Cc: Ed Maste , Thomas Huth , Michael Tokarev , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , Li-Wen Hsu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v6 1/7] MAINTAINERS: Cover lcitool submodule with build test / automation Date: Fri, 21 Jan 2022 16:41:28 +0100 Message-Id: <20220121154134.315047-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::335 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x335.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= lcitool is used by build test / automation, we want maintainers to get notified if the submodule is updated. Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index e4b3a4bcdf4..6d5539d46f1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3579,6 +3579,7 @@ F: .travis.yml F: scripts/ci/ F: tests/docker/ F: tests/vm/ +F: tests/lcitool/ F: scripts/archive-source.sh W: https://gitlab.com/qemu-project/qemu/pipelines W: https://travis-ci.org/qemu/qemu From patchwork Fri Jan 21 15:41:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12719880 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B208FC433FE for ; Fri, 21 Jan 2022 15:48:59 +0000 (UTC) Received: from localhost ([::1]:47086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAw9q-0001T8-GT for qemu-devel@archiver.kernel.org; Fri, 21 Jan 2022 10:48:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAw2y-0001Hw-Vk for qemu-devel@nongnu.org; Fri, 21 Jan 2022 10:41:52 -0500 Received: from [2a00:1450:4864:20::32f] (port=43905 helo=mail-wm1-x32f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAw2t-0007h8-Pg for qemu-devel@nongnu.org; Fri, 21 Jan 2022 10:41:52 -0500 Received: by mail-wm1-x32f.google.com with SMTP id e9-20020a05600c4e4900b0034d23cae3f0so22974668wmq.2 for ; Fri, 21 Jan 2022 07:41:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QHeqOg1fCgtx7ni/iHjS3u5wy+2uDfP4jJvs5BysbmY=; b=OwV1gvBqTdwAkPS2IgqWxE9JZPC7ke30HVEslbT8y2OzSMkM59vvcXQRwLwX+QsHUc kdJEdJ+oys65VhQSfHdcd2Vcyej8saJADtT4gxf6yiEZ4MD2JZk8djsbJGbjFgFG1Q5D DBKWdANgOQIXid2MQQtDJSzwkBlKpUf1LL+uubC5siEnhAU3Pg/8g9ZHOUbW7SdGF9YZ Mn6Pcmb/ZfVEnjxuUTp6lL+Dq0xAW09b4K7IOF41byARq73ruD2Vw+4Q50N7/xSiFTHQ hOUyFlyuL95gxfB8Q+j339Of8LkNE6I3T0fD15AUfSyT7TF48JglGWQXBZcUojX4liD2 s5UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QHeqOg1fCgtx7ni/iHjS3u5wy+2uDfP4jJvs5BysbmY=; b=KwbrEHHlAlBCCKYzIvZxybizHCkZCxQ8GcG+VHgkJHy2S7qrkhxyAbOhtCu6vAwFcY lAIf1lD9t+xeAAbL3Ta5QOlUCH7fg2GDmWj9sxTxAhpxdXL0XBB/rVJCS7mVyy9GY7m/ uqviUR8TdePKxdfBNUzY3gmrRVaUZiKrGgJRZAgqmKGLcPbu44j9V6sxzkEdjJ7Wc6RW WPmscDmEX9UsHwmN2SXXsiOHft5Iqj24+r7m5MuNDATIfl9iWAg/GX4XtHDt6gufxbgL TuKzCu4sgbgJRZ4WDmg9rwCa+JLggOc6udzQgTSmEX6KWyn1k0ecMMJqi5iZePWJskB8 iWnQ== X-Gm-Message-State: AOAM530RhJ9ZW4p4cGGfe5++iu6wxC2ixJArskcwEoXk0uV3sIKof8zr V1yW91qEtC9suHKKat9gBbQU3uhL+zU= X-Google-Smtp-Source: ABdhPJy3hW/VwXx/6LQAOytNOO1qE/9r58vKYekqJKKfCEjI/zQFG1PilcPuQsmh6X3u5TL16MV+hA== X-Received: by 2002:a1c:544d:: with SMTP id p13mr1231723wmi.97.1642779706370; Fri, 21 Jan 2022 07:41:46 -0800 (PST) Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id y6sm4980371wma.48.2022.01.21.07.41.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:41:46 -0800 (PST) To: qemu-devel@nongnu.org Cc: Ed Maste , Thomas Huth , Michael Tokarev , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , Li-Wen Hsu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v6 2/7] gitmodules: Correct libvirt-ci submodule URL Date: Fri, 21 Jan 2022 16:41:29 +0100 Message-Id: <20220121154134.315047-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32f (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Correct the libvirt-ci repository URL to avoid this warning when cloning / refreshing the submodule: warning: redirecting to https://gitlab.com/libvirt/libvirt-ci.git/ Fixes: 4ebb040f1fd ("tests: integrate lcitool for generating build env manifests") Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 84425d87e28..f4b6a9b4012 100644 --- a/.gitmodules +++ b/.gitmodules @@ -66,4 +66,4 @@ url = https://gitlab.com/qemu-project/vbootrom.git [submodule "tests/lcitool/libvirt-ci"] path = tests/lcitool/libvirt-ci - url = http://gitlab.com/libvirt/libvirt-ci + url = https://gitlab.com/libvirt/libvirt-ci.git From patchwork Fri Jan 21 15:41:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12719879 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E2EA1C433EF for ; Fri, 21 Jan 2022 15:48:58 +0000 (UTC) Received: from localhost ([::1]:46998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAw9p-0001Nq-R4 for qemu-devel@archiver.kernel.org; Fri, 21 Jan 2022 10:48:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAw30-0001Ja-If for qemu-devel@nongnu.org; Fri, 21 Jan 2022 10:41:55 -0500 Received: from [2a00:1450:4864:20::430] (port=45997 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAw2y-0007hE-M8 for qemu-devel@nongnu.org; Fri, 21 Jan 2022 10:41:53 -0500 Received: by mail-wr1-x430.google.com with SMTP id i2so398732wrb.12 for ; Fri, 21 Jan 2022 07:41:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0KVY8Kf1y+JHjZqld1jSJ4nxhvF4HzqE4UdFx7oCrkk=; b=J+aux56hQAqZIq5SUPaFmor2vL8WZ+uu2piiHOmTnimEo51SJDE9bxtfSdJWdLsXXa d8hHLVhlRfIkof/EMgBKa5sIUmPWotstlLR8FwkRBHCEyJO6KpHVULKJo5C8AXLjN3BU U6/fFOM67cbuqSnK1sTegFoUBxHb5CIXcFpAHzbOhIGTlqPYYzh3NSk24kL6odP4Swrx PwKwG7mmnAvhyirsjYgIIkvcQx4ACs82HM/5YQbx8CyUYt0MozPpAYCAvoC6vMa/6yhU /MeBtuM9FIr8RCkZwN0Ba3+o6IYHxjE2gRoydl4+lIwtCcFkfJdv+LnqGFstDI2QM9HI 9PTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0KVY8Kf1y+JHjZqld1jSJ4nxhvF4HzqE4UdFx7oCrkk=; b=fkdFPu3LF47hv1Fs9UZZiJDCVl7N++dDzLVeCem1ozi/i+zbuSjo0apluFSOveBhZ0 bV1Qo+d8YQnOoMZKUB9hm5iHtVggJYPEqcm21fXdArKm2lYMtIFFbk2v+FnV3tXXo6eC 0zkDe9IxYzg/I/EabIdY3xg/VhTaR8Ucwpdw/C3qcQKzj9o8vZiHSvHlXOZJ2mti0N+j FVRcd2o1YNNjJsO+LP0FolcnyLVn14J5HlIplpOC0lKMKceQMC+gdnG7uh0HYDD5xeId EZO+HSfDzNQ357zgRJKN5oxsHV9JDp6rM/Dx2rO5Q/52MzV0OnYbfl610Vqj/H4qpTMv vxLg== X-Gm-Message-State: AOAM533n9MpWoSn4z+260FbhLEW0kbfvhZifYSRJf5XGgJUXYV/Qy4b4 3oqEa0rGiIc3q2CuLDTTHNrAFufYgd8= X-Google-Smtp-Source: ABdhPJwjP6sv73FpGoknIyxzcP3yo0H0lsyrey3X4tpmfuN0epQa6J2FEUP7jBrnK4wb78qDZDqZgQ== X-Received: by 2002:adf:e48c:: with SMTP id i12mr3459790wrm.546.1642779711303; Fri, 21 Jan 2022 07:41:51 -0800 (PST) Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id g17sm15468482wmq.9.2022.01.21.07.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:41:50 -0800 (PST) To: qemu-devel@nongnu.org Cc: Ed Maste , Thomas Huth , Michael Tokarev , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , Li-Wen Hsu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v6 3/7] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Date: Fri, 21 Jan 2022 16:41:30 +0100 Message-Id: <20220121154134.315047-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::430 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= The script only include the local qemu.yml for Dockerfiles. Since we want to keep the Cirrus-CI generated files in sync, also use the --data-dir option in generate_cirrus(). Fixes: c45a540f4bd (".gitlab-ci.d/cirrus: auto-generate variables with lcitool") Reported-by: Daniel P. Berrangé Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé --- tests/lcitool/refresh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 033120e223d..25301f2ef0b 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -62,7 +62,7 @@ def generate_dockerfile(host, target, cross=None, trailer=None): def generate_cirrus(target, trailer=None): filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars") - cmd = [lcitool_path, "variables", target, "qemu"] + cmd = lcitool_cmd + ["variables", target, "qemu"] generate(filename, cmd, trailer) ubuntu1804_skipssh = [ From patchwork Fri Jan 21 15:41:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12719882 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 84B5FC433F5 for ; Fri, 21 Jan 2022 15:55:06 +0000 (UTC) Received: from localhost ([::1]:55350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAwFl-0007j9-Eo for qemu-devel@archiver.kernel.org; Fri, 21 Jan 2022 10:55:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAw35-0001Ys-OQ for qemu-devel@nongnu.org; Fri, 21 Jan 2022 10:41:59 -0500 Received: from [2a00:1450:4864:20::429] (port=43707 helo=mail-wr1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAw33-0007i7-Ru for qemu-devel@nongnu.org; Fri, 21 Jan 2022 10:41:59 -0500 Received: by mail-wr1-x429.google.com with SMTP id v13so373239wrv.10 for ; Fri, 21 Jan 2022 07:41:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wRMk9oLd+X58jCruqv6bDjXuXptPpTM6cy14Pp19F9Y=; b=dQUyRqMbfFM6Bj9evZP+9mbX4a3l5g/b0rJbUqmnKrsyTOdTNJb3LuEanBad//d8t6 LY6u+Vlyiwao+HEnxfyiBa3TiBzuu3l+yrUp7YjHh94kuDra2RfQl/7EvErHoN8QXczD 8EcjPj8WeCSQixMpeVcRQFtsXAGESPLmUL/UJrBDvRPCGkcAhr8DQ1E3RDOYSXCKqlSi JppS2v8quu1kutFgD6VbYUcLdiEEtwJ+lH0XbESyq5eqiGtvVLUjrT6G+cMWPNj4TkvB rgPa1pV9ZX+iStLHqXPWLGD6lJQhi2Yn2LOVdr0rT97YGCouXpUjcp2/fhCg5tLWN/sz VjdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wRMk9oLd+X58jCruqv6bDjXuXptPpTM6cy14Pp19F9Y=; b=hjVTkG/af7nBzJUc4zvr4ZHnVWxUMBsNCW34STpZ3ovcq99jHTc2SnqVWPwgIfv+cn 2x0p0CuTDlmaO5vxs0HoqoCr/koStt74tK8I1EDlc/FzQEy5iE4en57IzOOyKCoOsYYB SVCcgPv3CGBfjrUpIr3JrGJWOMEHUhy19HGhukW8FfHAKKEzNFk16s6Zs9sZgfm0ZnKD HpsAXwjf1RZRhLWwOiZqmQ37C9cZhNXwqvNFZJLGMAXcr2bkHjmhpdr00Xx3+ohwQc8f +S0CEabdpvelaslC2dJ/I2Nv202Jg+KOHhH3YmjraU7xLdxy7nFY1GkJzKuCtSmsNZSM Qtdw== X-Gm-Message-State: AOAM532EQ4kk2t/KuxgdiTwKZEQan21tIkX7VdFEOPGCZp2qgGndYlDh wUDeSMrqwuEdcyY82axWCXvS/6h94z8= X-Google-Smtp-Source: ABdhPJx2r7Hd+mu3rwxcY9Zr9bzp9NtXfMbfufWunyD8Co/+sO5rQDQ6hZfh5Dbr8+GG5m+GR4y1DA== X-Received: by 2002:a5d:688a:: with SMTP id h10mr4407785wru.415.1642779716278; Fri, 21 Jan 2022 07:41:56 -0800 (PST) Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id y6sm6746767wrs.108.2022.01.21.07.41.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:41:55 -0800 (PST) To: qemu-devel@nongnu.org Cc: Ed Maste , Thomas Huth , Michael Tokarev , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , Li-Wen Hsu , Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v6 4/7] drop libxml2 checks since libxml is not actually used (for parallels) Date: Fri, 21 Jan 2022 16:41:31 +0100 Message-Id: <20220121154134.315047-5-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::429 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= From: Michael Tokarev For a long time, we assumed that libxml2 is necessary for parallels block format support (block/parallels*). However, this format actually does not use libxml [*]. Since this is the only user of libxml2 in whole QEMU tree, we can drop all libxml2 checks and dependencies too. It is even more: --enable-parallels configure option was the only option which was silently ignored when it's (fake) dependency (libxml2) isn't installed. Drop all mentions of libxml2. [*] Actually the basis for libxml use were introduced in commit ed279a06c53 ("configure: add dependency") but the implementation was never merged: https://lore.kernel.org/qemu-devel/70227bbd-a517-70e9-714f-e6e0ec431be9@openvz.org/ Signed-off-by: Michael Tokarev Reviewed-by: Stefan Hajnoczi Message-Id: <20220119090423.149315-1-mjt@msgid.tls.msk.ru> Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé [PMD: Updated description and adapted to use lcitool] Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 6 ------ block/meson.build | 3 +-- meson_options.txt | 2 -- scripts/checkpatch.pl | 1 - scripts/ci/org.centos/stream/8/x86_64/configure | 1 - scripts/coverity-scan/coverity-scan.docker | 1 - scripts/coverity-scan/run-coverity-scan | 2 +- scripts/meson-buildoptions.sh | 3 --- 8 files changed, 2 insertions(+), 17 deletions(-) diff --git a/meson.build b/meson.build index 833fd6bc4ca..51e3090438d 100644 --- a/meson.build +++ b/meson.build @@ -451,11 +451,6 @@ required: get_option('linux_io_uring'), method: 'pkg-config', kwargs: static_kwargs) endif -libxml2 = not_found -if not get_option('libxml2').auto() or have_block - libxml2 = dependency('libxml-2.0', required: get_option('libxml2'), - method: 'pkg-config', kwargs: static_kwargs) -endif libnfs = not_found if not get_option('libnfs').auto() or have_block libnfs = dependency('libnfs', version: '>=1.9.3', @@ -3491,7 +3486,6 @@ summary_info += {'lzfse support': liblzfse} summary_info += {'zstd support': zstd} summary_info += {'NUMA host support': config_host.has_key('CONFIG_NUMA')} -summary_info += {'libxml2': libxml2} summary_info += {'capstone': capstone_opt == 'internal' ? capstone_opt : capstone} summary_info += {'libpmem support': libpmem} summary_info += {'libdaxctl support': libdaxctl} diff --git a/block/meson.build b/block/meson.build index deb73ca389f..90dc9983e56 100644 --- a/block/meson.build +++ b/block/meson.build @@ -58,8 +58,7 @@ 'qed-table.c', 'qed.c', )) -block_ss.add(when: [libxml2, 'CONFIG_PARALLELS'], - if_true: files('parallels.c', 'parallels-ext.c')) +block_ss.add(when: 'CONFIG_PARALLELS', if_true: files('parallels.c', 'parallels-ext.c')) block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-aio.c')) block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref, iokit]) block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c')) diff --git a/meson_options.txt b/meson_options.txt index 921967eddbb..95d527f7732 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -113,8 +113,6 @@ option('libudev', type : 'feature', value : 'auto', description: 'Use libudev to enumerate host devices') option('libusb', type : 'feature', value : 'auto', description: 'libusb support for USB passthrough') -option('libxml2', type : 'feature', value : 'auto', - description: 'libxml2 support for Parallels image format') option('linux_aio', type : 'feature', value : 'auto', description: 'Linux AIO support') option('linux_io_uring', type : 'feature', value : 'auto', diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 5caa739db48..5e501110601 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -307,7 +307,6 @@ sub help { qr{target_(?:u)?long}, qr{hwaddr}, # external libraries - qr{xml${Ident}}, qr{xen\w+_handle}, # Glib definitions qr{gchar}, diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure index e05f2fddcc2..9850dd44444 100755 --- a/scripts/ci/org.centos/stream/8/x86_64/configure +++ b/scripts/ci/org.centos/stream/8/x86_64/configure @@ -81,7 +81,6 @@ --disable-libssh \ --disable-libudev \ --disable-libusb \ ---disable-libxml2 \ --disable-linux-aio \ --disable-linux-io-uring \ --disable-linux-user \ diff --git a/scripts/coverity-scan/coverity-scan.docker b/scripts/coverity-scan/coverity-scan.docker index ecff6ac5b4b..6f60a52d231 100644 --- a/scripts/coverity-scan/coverity-scan.docker +++ b/scripts/coverity-scan/coverity-scan.docker @@ -59,7 +59,6 @@ ENV PACKAGES \ libubsan \ libudev-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lzo-devel \ diff --git a/scripts/coverity-scan/run-coverity-scan b/scripts/coverity-scan/run-coverity-scan index 6d443250a9b..181bdcb2638 100755 --- a/scripts/coverity-scan/run-coverity-scan +++ b/scripts/coverity-scan/run-coverity-scan @@ -402,7 +402,7 @@ echo "Configuring..." --enable-libiscsi --enable-libnfs --enable-seccomp \ --enable-tpm --enable-libssh --enable-lzo --enable-snappy --enable-bzip2 \ --enable-numa --enable-rdma --enable-smartcard --enable-virglrenderer \ - --enable-mpath --enable-libxml2 --enable-glusterfs \ + --enable-mpath --enable-glusterfs \ --enable-virtfs --enable-zstd echo "Running cov-build..." diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index a4af02c5273..48a454cece2 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -58,7 +58,6 @@ meson_options_help() { printf "%s\n" ' libssh ssh block device support' printf "%s\n" ' libudev Use libudev to enumerate host devices' printf "%s\n" ' libusb libusb support for USB passthrough' - printf "%s\n" ' libxml2 libxml2 support for Parallels image format' printf "%s\n" ' linux-aio Linux AIO support' printf "%s\n" ' linux-io-uring Linux io_uring support' printf "%s\n" ' lzfse lzfse support for DMG images' @@ -188,8 +187,6 @@ _meson_option_parse() { --disable-libudev) printf "%s" -Dlibudev=disabled ;; --enable-libusb) printf "%s" -Dlibusb=enabled ;; --disable-libusb) printf "%s" -Dlibusb=disabled ;; - --enable-libxml2) printf "%s" -Dlibxml2=enabled ;; - --disable-libxml2) printf "%s" -Dlibxml2=disabled ;; --enable-linux-aio) printf "%s" -Dlinux_aio=enabled ;; --disable-linux-aio) printf "%s" -Dlinux_aio=disabled ;; --enable-linux-io-uring) printf "%s" -Dlinux_io_uring=enabled ;; From patchwork Fri Jan 21 15:41:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12719894 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9C48FC433EF for ; Fri, 21 Jan 2022 15:59:53 +0000 (UTC) Received: from localhost ([::1]:36064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAwKO-0005Xd-JL for qemu-devel@archiver.kernel.org; Fri, 21 Jan 2022 10:59:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAw3H-0001rt-CJ for qemu-devel@nongnu.org; Fri, 21 Jan 2022 10:42:11 -0500 Received: from [2a00:1450:4864:20::32b] (port=53058 helo=mail-wm1-x32b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAw39-0007j9-Jh for qemu-devel@nongnu.org; Fri, 21 Jan 2022 10:42:05 -0500 Received: by mail-wm1-x32b.google.com with SMTP id v123so18483925wme.2 for ; Fri, 21 Jan 2022 07:42:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5Of3l4u3FiVNd7t/06K1VRlM0oLlSgnk/M7vVzXCwT4=; b=oFFLIVtpb8Z5/j45PuAaaLqj876/YB06VGoRsxv+pbAucBA7w3kyntEUfEGFJpQY1i aCmAg7AiJQ+5fMDbchd73EwbytZ/9801pWU3tE0jRDXfojvIfO3CzmCF9Q5gLR0VkLRv g2K+q5/PTw3cP8kJHDsvS+g4A/Z8OvdDbvFSdewyVHUDm676G3JAl9gqn/58lBqntfKq GIGuO1lFouJ0CiKadU5AEzzkezHGBF+j9AiuquwMv/ZmIiFevsLO7xm0EEuu3KtObJWx v1WGO4xCGKyRY5+huhYfEUfuqOnLImOOAYk5K/0yht4foZbIe98ApP6k89snd7jilD0o lT9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=5Of3l4u3FiVNd7t/06K1VRlM0oLlSgnk/M7vVzXCwT4=; b=XO3zX+lcjmnHs+NWVTfOORuHEu2OhCguTZHWWBRog1ks0+g/LD82jfTWCyXH9+iDLU G0gk2gWYGShelJkHYjWaFVST/YGXp+S2BfqLU7IR6URZxZxwR0IC3TQUJQrFeBZNnYjJ ggXjlJtJUc6qem7kx/JpRd2X68MAp+vHlmx50kIS86Wybu2UWI9Lly0N7atb+j/Pakks IrbO0IeQ5oYhDGiRjmtf0qvH19Jpu9+aPIvHF5wIRa/Wp0uSvWvHMKLm91uVha/mttrS XzuFdUE+ZwilJdup6bzT04waYru151yvdHu6zsrNSMvna9QPEGhMGbzQ+8snIYda+SNu RiIg== X-Gm-Message-State: AOAM533bgxv2JTuM7eoh6jyxI2INi2MR8TYvzTZu0PbxoWAlMKmi+wpR cIjA3H2DuVaUMc37y5dIxg4UgDDR5MM= X-Google-Smtp-Source: ABdhPJxk+4CSbG7g4u+dlbT+insxSI9wOxmsvAiogYhbHhNio5QkgcpkkZUjO7t48xQ9lex5SGTaHg== X-Received: by 2002:a7b:c94c:: with SMTP id i12mr1229141wml.85.1642779721519; Fri, 21 Jan 2022 07:42:01 -0800 (PST) Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id bd20sm6242750wmb.38.2022.01.21.07.42.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:42:01 -0800 (PST) To: qemu-devel@nongnu.org Cc: Ed Maste , Thomas Huth , Michael Tokarev , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , Li-Wen Hsu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v6 5/7] tests/lcitool: Refresh submodule and remove libxml2 Date: Fri, 21 Jan 2022 16:41:32 +0100 Message-Id: <20220121154134.315047-6-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= The previous commit removed all uses of libxml2. Refresh lcitool submodule, update qemu.yml and refresh the generated files by running: $ make lcitool-refresh Note: This refreshment also removes libudev dependency on Fedora and CentOS due to libvirt-ci commit 18bfaee ("mappings: Improve mapping for libudev"), since "The udev project has been absorbed by the systemd project", and lttng-ust on FreeBSD runners due to libvirt-ci commit 6dd9b6f ("guests: drop lttng-ust from FreeBSD platform"). Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-11.vars | 2 +- tests/docker/dockerfiles/alpine.docker | 4 ++-- tests/docker/dockerfiles/centos8.docker | 4 +--- tests/docker/dockerfiles/fedora.docker | 4 +--- tests/docker/dockerfiles/opensuse-leap.docker | 3 +-- tests/docker/dockerfiles/ubuntu1804.docker | 3 +-- tests/docker/dockerfiles/ubuntu2004.docker | 3 +-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/projects/qemu.yml | 1 - 11 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index 9c52266811f..07f313aa3ab 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars index 7b44dba324e..8a648dda1ed 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-11.vars index 613d1373c23..08183f8793c 100644 --- a/.gitlab-ci.d/cirrus/macos-11.vars +++ b/.gitlab-ci.d/cirrus/macos-11.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/usr/local/bin/pip3' -PKGS='bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb libxml2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' +PKGS='bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv' PYTHON='/usr/local/bin/python3' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index eb2251c81c8..591af43d60e 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile alpine-edge qemu +# $ lcitool dockerfile --layers all alpine-edge qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -56,7 +56,6 @@ RUN apk update && \ libtasn1-dev \ liburing-dev \ libusb-dev \ - libxml2-dev \ linux-pam-dev \ llvm11 \ lttng-ust-dev \ @@ -109,6 +108,7 @@ RUN apk update && \ zlib-dev \ zlib-static \ zstd-dev && \ + apk list | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index cbb909d02b3..3abac7a8b13 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile centos-8 qemu +# $ lcitool dockerfile --layers all centos-8 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -69,10 +69,8 @@ RUN dnf update -y && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ liburing-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 60207f3da38..1d01cd94405 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile fedora-35 qemu +# $ lcitool dockerfile --layers all fedora-35 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -77,10 +77,8 @@ exec "$@"' > /usr/bin/nosync && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ liburing-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index f57d8cfb299..1b78d8369a7 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile opensuse-leap-152 qemu +# $ lcitool dockerfile --layers all opensuse-leap-152 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -71,7 +71,6 @@ RUN zypper update -y && \ libudev-devel \ liburing-devel \ libusb-1_0-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 0ffa3c4d4b5..003ee2cfedd 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-1804 qemu +# $ lcitool dockerfile --layers all ubuntu-1804 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -89,7 +89,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libvirglrenderer-dev \ libvte-2.91-dev \ libxen-dev \ - libxml2-dev \ libzstd-dev \ llvm \ locales \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 4e562dfdcd3..8993d2d9e05 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-2004 qemu +# $ lcitool dockerfile --layers all ubuntu-2004 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -91,7 +91,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libvirglrenderer-dev \ libvte-2.91-dev \ libxen-dev \ - libxml2-dev \ libzstd-dev \ llvm \ locales \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 29cec2153b9..6dd9b6fab1f 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 29cec2153b9a4dbb2e66f1cbc9866a4eff519cfd +Subproject commit 6dd9b6fab1fe081b16bc975485d7a02c81ba5fbe diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index ed5ab1407a9..de51a2f1dd4 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -63,7 +63,6 @@ packages: - liburing - libusbx - libvdeplug - - libxml2 - libzstd - llvm - lttng-ust From patchwork Fri Jan 21 15:41:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12719877 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 44C69C433EF for ; Fri, 21 Jan 2022 15:46:38 +0000 (UTC) Received: from localhost ([::1]:42402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAw7Z-0006U9-Bh for qemu-devel@archiver.kernel.org; Fri, 21 Jan 2022 10:46:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAw3I-0001wm-OU for qemu-devel@nongnu.org; Fri, 21 Jan 2022 10:42:12 -0500 Received: from [2a00:1450:4864:20::42e] (port=38418 helo=mail-wr1-x42e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAw3H-0007rp-2i for qemu-devel@nongnu.org; Fri, 21 Jan 2022 10:42:12 -0500 Received: by mail-wr1-x42e.google.com with SMTP id q22so394913wrc.5 for ; Fri, 21 Jan 2022 07:42:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jmhL/OO2/CergPGLZmyF9NCYKTuS6CMx+Lqk/P5jTQc=; b=egdEub2zlmdpfyXntZPxBT03VWPkwqIrj0sYdpQd0NGhBznI2saFourXf+tWhg8GRQ AzvdZRaUQUYQmUhyDepEIVN5fNJT8XwzkmzUi93VPXwcrzGbNNp4AOa9Xhxl0QciInIM 3hhRB9RDyvDTxkrl9oKD1knuZUU6FN9ck2/c6BCxE+4+6odWTuxe0Sy+Q0RAHgxAkfzm MO6KlDYwoONr1TooLsGBkyYL9HiBPaHDNVTvm3cKJOsFFBmmWLU2S8yPjGhQfyVa+MbX ao8KZm0KFIDDx9qzVZ6uRZUJ8IFG7p3abeIlqhMXtpJEPF+hWHMI+tSgRUFHtdpHpKq0 FW0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=jmhL/OO2/CergPGLZmyF9NCYKTuS6CMx+Lqk/P5jTQc=; b=iAFqoqPMqT4Rq/M5UptuG03DibHdQCJaUtBOrK0WS86s9cNzCw/9L3B5QSAMZAuO/1 vnzr26zd1m+NhO/wiVbbSWD3IL4mXRC15JTsdo9rrZKuFE0iHoQAXYT+s1ozH/Umpv5n UL5s6act1QHdWrXoRSmhnuZT4np/y6ZqEoLLWt0GBD77akHPb7sOQZ/XB5RLAIMbYSIC XyBdwZrEBuPF8stAuP8Nhz/KzQvin+SxcoFPrlPfqUD60oCj3FtEhO1qQVxgJSeVuzOC D0e+j9Qz3W/WbOVNJAgKl9ckNdFJqpp79bHIDP0SUFUxoqpEWq6HHMXbltWpCwq7s94H Cb/w== X-Gm-Message-State: AOAM531XpohogyHBVKF/3cS64TYplhXeiIqtLr1TZO/rjcJR6GD+Z1in Gu2IqKD8bhZnevjO4cgod41jwnCkf6U= X-Google-Smtp-Source: ABdhPJyrDxvuEOzwxqg/NXSdG+3QLGoImx3NBPO/IKhsjWM+htee5QeS9FsgXY8Uc9BR/l6Oit/qUw== X-Received: by 2002:adf:f90c:: with SMTP id b12mr4410987wrr.379.1642779726324; Fri, 21 Jan 2022 07:42:06 -0800 (PST) Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id r8sm6067360wrx.2.2022.01.21.07.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:42:05 -0800 (PST) To: qemu-devel@nongnu.org Cc: Ed Maste , Thomas Huth , Michael Tokarev , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , Li-Wen Hsu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v6 6/7] tests: Manually remove libxml2 on MSYS2 runners Date: Fri, 21 Jan 2022 16:41:33 +0100 Message-Id: <20220121154134.315047-7-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= lcitool doesn't support MSYS2 targets, so manually remove this now unnecessary library. Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- .cirrus.yml | 1 - .gitlab-ci.d/windows.yml | 2 -- 2 files changed, 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 02c43a074a1..7552d709745 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -32,7 +32,6 @@ windows_msys2_task: mingw-w64-x86_64-libgcrypt mingw-w64-x86_64-libpng mingw-w64-x86_64-libssh - mingw-w64-x86_64-libxml2 mingw-w64-x86_64-snappy mingw-w64-x86_64-libusb mingw-w64-x86_64-usbredir diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 62dd9ed8329..1df16303491 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -44,7 +44,6 @@ msys2-64bit: mingw-w64-x86_64-libssh mingw-w64-x86_64-libtasn1 mingw-w64-x86_64-libusb - mingw-w64-x86_64-libxml2 mingw-w64-x86_64-nettle mingw-w64-x86_64-ninja mingw-w64-x86_64-pixman @@ -80,7 +79,6 @@ msys2-32bit: mingw-w64-i686-libssh mingw-w64-i686-libtasn1 mingw-w64-i686-libusb - mingw-w64-i686-libxml2 mingw-w64-i686-lzo2 mingw-w64-i686-ninja mingw-w64-i686-pixman From patchwork Fri Jan 21 15:41:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12719881 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2E4AEC433EF for ; Fri, 21 Jan 2022 15:52:48 +0000 (UTC) Received: from localhost ([::1]:50308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAwDX-0003vh-51 for qemu-devel@archiver.kernel.org; Fri, 21 Jan 2022 10:52:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAw3K-00022T-6p for qemu-devel@nongnu.org; Fri, 21 Jan 2022 10:42:14 -0500 Received: from [2a00:1450:4864:20::430] (port=41862 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAw3I-0007wy-Co for qemu-devel@nongnu.org; Fri, 21 Jan 2022 10:42:13 -0500 Received: by mail-wr1-x430.google.com with SMTP id v6so398213wra.8 for ; Fri, 21 Jan 2022 07:42:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BSvX07XSbcj+uZJduxG3G9nv8iqDtt86eLgBT/T23uA=; b=Q8WOhkwpW6oMWe3COIvMSUH3g2ho6zbTZEGH0sxHWgqu0aGYzweXzPU8P5zRAN37Mc U4Q1ZC4k9V+c8TOhzdvFutW57oj9ejzngwRQ4C5MT5a0PYqSlPbo89jfmZ7JMDUX+GB5 7kfTMiC1l3Ht5NNLuNNILnVIZcTn1Fn31RgwkBEJZVmAYmK6tzq+FUbFy48c3Pg45Rsg qIf1u/+a2uWc5ZXpRytytSu76wIj8VeE8Wq4Hbe/ES9tD6z51GxUplPfXYLMb7jxJ2EZ fXngHBSZzfog/LHs/LETOyUgM0hrzMKAcIY4N6k/QeizLmQqcz/xBFcM7bR7csKvGpUg 7gZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BSvX07XSbcj+uZJduxG3G9nv8iqDtt86eLgBT/T23uA=; b=eQ9Itzw0znHOEJlarpjslswn4pGpTBxlAfJMSbl/FHl43lMYgS8FrEFvnv8aPj5rvf MMaHq79Ckl5sLl2BVG4hGnLKiJy35fHJlyksOQCZk10lHJhUFtUOxyui23ZSr6VjZEDn O48EDszmxzROe0EA4ssxHfoW65WESfceuOudL8PNKmJ+gZlB8/zH6zsrXJPBHPzJTzFX CqyL3z7TgRhgZQl8DbmMJaN5dKdCxr/6mekgzCmk4BEoj/E2BZCvqmEbtmvwcRAWfd88 3LZbYu+jNxMXbYQBOR6//AE+Ep4UxoIGrujs7m0xeEYZUOueUT8ssicTMstkWg8Q5EtF bVtA== X-Gm-Message-State: AOAM533fSCvwWXZF0TWEdLCE0J55i8/koRScEMm/FV9WhcTR1qHw/2B4 zAtjXkrMHoArwFQi/4+DPrlaDRyZU/M= X-Google-Smtp-Source: ABdhPJw5CHlSIsbi52WALW09ioFHFoXVhUCkjQb6+6gBzK+Lor/ikHwQIr6/PSpOdqaMLRBs3PPF8A== X-Received: by 2002:a5d:5046:: with SMTP id h6mr4373661wrt.167.1642779731020; Fri, 21 Jan 2022 07:42:11 -0800 (PST) Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id k35sm11583440wms.23.2022.01.21.07.42.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:42:10 -0800 (PST) To: qemu-devel@nongnu.org Cc: Ed Maste , Thomas Huth , Michael Tokarev , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , Li-Wen Hsu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v6 7/7] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Date: Fri, 21 Jan 2022 16:41:34 +0100 Message-Id: <20220121154134.315047-8-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::430 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= On Debian we also need libibumad to enable RDMA: $ ../configure --enable-rdma ERROR: OpenFabrics librdmacm/libibverbs/libibumad not present. Your options: (1) Fast: Install infiniband packages (devel) from your distro. (2) Cleanest: Install libraries from www.openfabrics.org (3) Also: Install softiwarp if you don't have RDMA hardware Add the dependency to lcitool's qemu.yml (where librdmacm and libibverbs are already listed) and refresh the generated files by running: $ make lcitool-refresh Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé --- tests/docker/dockerfiles/ubuntu1804.docker | 1 + tests/docker/dockerfiles/ubuntu2004.docker | 1 + tests/lcitool/projects/qemu.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 003ee2cfedd..699f2dfc6a9 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libglib2.0-dev \ libgnutls28-dev \ libgtk-3-dev \ + libibumad-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 8993d2d9e05..87513125b8e 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -53,6 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libglusterfs-dev \ libgnutls28-dev \ libgtk-3-dev \ + libibumad-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index de51a2f1dd4..958868a6ee9 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -43,6 +43,7 @@ packages: - libfdt - libffi - libgcrypt + - libibumad - libibverbs - libiscsi - libjemalloc