From patchwork Thu Jan 20 11:30:10 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: 12718744 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 09615C433EF for ; Thu, 20 Jan 2022 14:56:32 +0000 (UTC) Received: from localhost ([::1]:36114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAYrW-00051s-Ny for qemu-devel@archiver.kernel.org; Thu, 20 Jan 2022 09:56:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVey-0005c4-PH; Thu, 20 Jan 2022 06:31:23 -0500 Received: from [2a00:1450:4864:20::32a] (port=55834 helo=mail-wm1-x32a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAVep-0006V4-Kx; Thu, 20 Jan 2022 06:31:17 -0500 Received: by mail-wm1-x32a.google.com with SMTP id c66so11379667wma.5; Thu, 20 Jan 2022 03:30:25 -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=KFfTFSPPAUYYYOsj9CXpiiq4SZ9PiIV2X7W+ziwph6136otseO+UWwD4EiojxBf8Am awYQTasEgnYyOmBSCdw1E3PCFvYrqwI+YkOb3q0N5HrK6SRP9i9h4uAb5obZx32XPzqK qCvgHBSut9xlwfWjauHDy9oLWC/HTDmTkjT7ukNS2Mv5tIx/qJRgrHyiZ7X2FPUaTO0N wTYmLrADGqm4KYETr2p9+9ZOGHJOTcWQBIXr1X3qbtr48VM6GDZL0DdDNW+xQv518dYt uPbBjcf8w7Itz5ulLHemzFOYHmBb0prVNU2fhzvxDQAQZP4NF5WaZCbeWGQnXAECvKvu FelA== 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=K7ozeXLQYxa6r26//Y0OjPlKUl7IrZ7+Ys+PzC8Rtgnj8+qZcFKXyN8tr3QC3OVs1m jULtLts+xh+2OoBPVZbI0LfWVKp4Gzm9icWQxv53SGKBT3i1X+gOa91E0nZJlHRALO4p bz0WdS45SXsbCcBi7q4zkOQXDDCEHoxCuMW8qnnN/BE2U7c5EWfYSBXJ42pCjx3RMQ8I aX0tMEb6GSA2Ve3mDWeKt01RJ8ayeGBbxw2YoMfZs2wWmcvciVhPTmfpW/Vm6x4h1VbW 8f0mrqrQEwvwYhNL74v7io7qmv9QptebdRjrWAEzuQXev+YjP0ktfhQt32W68dYRhza0 60VA== X-Gm-Message-State: AOAM5302LU2ixg5d6rxgfNSmL20AIkb/leYp0OXVzCqUVGRB6kgBUo/V G/3RQMFm9rAFK9RdNGrPXy2PNDUy10M= X-Google-Smtp-Source: ABdhPJxGOSVS1tvB6/CyHvYWfamXF4ha8fA1bkd8ADlTAdotH4h47UdHHGaGIARQSjwT2OYdMyN+Tg== X-Received: by 2002:a05:6000:15c8:: with SMTP id y8mr18130147wry.531.1642678223868; Thu, 20 Jan 2022 03:30:23 -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 o12sm3412508wrc.51.2022.01.20.03.30.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:30:23 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Ed Maste , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Michael Tokarev , qemu-block@nongnu.org, Peter Maydell , Yonggang Luo , Thomas Huth , Li-Wen Hsu , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 1/7] MAINTAINERS: Cover lcitool submodule with build test / automation Date: Thu, 20 Jan 2022 12:30:10 +0100 Message-Id: <20220120113016.268265-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120113016.268265-1-f4bug@amsat.org> References: <20220120113016.268265-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32a (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32a.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:30:11 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: 12718752 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 4DBC4C433F5 for ; Thu, 20 Jan 2022 15:03:27 +0000 (UTC) Received: from localhost ([::1]:40150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAYyE-00080x-56 for qemu-devel@archiver.kernel.org; Thu, 20 Jan 2022 10:03:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVey-0005cA-QY; Thu, 20 Jan 2022 06:31:23 -0500 Received: from [2a00:1450:4864:20::335] (port=40847 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 1nAVep-0006Yc-LU; Thu, 20 Jan 2022 06:31:17 -0500 Received: by mail-wm1-x335.google.com with SMTP id r9-20020a1c4409000000b0034e043aaac7so44758wma.5; Thu, 20 Jan 2022 03:30:30 -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=I+xApLAoMBnTvqjBVMTT+SrNme/1HkNaaLkMkxZM+xM=; b=hpHNPDqIL9hOmlal2tw892W89TMe45rziNQaK7FEt3cK1KmMHve2e4cVEO54ldC6yt Ij7zi1wGfMKYp8YgLTIj+OPZv1tdvRu7mogzw3KfL/JuGuWQEqVWQYAlV81LYZcSSj9q DhwECZ5sT981anilXPPZA+ULccf21ZwmJn9j6YIgMSqPcJ0oHsAMaUb/ayaA/gvd2oL+ 4vhgJPsZRufLca9/BYbgn0enh8d8erpgzr83KCvlbC65oLko9dZa51/p3yKa+8Me7+II ANuOR1MYgOgQg0QF0l83eeRPAVgTxnc9T/FyTN/ksC30AkhDprjgsjNnOFzNXGXqRS6C Tbdw== 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=I+xApLAoMBnTvqjBVMTT+SrNme/1HkNaaLkMkxZM+xM=; b=01jHPb4qOG96DAFfSQ3WffgfdQNHARtvyC8q2y+g4WaZa13qA93czQ79aU3Fcrk2X/ rQp1rkB4PiQ3BTd6hRoWEVrHRrkYNfOwYFSbIFw1T5JxVn0gCjxYil9RymmRUwXc3Hip QLk61GxiD7rOufOR7CxGKiXM/NRLpPE+JbzbQY5xflytRpgO34sg2uSjdymiy2jnPmOL zdkU6jV6jke8D6onNSul+eJa46clLy+yobgMdwXIQAq7vpco2yiSsKoZGMNQspwDTuKm lqr2vEcJw1AKPl3EYT35eqFrupUme5Sq0jqKH82KNG3J330aWoAK0EKm6dG4+04L38R9 n8HQ== X-Gm-Message-State: AOAM532TMpfkxWHDtR1U3iPUpJIUDnlhk+P1ptRWjFgKAsgWC3zCzPwA eW844M7kOCB5qXtLmgvFXlF3Cw0VyR4= X-Google-Smtp-Source: ABdhPJztcKMDFsiyOhRzMGmmVxul4mroELibFhaNDuqcCJsoEVt297828L2ZBNOG1/6BYxdPRBYT7w== X-Received: by 2002:adf:dd0d:: with SMTP id a13mr33567669wrm.610.1642678228993; Thu, 20 Jan 2022 03:30:28 -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 g30sm2749538wrb.29.2022.01.20.03.30.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:30:28 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Ed Maste , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Michael Tokarev , qemu-block@nongnu.org, Peter Maydell , Yonggang Luo , Thomas Huth , Li-Wen Hsu , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 2/7] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Date: Thu, 20 Jan 2022 12:30:11 +0100 Message-Id: <20220120113016.268265-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120113016.268265-1-f4bug@amsat.org> References: <20220120113016.268265-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.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 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é 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 Thu Jan 20 11:30:12 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: 12718738 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 940D7C433F5 for ; Thu, 20 Jan 2022 14:50:23 +0000 (UTC) Received: from localhost ([::1]:57642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAYla-000088-HW for qemu-devel@archiver.kernel.org; Thu, 20 Jan 2022 09:50:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVer-0005aq-6y; Thu, 20 Jan 2022 06:31:19 -0500 Received: from [2a00:1450:4864:20::333] (port=46727 helo=mail-wm1-x333.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAVen-0006ZZ-Lz; Thu, 20 Jan 2022 06:31:12 -0500 Received: by mail-wm1-x333.google.com with SMTP id az27-20020a05600c601b00b0034d2956eb04so12904075wmb.5; Thu, 20 Jan 2022 03:30:34 -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=oDbYCqQU1dkGaz37OaieH0ILazUkrWV4OQ7/olVfnlU=; b=PcwsRpnzk0ThDqs4j2HfXPcMsSPUHVWURXvGsl1aYFpG8dppw8FQWzj1I+BmGmkroA twRx/Hm7UeFpWQbtM7Y2l/KrYRtfcxpmHnfrC7CHItOtt1alannyMlUYx/ZAabSz67DX GSoermnZfVAD9jO6yXn9VG/ofNWd6L3ypEm98XFFIyZ1p7skQrmHxS5YIrN9inhahpVx AWTW5WGh1iXM3Qb+Pi6tyq2x6TjlG2r7ZMMg1/ILQE9X84QeyonnVm5oxWcvcRU4K8zP QwZYdO5x2UwJCdjauftGBNxMaz0TQ0rhYNPxn16imTL/NISS5I056pUVAgSbxTfkPjyg Zw/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=oDbYCqQU1dkGaz37OaieH0ILazUkrWV4OQ7/olVfnlU=; b=ILRw5082DsfrIWpixDeaobypqJUXg92o3mt+EoW4XaPCtXcrWWBl3CkzSHik5Cb6Ma CXhicka+UO8RhYkf3XyG0uv9Y5AnNpRrlnx5Wa0u5CSLk+KREX/AmtYuftLOd59ilpxe WCBl16PFxC/hbAmHdKBGIuqi7hLmioC+UEajP2SXu6GY6ek/Qh2zIXkrZ8CvoAGgnBez oIwNtxzWouMLHVTpFB4c0udJFH5xs2le4fOgfE3Z7pDpHitn57m8BpiC/dDr14dZvdTr BaZQ0fi8YnP3+b92DRbULoJQ/OHqR0C//gLJK2jtSxsgVpdB7rYn4OJuLfifkOGjUp4E cNmw== X-Gm-Message-State: AOAM531ZLksnKzCVkhZ/VAkAfX66fCu5cwvEq5xOOkGBsYfR4DVy+6wB HYtng6iE38YYdezNHI6mY2RoLOiBToo= X-Google-Smtp-Source: ABdhPJzP9NVAtQG6Fk+29Zz+/QlMToJ/qxD/Y2nGWkomOYxG6Od7hbjgoUrrI86shY6TRuR2Wdxqfw== X-Received: by 2002:a5d:6e83:: with SMTP id k3mr6795310wrz.506.1642678233822; Thu, 20 Jan 2022 03:30:33 -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 p19sm2171334wmq.19.2022.01.20.03.30.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:30:33 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Ed Maste , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Michael Tokarev , qemu-block@nongnu.org, Peter Maydell , Yonggang Luo , Thomas Huth , Li-Wen Hsu , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 3/7] tests: Refresh lcitool submodule Date: Thu, 20 Jan 2022 12:30:12 +0100 Message-Id: <20220120113016.268265-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120113016.268265-1-f4bug@amsat.org> References: <20220120113016.268265-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::333 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x333.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é --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- 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 +- 9 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index 9c52266811f..bdcce578edf 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 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' 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..ee610c89fe1 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 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' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' 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:30:13 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: 12718737 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 E775DC433EF for ; Thu, 20 Jan 2022 14:49:01 +0000 (UTC) Received: from localhost ([::1]:56000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAYkE-0007Mw-Sf for qemu-devel@archiver.kernel.org; Thu, 20 Jan 2022 09:48:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVey-0005c5-Pm; Thu, 20 Jan 2022 06:31:23 -0500 Received: from [2a00:1450:4864:20::330] (port=53891 helo=mail-wm1-x330.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAVep-0006ao-I0; Thu, 20 Jan 2022 06:31:16 -0500 Received: by mail-wm1-x330.google.com with SMTP id n8so11384489wmk.3; Thu, 20 Jan 2022 03:30:39 -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=4Tjd8wVbUrFFk0Vv7+6+0PlH5zCkrfjOZaloy1pivCI=; b=DnnEpnBu/UCGE7O4FQ22zV4Vt0qNNXRrwRVTsn3yGTTTLKr4rt9vtRi/xPWdxfyJ+v ab44jKtKGms39A1RhNpXaj6CAzfmgpPMXvL/4U5E2yOzhxbPyLt/qWGaAWZ+svCDJxk0 fSzBcgWt2qZkUSw36rVR+po/Xyw7zpX4Dteg2ZlDR0beUunhR8V2q/Np0hcWZ0TcB5uJ j8mAomelVUyfzxnSqJSW94c19ojzY5X8/C4cKMHue+JavBI8kO0NqZStwzFZ2x8KS8cd k1EVMUiXRN0HPy9rCM8BZAEPCKGZCsebkpOoWV4I65kxVWw6677j8ED2/885rgdjF1B5 w47A== 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=4Tjd8wVbUrFFk0Vv7+6+0PlH5zCkrfjOZaloy1pivCI=; b=CAInc+lmNojnWCrZRMPY/7i8Xa2x4PJYlTQUF81ccxBpas8tug2Y+5Hb7amUa81uC1 iPapu0lJ+KqvZtONl8zvGWIOa95DTmDuXnLh6hX3NE/shbS8YW+yZhCeHPsd6MY32fFj Iw9lomg4zIktylcTANA6TRMN3KD9WB7HOaghQxctPoY0TCxePcSZmHTAyJx1xnsnIBiJ F/4jFMtn6RIRbeq60QZZpRPSmEfjNQ2IjluEMR1nQBNYLykIxI8I6AoxOxpVFd6Olxoe 6wm8qCYOZm/NGO8OMfW+OjPzmqkPiYMGDyEjPFomTJzuD+gcyacmD1M8gP3OHH/ycyGQ 19YA== X-Gm-Message-State: AOAM533GREsp/2uTk3osQThypRBUIcIu409wjhYMwA/tllEz0nmrEZWP bXhCH532u8fbwOw8O9KGbCwVFJa1uK4= X-Google-Smtp-Source: ABdhPJwzJ/1PHf1uI+fR7TIi/ilHgXiUoFwuDLk91Z8nLGG+2zOweiZqxRS6ckJcjK+tnQIvizPtnA== X-Received: by 2002:adf:f2c5:: with SMTP id d5mr32392614wrp.90.1642678238732; Thu, 20 Jan 2022 03:30:38 -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 k37sm8968471wms.0.2022.01.20.03.30.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:30:38 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Ed Maste , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Michael Tokarev , qemu-block@nongnu.org, Peter Maydell , Yonggang Luo , Thomas Huth , Li-Wen Hsu , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 4/7] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Date: Thu, 20 Jan 2022 12:30:13 +0100 Message-Id: <20220120113016.268265-5-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120113016.268265-1-f4bug@amsat.org> References: <20220120113016.268265-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::330 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x330.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. 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 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:30:14 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: 12718732 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 22037C433F5 for ; Thu, 20 Jan 2022 14:39:34 +0000 (UTC) Received: from localhost ([::1]:46070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAYb6-0000N1-U4 for qemu-devel@archiver.kernel.org; Thu, 20 Jan 2022 09:39:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVer-0005ap-3h; Thu, 20 Jan 2022 06:31:13 -0500 Received: from [2a00:1450:4864:20::32e] (port=36407 helo=mail-wm1-x32e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAVen-0006bJ-C3; Thu, 20 Jan 2022 06:31:12 -0500 Received: by mail-wm1-x32e.google.com with SMTP id i187-20020a1c3bc4000000b0034d2ed1be2aso19728514wma.1; Thu, 20 Jan 2022 03:30:45 -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=o0Ch+RME2l38bhl74gINOecYnAsjvaySVbbED4Cbw5Kr8EPsyXpVhr26xix88WgPPi 8ZfNcNpeeR+AqQkiI8DPKKLzo+LKBwYXmHYfrQk7UsOXZeN/F/idK5CC35qUqqlrFTVG MLeb3QrmZqB4Gkj14xhajFoSJIri58LzGcpUvoIVpCo8Z+Zdfc+KbDIo12vh6IqXL3Nd mCqZUwrT22Q8mdCdtYQNCsbNlXojyv7cAHLltyQh3FjDQuG0ZbiS/mdjMs+4Ar1ZmayD MP5vi0RAENUhXZkutevBjHOqniuARdpeE1LhlpZQY15AT+qbFAQdR9vs+rw8hKYG0NRo 3Dfg== 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=Olxu/tViM7BMU5g3vHLh+yfryl95i/AAJ2VWv9GCIpyiEuvy25uyGH2XR4eVrIIf3+ e4AnWcM91hsURk1nQKXojjC4GRYQyFbnqnm4Z42GjxvrgWDheGARzPkI+KNEy+t059za nRwAv0LGHdW36RRTsV0LX8MBU7YPoqge1AvYvC22V+wRih8v3bzzdmGNG2sPRm+PwhjV vfDqIdn/vn0GT5kG4mM/RtUXwIR3NiRczADWhxlnVnx7kZjpmo7rCOqh54nxQrHZl//Z 9RqLtVnqDaOmt8dED8fiYzspRLIjBTFLPQD+Naz6S8S/9cW4rRONEM1ZwC3n1UGpf9De oHzA== X-Gm-Message-State: AOAM532wXO1UHIlA2Q/D25W1ohEuwKKWA/gIO/JnfINeOdmKK4w3LSUX bB2A7M8cSfEU3yQ7DFx5Gnr8egaW5UY= X-Google-Smtp-Source: ABdhPJz2RpyItu9y8Ccm1T089InmGwgEgignEQif+TBZnfBLF+jkg8K6XyjokLR0NGFg+cnQEk+sCw== X-Received: by 2002:a5d:53c6:: with SMTP id a6mr8605148wrw.180.1642678243793; Thu, 20 Jan 2022 03:30:43 -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 ay29sm1970895wmb.38.2022.01.20.03.30.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:30:43 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Ed Maste , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Michael Tokarev , qemu-block@nongnu.org, Peter Maydell , Yonggang Luo , Thomas Huth , Li-Wen Hsu , =?utf-8?q?Alex_Benn=C3=A9e?= , Stefan Hajnoczi Subject: [PATCH v3 5/7] drop libxml2 checks since libxml is not actually used (for parallels) Date: Thu, 20 Jan 2022 12:30:14 +0100 Message-Id: <20220120113016.268265-6-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120113016.268265-1-f4bug@amsat.org> References: <20220120113016.268265-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32e.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é Tested-by: Philippe Mathieu-Daudé Reviewed-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:30:15 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: 12718645 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 43B0CC433F5 for ; Thu, 20 Jan 2022 13:47:31 +0000 (UTC) Received: from localhost ([::1]:37510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAXmk-00046B-5g for qemu-devel@archiver.kernel.org; Thu, 20 Jan 2022 08:47:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVer-0005b5-SP; Thu, 20 Jan 2022 06:31:19 -0500 Received: from [2a00:1450:4864:20::333] (port=39625 helo=mail-wm1-x333.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAVen-0006bf-Kd; Thu, 20 Jan 2022 06:31:13 -0500 Received: by mail-wm1-x333.google.com with SMTP id o1-20020a1c4d01000000b0034d95625e1fso6666462wmh.4; Thu, 20 Jan 2022 03:30:50 -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=6ZDD7tv5gBefrVCK9zzuNHZ2FxQhjAIX6a4cNo0keLE=; b=CEJKRYy7kTWNA0GQOuH4hw4zcU3gToUqghM0xe8502eK7wk8BVkEQBmYYBAY5P0Bw5 r6ruQMmZ+MwUDMJf5XqqValvWjRovxr6QgtKIwu06gxfeHgHhnarnIZHbEZAiYTuMIVw gA4YnwRch38GhgZu0IU+yGX8QlOtJFLEYMd1ct1FP7XePgfMX64gr6iypl9rc1S7p/op wibFMXP8re5j/foo973gch6FrgbdWdUW2q/U788fHm4VTkKwXbtSaBr6lt5kYAhystu6 EIOEH0zbqgSc6CaTeoHOZplATbKWPE6QGOf6/eixx6b2a/6N30cf0JKAypgmTt5lFIr3 SLkg== 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=6ZDD7tv5gBefrVCK9zzuNHZ2FxQhjAIX6a4cNo0keLE=; b=UMLsfokDdNM/oYAVjD9aMgnGz9iW6NA6BbQ9empKXZGaLcNH4Dkgp/67Onxc89jI7C sx4KZ/d6L3FX8bf2owyXQLnkOmEy5Pre37akywJK6Ya+QH3bUwLCeM17awI03abGl8zB ZxH0XvNiBgi14qJdyqzF+9pT2eNy9t6CHr2uI9ZN/+zhwNjFWYFVxB6N5UvGpuiqHoRu t98fPhxVsmV3LJKlRGoz8wgwTHLv8HwxfQyrY3I/zFaGQjMtrKfU/XbTt0SuCSRxH5zL IT3TuCltzm3oWQLuAtnZGdhbvFZ5KhdRTp74Equjm/2z7W2bgVQSyAIqN85pPZqnSOt8 gfnQ== X-Gm-Message-State: AOAM531jh4xBZiijpuXtWpAfjNlW+bhyux5YvVMGM2vSHxK6YAobhA3T QFSJvkRSe7V558dwx+JlHEx1w/fUdHs= X-Google-Smtp-Source: ABdhPJzT03IyqXgz6IzrjWUtsOqXGx7ilJJZoZxca3uOaMdqsywz814T/lMUuSLK6IUgip7779GqVg== X-Received: by 2002:adf:eb41:: with SMTP id u1mr33755825wrn.201.1642678249500; Thu, 20 Jan 2022 03:30:49 -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 d11sm3227830wri.65.2022.01.20.03.30.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:30:48 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Ed Maste , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Michael Tokarev , qemu-block@nongnu.org, Peter Maydell , Yonggang Luo , Thomas Huth , Li-Wen Hsu , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 6/7] tests/lcitool: Remove libxml2 Date: Thu, 20 Jan 2022 12:30:15 +0100 Message-Id: <20220120113016.268265-7-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120113016.268265-1-f4bug@amsat.org> References: <20220120113016.268265-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::333 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x333.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. Update lcitool's qemu.yml and refresh the generated files by running: $ make lcitool-refresh Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- .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 | 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 - 10 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index bdcce578edf..79469deb4f7 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 fusefs-libs3 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 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' 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 ee610c89fe1..331791103db 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 fusefs-libs3 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 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' 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 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:30:16 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: 12718734 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 5718EC433FE for ; Thu, 20 Jan 2022 14:43:08 +0000 (UTC) Received: from localhost ([::1]:49262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAYeZ-0002gk-EY for qemu-devel@archiver.kernel.org; Thu, 20 Jan 2022 09:43:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAVeq-0005ao-TJ; Thu, 20 Jan 2022 06:31:13 -0500 Received: from [2a00:1450:4864:20::32c] (port=44912 helo=mail-wm1-x32c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAVen-0006bq-Kd; Thu, 20 Jan 2022 06:31:12 -0500 Received: by mail-wm1-x32c.google.com with SMTP id l35-20020a05600c1d2300b0034d477271c1so12935117wms.3; Thu, 20 Jan 2022 03:30:55 -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=vabZUgXCc8y6pgkTLFnvHt9OHIbqfyKMtptKUA3UOiA=; b=qeZ+Kd0kz90xUXDc45o5XWWSg9iVSaJAzd/+z6vZ5LdRaY63noG4NwCNSlcqQ3+Tld dIgAXF18877Hpqai7hJDWKRj+fsrvyvBuLjxGef9gmiKR1zITpPpQ9RQUcod2oJiurfV iSNd7KHKBaeqHr9cNU9QzbRbtUWrarA4+JVzzXm89adz6hO4QBpNRi5QyzUyPuTRQQR2 L40B+xLZupTIQO07kfGS11Xs3a2j+HWtL1eSuKJr9WLtkQmg+UlkAPEnU63/RvB7+9XW U3/YusF/6CJSq/LHlJPCk1DlBVHtVmOZcvrhBPg695u0/m43mMc/AYx7Z6j05RNdG4pk lZfA== 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=vabZUgXCc8y6pgkTLFnvHt9OHIbqfyKMtptKUA3UOiA=; b=6KmG872/ka4FiKU+NUgieg6wZWnDh4YY0cJLqc4uaz8gOcSw/eB6qJH9uAvocYHFTC liQl4ygtVj2eM+N0SIq911DWTeOjoT2LJ0nsr0m5eZ/vh2ov8g8w7lG35MxbvCTZDBmd HS7Z+GSR+M+I3U6qeUGDkkyDOIhyxWVdCKPC93mlS26oQ4kHg1nDfHmYx470xyganLaw 6/lPBoIfmWuJSljyF8VT8BIma3WcNSiRa9gs31G3eU4sfdHT6NTawRsYDE5uCVeecghI 8pGMYcUTD/GlN4TV8mnCJKHTt8Pg+StdwpOdFzIghwPkXvfUI/GD3GcUqH+IGmKAGr/Z SorA== X-Gm-Message-State: AOAM531CLJjbIyHh21m1AwFkq0bqRY8gz2ytfNC/IVj+kTQZHqJVFeaM lw3X8YBwaEbyYLTBAgkNLS8wqO1EP0I= X-Google-Smtp-Source: ABdhPJxxI4afl6FS1H2vRJEN+veUJBzkKmtZAek7DgGVf2yFczwJqRMa7tjsF23DU9aHIfGosHiGKQ== X-Received: by 2002:a5d:59a2:: with SMTP id p2mr22526109wrr.54.1642678254613; Thu, 20 Jan 2022 03:30:54 -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 o3sm2613248wrq.70.2022.01.20.03.30.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:30:54 -0800 (PST) To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Ed Maste , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Michael Tokarev , qemu-block@nongnu.org, Peter Maydell , Yonggang Luo , Thomas Huth , Li-Wen Hsu , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 7/7] tests: Manually remove libxml2 on MSYS2 runners Date: Thu, 20 Jan 2022 12:30:16 +0100 Message-Id: <20220120113016.268265-8-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120113016.268265-1-f4bug@amsat.org> References: <20220120113016.268265-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32c.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. Reviewed-by: Daniel P. Berrangé 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