From patchwork Thu Jan 20 11:05:40 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: 12718566 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 3EF6CC433F5 for ; Thu, 20 Jan 2022 11:39:47 +0000 (UTC) Received: from localhost ([::1]:43282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAVn8-0000Ry-5B for qemu-devel@archiver.kernel.org; Thu, 20 Jan 2022 06:39:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVGY-0003z9-2j; Thu, 20 Jan 2022 06:06:06 -0500 Received: from [2a00:1450:4864:20::332] (port=35445 helo=mail-wm1-x332.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAVGT-0001tq-I0; Thu, 20 Jan 2022 06:06:05 -0500 Received: by mail-wm1-x332.google.com with SMTP id q9-20020a7bce89000000b00349e697f2fbso21072691wmj.0; Thu, 20 Jan 2022 03:05:54 -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=HwwJK3Ic8vOiGmskKxf1h+aCakkNAUYqzvWmUqx2afA=; b=dCljKkxvjwIBd6xl/FszqYGN0+JCNJRbHXyAnkz34WNUlGBBdU0pYq4YVzlXPhTQqw kPA6dy+AXG91r3a0St0r5UDuUKgs9JC4r3Lbd++OKHhJsjASunWqtPvTZd+pNJHeokS4 /TVM5N3Z3W7XnxNSK38Oy9nr3B7RP7jK9cccsyHi+tT7bvZRtOpdROkWRvExIS0B221T p8/F8BJ5zWAWjA8BnBLH3WT+XQX2k7e/DkBI6odTOPuhjnNHT2uHGcjbtaoJQOTr2cMR PowtUPWnQmWg3Pv+ftznWPdecRD/+JsIRHj+FVdPWB0KIqIKhgcQugXaCCn0CmRYSc5u 8WxA== 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=HwwJK3Ic8vOiGmskKxf1h+aCakkNAUYqzvWmUqx2afA=; b=600MeiHNpcyqBj8Tdbz5DPiMBPlHZKw7xADdf6+5/AgKNEgsn+MQ4oZiuX5WIjBGs3 K8yZm92ofVOwFlAWTN3QsY/Q6gtIJ6dKHsHAjkhAZfisYhzduYIBhJa3JdWtD3lZdzc1 Al+6lnjd+jztCYgCLVx2437MQBD65jfnsAv6XrBKDj6ThyKsHSvcGKD5xt+xpEoJcD7y O8+CuorrJgvebOlvZ5gxJn4MpBipy63L/KU2njteuzRBJzXseUFXqYF4P7aoP1mO6vl+ F2lLuiHXznkCCgvcMqGsbPEgF9ZCfAmJLxKtJk0f1vd50PTuITfm5JHQmwTmoVZbORTt aN9g== X-Gm-Message-State: AOAM5326qF6NZWTPnujI3T1kWn0gK4HGshBGqQkBUO/8km+quA8E8+Hy M5MC4pirrpq9hBqXnix4tLpOFAkUVqk= X-Google-Smtp-Source: ABdhPJy0hNH9Ym3YxvYNYS+p2rgoVqeeYISUvNsFvlZg2unmm9AoR4q0Zo8D89zZr1euLtN0bAuxsw== X-Received: by 2002:a5d:650f:: with SMTP id x15mr5858145wru.645.1642676753000; Thu, 20 Jan 2022 03:05:53 -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 z5sm9996117wmp.10.2022.01.20.03.05.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:05:52 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Ed Maste , Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Daniel?= =?utf-8?q?_P_=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , Li-Wen Hsu , Peter Maydell , Yonggang Luo Subject: [PATCH v2 1/6] MAINTAINERS: Cover lcitool submodule with build test / automation Date: Thu, 20 Jan 2022 12:05:40 +0100 Message-Id: <20220120110545.263404-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120110545.263404-1-f4bug@amsat.org> References: <20220120110545.263404-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::332 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x332.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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é Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 893a5567100..fb78499d6a0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3577,6 +3577,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 Thu Jan 20 11:05:41 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: 12718581 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 0C9B0C433EF for ; Thu, 20 Jan 2022 12:38:22 +0000 (UTC) Received: from localhost ([::1]:35156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAWhp-0003Or-9E for qemu-devel@archiver.kernel.org; Thu, 20 Jan 2022 07:38:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVGW-0003z5-UC; Thu, 20 Jan 2022 06:06:06 -0500 Received: from [2a00:1450:4864:20::32d] (port=35442 helo=mail-wm1-x32d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAVGT-0001uD-JM; Thu, 20 Jan 2022 06:06:04 -0500 Received: by mail-wm1-x32d.google.com with SMTP id q9-20020a7bce89000000b00349e697f2fbso21073229wmj.0; Thu, 20 Jan 2022 03:05:59 -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=4vjKx1I+N9K2I7ZZkgKBPbK0jQvXhaVoh5ziaAVd4fg=; b=GQcrr4l1wGXr7z2PEZaElZd/WxIW03FW2Gc5o3BWf/0tnfXMUbTgJtC/hmNPlL+vck 1kJmu++c+lvM/UW4W2fUwESp1KM4HVd79YEwVemm/myntaQKdnoywEurLyKkR2hZRDbE WakKCs+qipqwUMuTnUlGb+8ANc7hYgtWoXH2F0zqDH/rQlRvQrxmD9+Hg7a2HDTct6Wr MD53NY3YwPG44ntA8kJUTPGPI0ZyxdMVbDuogPDRhQWrgM9d3++a+h9opVV+PcimhzlF FrxzDe4fq+g3Lmg0NoKDaxYSXvaHI2le9DUt3WnBqbMsbKIiTkyCNW4YxRUA3Q913Est YHYg== 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=4vjKx1I+N9K2I7ZZkgKBPbK0jQvXhaVoh5ziaAVd4fg=; b=E3AOekvyszN1TcqHiFG891LUy3xpw6Jcdf3ekJAaetNU0/ojGovVE75fzz3EyNAjXv 6GyfzyuySBTFdDP9stTbqF0z8VQbDMbbyfIa+0M0VMQkbtVgnnTUVD3aMljs8PE2jVhP tMN33x9t1Kd87VNcyeEHocY5/Nj0Gh8n+e4MylXbkoqVtzu73fKKNWAEHC+G87tOZKn5 wnF1MbYSniKu6tbmuXwZ1UiXSpePIRmRlM9ME6Co/LpPFWhtYfmPqc/5norVJSVtcI18 tp4xV4km54bmI8hEjzXvi1gUBDRa7fCsdLcjEc4fp1amvW9LHiaS4nsOwubEkxg4lLZj tAKQ== X-Gm-Message-State: AOAM531c+ZDifLk/5iOnWBtGsgNI/UnAi7xPcIG/g1b3pUs6GAoRtAkQ CISPDYS5t3YHJ7bVKpELVKaalo/hzL8= X-Google-Smtp-Source: ABdhPJy474OHCqrqDR5HydFxEXCRZJtT8ZQCXu/Y5S1JVMmUr6iplED7zOY7BFgp1MRBbT38/CKtfQ== X-Received: by 2002:a05:6000:2ad:: with SMTP id l13mr16035818wry.374.1642676758070; Thu, 20 Jan 2022 03:05:58 -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 1sm1997292wmo.37.2022.01.20.03.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:05:57 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Ed Maste , Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Daniel?= =?utf-8?q?_P_=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , Li-Wen Hsu , Peter Maydell , Yonggang Luo Subject: [PATCH v2 2/6] tests: Refresh lcitool submodule Date: Thu, 20 Jan 2022 12:05:41 +0100 Message-Id: <20220120110545.263404-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120110545.263404-1-f4bug@amsat.org> References: <20220120110545.263404-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32d.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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?= Refresh lcitool submodule and the generated files by running: $ make lcitool-refresh Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé --- tests/docker/dockerfiles/alpine.docker | 3 ++- tests/docker/dockerfiles/centos8.docker | 3 +-- tests/docker/dockerfiles/fedora.docker | 3 +-- tests/docker/dockerfiles/opensuse-leap.docker | 2 +- tests/docker/dockerfiles/ubuntu1804.docker | 2 +- tests/docker/dockerfiles/ubuntu2004.docker | 2 +- tests/lcitool/libvirt-ci | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index eb2251c81c8..9d7f74fc51e 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 @@ -109,6 +109,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..fde6a036263 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,7 +69,6 @@ RUN dnf update -y && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ liburing-devel \ libusbx-devel \ libxml2-devel \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 60207f3da38..82f504e40d6 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,7 +77,6 @@ exec "$@"' > /usr/bin/nosync && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ liburing-devel \ libusbx-devel \ libxml2-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index f57d8cfb299..30e7038148a 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 diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 0ffa3c4d4b5..4ea272d143b 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 diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 4e562dfdcd3..90988b2bc53 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 diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 29cec2153b9..226c178a2a1 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 29cec2153b9a4dbb2e66f1cbc9866a4eff519cfd +Subproject commit 226c178a2a1f077d7ee371680cc649c1591b0457 From patchwork Thu Jan 20 11:05:42 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: 12718552 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 CA3D4C433F5 for ; Thu, 20 Jan 2022 11:24:48 +0000 (UTC) Received: from localhost ([::1]:34266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAVYd-0001PA-LJ for qemu-devel@archiver.kernel.org; Thu, 20 Jan 2022 06:24:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVGY-0003zA-Eg; Thu, 20 Jan 2022 06:06:06 -0500 Received: from [2a00:1450:4864:20::336] (port=50958 helo=mail-wm1-x336.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAVGW-0001vn-UN; Thu, 20 Jan 2022 06:06:06 -0500 Received: by mail-wm1-x336.google.com with SMTP id w26so11360486wmi.0; Thu, 20 Jan 2022 03:06:04 -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=hLgqbzNXFs/GpIvzZYV2CAjeBl5SzV+RyDP4Wa3X0i4=; b=IaRta1HX4w82N4CbjpOMRPSEPdGe2WdCj9KbjIhUvOApynh9mxLmI5rBYvLu12v2X8 eLr2D8JfBY6pDzGttnqobbBDWQuPAH1lR9pD0tiKwUUPeBwpIdCpFxoi1r/L5cKY7TfS nAQZDgU9m9eEXGCxrS4q902hkLmQQg4kMJPE8dWeJgWIH0VMfzSxk9vi6rgs87En2yTz BmHwCz/xq/VoMRvu3vO6480YbMeshG5Ms7nuhO3LvD+iX4ETi711cXuG4N+tTA82c8CD aH6Aq5MJyR/Q0hgYIpjM/n8LhcsislqFr6aXClumZ0FzIsIaRAdfB1GWlmTQ7jPtFlcW YNfw== 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=hLgqbzNXFs/GpIvzZYV2CAjeBl5SzV+RyDP4Wa3X0i4=; b=nb72xhkJYZc8Kc9P6GUA2FCK6Y/N8IiUM2098chxBCPqJQHsASURh/YHPVjfxAvYqW 047U42uf8mM/PowJ0JANxvwKkr+46yaQ6XCT2ceXYuJfqol2e1YOlBbegly/6ootxeR1 PHyu+JqxXCWWvygQfwCKls2VcSGzdClCzvuGn2jt6jm5l1kmUc4Em6JWADUERsUpU+wv np7+uurdFkEk8F/+H+VFKjiMuTWgfng8rIsl81y9RTbeo5Niee5/HNaJ3MUBu4JM2T1g Txtf5GqeKt+Se9sZb3iBXgkbYtFWKGf6iavo9XEacGg8o/yKlf0a+zZxFBjcfaHSem3L 7AKg== X-Gm-Message-State: AOAM533ai3UR0FwhyytfZ10MMZSkaj2givMT7GmaWEcQcNhApiSTnLZ0 MSey5HYGMmK5OuLaf/mB0qFkB6WAtHQ= X-Google-Smtp-Source: ABdhPJzFwEZYM+qAYQqTh1h4v/ciMq7kJ/mh+U5G3H2GIJcSTyg95ODZc0juK3z3NWzzM+BinoSHsQ== X-Received: by 2002:a7b:cd02:: with SMTP id f2mr8390320wmj.68.1642676763055; Thu, 20 Jan 2022 03:06:03 -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 g7sm2337338wmq.28.2022.01.20.03.06.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:06:02 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Ed Maste , Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Daniel?= =?utf-8?q?_P_=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , Li-Wen Hsu , Peter Maydell , Yonggang Luo Subject: [PATCH v2 3/6] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Date: Thu, 20 Jan 2022 12:05:42 +0100 Message-Id: <20220120110545.263404-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120110545.263404-1-f4bug@amsat.org> References: <20220120110545.263404-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::336 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x336.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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 Note, librdmacm and libibverbs are already listed in lcitool's qemu.yml. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- 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 4ea272d143b..7ebaab82b97 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 90988b2bc53..b93707b70d4 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 ed5ab1407a9..948b9912579 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 From patchwork Thu Jan 20 11:05:43 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: 12718700 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 A6A03C433EF for ; Thu, 20 Jan 2022 14:14:25 +0000 (UTC) Received: from localhost ([::1]:51206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAYCm-0007In-3B for qemu-devel@archiver.kernel.org; Thu, 20 Jan 2022 09:14:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVH2-0004Eb-FO; Thu, 20 Jan 2022 06:06:36 -0500 Received: from [2a00:1450:4864:20::329] (port=41714 helo=mail-wm1-x329.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAVGz-0001x2-2l; Thu, 20 Jan 2022 06:06:36 -0500 Received: by mail-wm1-x329.google.com with SMTP id q141-20020a1ca793000000b00347b48dfb53so12927437wme.0; Thu, 20 Jan 2022 03:06:09 -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=WxWriVE1ssSmHCuwjL9f/3A2/ZRCLxWRYTu0rGXBP3I=; b=EQcYSxVPiJADHJ7SzbuIwlYHW/eADHeGgdKsXKDqGuiqml4ByPutPzGbAmr4bVOvvQ kgCAawENgAt/AxOCc5vPWaYob+MXTbVuDQBtUzJKJaR4HCFxsYd5cvZze03Lo9EifOac MHZFx8VgmT4e2DgJXtd8lSeBCBnSXghWx3zcntpfN0RgaTS5pdtL/vALIPdlm/pcWgPF QSwP6sw2cmIITd+6GXK8Y6kcp4YqfM0fTcLyXneRe1qYwNxCedjNKuFFU5jrA3PJseqH KmMQd0KOYOVgFyCBih6o3O1XvsLOecKYzQqjMefdaocGuCInj75f9txkLhbOxJ0KwmtC 4N+Q== 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=WxWriVE1ssSmHCuwjL9f/3A2/ZRCLxWRYTu0rGXBP3I=; b=JB8TsSRuiMmLu5A9cEksnr8dKGcjW6al+ea5P2Xn9hQIt5B6EyRR9EtZw4u2/jB5Ua eNpXc0azgexGH7l23s5OT6h4USo9H2Qr0QZqI2Koo62DSmsGHKDCQ7vN9S9Zg+ADe6y4 BqBmX/mpq9nZ/LnZ8Z3vdEiDN4d8buj/1icEs9Cx8VjZrom+HlMj7lBP8JKy8nw7cAWM 5WX3zxb+EH5BM3uHZPJVXagUVxRqAJ0nXuJ3Jpgo6zOqOJn2L9/TKkf1BwZfVZ0jJs9f Sxl97zBN/HsYu83W16OfkpENiNhKmc5Mj8SHqBLyqbGTB+OwvwoZ7oUpE7t+haO33si/ h6og== X-Gm-Message-State: AOAM530rfsvI3Y2X3b0koygqj95mwKNVAY714ADSuIuz5jjqlIAvilvs 79MgJyZWjlpnH4Cl+8UPHm1ktK0Tkzk= X-Google-Smtp-Source: ABdhPJztC9TY+hA3TpqE9dUtJG/pyiqDWHhSFIcNUx0EKePjlQ6LxRe3eLHby+nuPo2NpcP90d9cXA== X-Received: by 2002:a1c:c908:: with SMTP id f8mr8400204wmb.193.1642676767983; Thu, 20 Jan 2022 03:06:07 -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 h127sm8983005wmh.2.2022.01.20.03.06.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:06:07 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Ed Maste , Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Daniel?= =?utf-8?q?_P_=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , Li-Wen Hsu , Peter Maydell , Yonggang Luo , Stefan Hajnoczi Subject: [PATCH v2 4/6] drop libxml2 checks since libxml is not actually used (for parallels) Date: Thu, 20 Jan 2022 12:05:43 +0100 Message-Id: <20220120110545.263404-5-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120110545.263404-1-f4bug@amsat.org> References: <20220120110545.263404-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::329 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x329.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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 neecessary for parallels block format support (block/parallels*). However, this format actually does not use libxml [*]. Since this is the only user of libxml2 in while 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 merged in commit 25bfd5a75 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> [PMD: Updated description and adapted to use lcitool] Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 6 ------ block/meson.build | 3 +-- meson_options.txt | 2 -- scripts/ci/org.centos/stream/8/x86_64/configure | 1 - scripts/coverity-scan/coverity-scan.docker | 1 - scripts/coverity-scan/run-coverity-scan | 2 +- 6 files changed, 2 insertions(+), 13 deletions(-) diff --git a/meson.build b/meson.build index 333c61deba7..64a146e1d06 100644 --- a/meson.build +++ b/meson.build @@ -449,11 +449,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', @@ -3489,7 +3484,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/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..." From patchwork Thu Jan 20 11:05:44 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: 12718578 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 8394EC433EF for ; Thu, 20 Jan 2022 12:23:40 +0000 (UTC) Received: from localhost ([::1]:51316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAWTb-0002Wo-A4 for qemu-devel@archiver.kernel.org; Thu, 20 Jan 2022 07:23:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVH2-0004EK-CF; Thu, 20 Jan 2022 06:06:36 -0500 Received: from [2a00:1450:4864:20::32d] (port=46819 helo=mail-wm1-x32d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAVGz-0001xZ-4M; Thu, 20 Jan 2022 06:06:36 -0500 Received: by mail-wm1-x32d.google.com with SMTP id az27-20020a05600c601b00b0034d2956eb04so12749863wmb.5; Thu, 20 Jan 2022 03:06:13 -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=pS9OAWouq8KVRXzw5bYHPfuW4Mi4STgtGz18wqOGCxs=; b=MLhCIr+Dx74olbOarPOkf+xogU5DK0paUesCvxZCauG95Xkc8LhMYZUAuyPNFQnokd 2BCtIuhy2Rp8ZiZQ4C5YaumWv9uGlix6lu7nPsWOsoytfbePixfQvw0bUeIyI4giU2dt 46REAbKsS0y8NOAtlBPEjwkRJhBmqp9NpKLwkTnmhwrASsXmrgft1mf+MINWwWEol57Z HVyXC6hz9pngi9iNDTZtM3VkJ3dmmkiO9hiv32jYmZsee8B5Uc8LY3MdZhuADUR/Ks4m e10CIqpYmI9PR1LYhtyjVcvF5DHU25TzQE3w58s0tP/AG+iJC/Kv8xIIu9rD1sgoyhZ1 LXrw== 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=pS9OAWouq8KVRXzw5bYHPfuW4Mi4STgtGz18wqOGCxs=; b=TjLWlKTMInjA/caxKeb1IDo3Zq1T+j3qInayYAKfb9Idz7Jo3t0hnWSvOUWjuhg+co +VSiWf4lquukadQHT6G+5gOlZPUJAGnV02E4vcO9YYF1zx0ummtqIorOesapnSFw9Gdi jX/ivF1mVKtxdU678cUyenHD+qGvB8ZfWrbUlTlSdHrUrCvW9cTMXwdVfQYkp7wnpTMk YO/9p5INybV7o2FmkR4Wm2XSbd16V61/I8cJc3UPpsgNw+e4b0yfMKQpw1lOe8kl8J8B 8a8wI7Rh2D11ewC+5K6EcixLlPeAaKJU1WzqKj5xoIw6osL7I29ysNpW4LsikRl+/M1J efcA== X-Gm-Message-State: AOAM531TdbdYQOqmVzCItJtIx7nO/E3aWPRZ5mokWzz0YZE5G9pCnBw0 Nd0eQLxKTaFbb8UrFWjmEAdpspPlfwM= X-Google-Smtp-Source: ABdhPJzHhlNG0NHXc8QxI7A/V+QpryGeaKTHyinDFTjaum+dLJWMrgwwWA2GaAJwnS1ZdXNl7HkScg== X-Received: by 2002:a05:6000:1002:: with SMTP id a2mr32204697wrx.157.1642676772787; Thu, 20 Jan 2022 03:06:12 -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 o12sm3327420wrc.51.2022.01.20.03.06.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:06:12 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Ed Maste , Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Daniel?= =?utf-8?q?_P_=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , Li-Wen Hsu , Peter Maydell , Yonggang Luo Subject: [PATCH v2 5/6] tests/lcitool: Remove libxml2 Date: Thu, 20 Jan 2022 12:05:44 +0100 Message-Id: <20220120110545.263404-6-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120110545.263404-1-f4bug@amsat.org> References: <20220120110545.263404-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32d.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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. Signed-off-by: Philippe Mathieu-Daudé --- tests/docker/dockerfiles/alpine.docker | 1 - tests/docker/dockerfiles/centos8.docker | 1 - tests/docker/dockerfiles/fedora.docker | 1 - tests/docker/dockerfiles/opensuse-leap.docker | 1 - tests/docker/dockerfiles/ubuntu1804.docker | 1 - tests/docker/dockerfiles/ubuntu2004.docker | 1 - tests/lcitool/projects/qemu.yml | 1 - 7 files changed, 7 deletions(-) diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 9d7f74fc51e..591af43d60e 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -56,7 +56,6 @@ RUN apk update && \ libtasn1-dev \ liburing-dev \ libusb-dev \ - libxml2-dev \ linux-pam-dev \ llvm11 \ lttng-ust-dev \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index fde6a036263..3abac7a8b13 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -71,7 +71,6 @@ RUN dnf update -y && \ libubsan \ 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 82f504e40d6..1d01cd94405 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -79,7 +79,6 @@ exec "$@"' > /usr/bin/nosync && \ libubsan \ 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 30e7038148a..1b78d8369a7 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -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 7ebaab82b97..699f2dfc6a9 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -90,7 +90,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 b93707b70d4..87513125b8e 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -92,7 +92,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/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index 948b9912579..958868a6ee9 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -64,7 +64,6 @@ packages: - liburing - libusbx - libvdeplug - - libxml2 - libzstd - llvm - lttng-ust From patchwork Thu Jan 20 11:05:45 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: 12718619 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 61F34C433EF for ; Thu, 20 Jan 2022 13:15:09 +0000 (UTC) Received: from localhost ([::1]:46036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAXHQ-0005Au-7a for qemu-devel@archiver.kernel.org; Thu, 20 Jan 2022 08:15:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVH3-0004Fl-5X; Thu, 20 Jan 2022 06:06:38 -0500 Received: from [2a00:1450:4864:20::329] (port=55953 helo=mail-wm1-x329.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAVGz-0001xz-4X; Thu, 20 Jan 2022 06:06:36 -0500 Received: by mail-wm1-x329.google.com with SMTP id c66so11231065wma.5; Thu, 20 Jan 2022 03:06:18 -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=xPHUAsR02tGl97Ap5cxvHh0G/aTL5XzanhOn1Ca3aRY=; b=QU5k8silBjaX21Obx1+veqdvqyIySO5RV2Hj6k3VgwGQwMutTi+I2kjsreq6jS5Kpc 90xZNqtDZX/ueEP+o/It9UkjRubEwQH/ALHNoNPg/RO1KcdHsKOwwqueAuAw4LjkO7FW xV1X4EK2v04wP7OU1UHY9rHERKnO3/rRBRA2SCBLz3+RVJIBn2ZmQ00N+2BDfJtlzCSo Lcsoz3f74ftaLFQAe1zE+ZGHS1DggnxBBC5QhAT60ffHVkuF/1tTTmny3YZTlhIOiJns zeAvrkL+Rm8NP8Olb+dGOJL18uJZbyvLdbk4byAM0aSzHjhOgd+Tt+vSPK1oWUm7EyYQ AyZw== 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=xPHUAsR02tGl97Ap5cxvHh0G/aTL5XzanhOn1Ca3aRY=; b=KzJM+g9tAaD/hUXJbdVQXG2XI9oZzCuAYOHO94rzEsVxvt40SQV5StwuW/+9iGg/Qh /2XRdeRu6usX5U/lWMbzGNH5thGmT6eM4SDXW4N5hejU3c5UQ5c11rkrOsJd7u0dDKK3 cfs5TRZcJmx7VKH4X8NDljKnJ5xfiGY6R7ZGcdCQLO4zkXwB4WT9c2rJGxRs19EsUVSD qXs3/iD02PZ8DhGObJoRgZ2mYmao98UYisaf9JPpOn+z4fn4eqGijRttU4hAPEq1xsTJ Ya0jO4hRNB8udyO6MDpbX4QvAEsr0tqbPy8BK6uV59zKWXGJtF0k0rSfJwLAY6Q0bS1+ i3wQ== X-Gm-Message-State: AOAM531NFqfgvx9gKXWH23dP7+7nQjEqQrxELGOUHCFal4MWZS5lLpP8 0XKCLOUooeF3Hi05KFJiTipZamjgArE= X-Google-Smtp-Source: ABdhPJw74IEEk7DQcm2AsJnFI4LunRFn9IYrMNRx8rzcOKrHNZQ9oazFKapXzK6jL773DfJZCSbi4w== X-Received: by 2002:a5d:47a8:: with SMTP id 8mr19868864wrb.675.1642676777644; Thu, 20 Jan 2022 03:06:17 -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 f14sm2548821wmq.36.2022.01.20.03.06.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:06:17 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Ed Maste , Michael Tokarev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Daniel?= =?utf-8?q?_P_=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , Li-Wen Hsu , Peter Maydell , Yonggang Luo Subject: [PATCH v2 6/6] tests: Manually remove libxml2 on MSYS2 targets Date: Thu, 20 Jan 2022 12:05:45 +0100 Message-Id: <20220120110545.263404-7-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120110545.263404-1-f4bug@amsat.org> References: <20220120110545.263404-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::329 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x329.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.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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. 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