From patchwork Tue Feb 20 17:44:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 13564323 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 80846C48BC3 for ; Tue, 20 Feb 2024 17:44:41 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcUAF-0003BO-Cl; Tue, 20 Feb 2024 12:44:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcUAD-0003AQ-JY for qemu-devel@nongnu.org; Tue, 20 Feb 2024 12:44:17 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rcUAB-0005J7-ST for qemu-devel@nongnu.org; Tue, 20 Feb 2024 12:44:17 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4127188dd5cso3988165e9.0 for ; Tue, 20 Feb 2024 09:44:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708451054; x=1709055854; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W2K3Tqm8B14NRMR5SqLoegn/taEBzi71iE5TgmlRtzI=; b=NXi299p1g3C6PjQPRTOE7iHuZ3PLnOaTJcPDZsE3lsst4f4sf7f7Sc8cfsqZL82WYW z5qiK9r0E+V4RKWuCAG5h8rKxWF4yrbx7V7JI8uBC9v4GtL9Nli/eibrjiiPSJzD2hpA k9JmyHLCDaQ1tHr9yPxcKEGLIlZsk3au8dUyKNC3GCPYBNvfetKfJPAdC7+CydvwVBpD +2U7kX3aSzEFEnYZirNHw2rU3pHFQeB1CE9ejxMB/s8J+YZqminEgJnxDCVvBHAQwj6H lxoKU6WJQ9wACCjxIAZKyi/IJrmuhJlcXlwJPCxbYn0dcYz9EVrKfv171GM555l1xQus Lv/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708451054; x=1709055854; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W2K3Tqm8B14NRMR5SqLoegn/taEBzi71iE5TgmlRtzI=; b=DIO35h0EFwPYxhjgFi6+vzqjKpi/AWBR3xnpftRcDhod+rPAkZjh5fEArb98J3e+8T l4rlIdeYKswcaB0Otj9KnRAHpQdemjxlMwjVfrDCAthQvVK/ZnTdUaRbuzAMoPvUJ2/3 W7TBlG1WnO/jvOqpdiQb+VFI1bf1F3Yw0Zzx4ji7onCSlyQD8omNYT0yQmXmDdBBPwt2 6FBdlfEoSWvg5V62mNPa+FHv1SysaVi2n+kwvvMU+fxA67qQrgWj/zTfypHRmi7PgYLX U5jg+CWYIrQLS/e3if+gOkmWzJZOB7VCJoHBJa+pe5cwnYmb8L+gRMxFyHSA6BF35QZx smVQ== X-Gm-Message-State: AOJu0Yz3zbQaBLTxxso4qWSRLjqbRAW4srBtQAjuF4vbc54BL0mqAO4U d+gLpymChlN+aDaaLhZyxBdyRD0TDAvWC8TSUw7cKxTfofkKocCu6IxWBUPY2gWVp3/uHG1lU49 6 X-Google-Smtp-Source: AGHT+IEJlhcc0UIFL0RuMXpQLwfiADwORH1oNrVco7Dwcu6rzwXhrYbt//ydhMz6bMXsfybj3KAyCA== X-Received: by 2002:a05:600c:35d2:b0:410:8ab6:8c72 with SMTP id r18-20020a05600c35d200b004108ab68c72mr11087972wmq.31.1708451054530; Tue, 20 Feb 2024 09:44:14 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id k5-20020adfe3c5000000b0033b66c2d61esm13988443wrm.48.2024.02.20.09.44.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 09:44:14 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Yonggang Luo Subject: [PATCH 1/3] docs: Document that 32-bit Windows is unsupported Date: Tue, 20 Feb 2024 17:44:10 +0000 Message-Id: <20240220174412.155885-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240220174412.155885-1-peter.maydell@linaro.org> References: <20240220174412.155885-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org --- docs/about/build-platforms.rst | 2 ++ docs/about/removed-features.rst | 15 +++++++++++++++ 2 files changed, 17 insertions(+) Reviewed-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth diff --git a/docs/about/build-platforms.rst b/docs/about/build-platforms.rst index f2a7aec56ff..8fd7da140a3 100644 --- a/docs/about/build-platforms.rst +++ b/docs/about/build-platforms.rst @@ -139,6 +139,8 @@ unprivileged accounts can create symlinks if Developer Mode is enabled. When Developer Mode is not available/enabled, the SeCreateSymbolicLinkPrivilege privilege is required, or the process must be run as an administrator. +Only 64-bit Windows is supported. + .. _Homebrew: https://brew.sh/ .. _MacPorts: https://www.macports.org/ .. _MSYS2: https://www.msys2.org/ diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 54081a6c196..417a0e4fa1d 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -659,6 +659,21 @@ This command didn't produce any output already. Removed with no replacement. The ``singlestep`` command has been replaced by the ``one-insn-per-tb`` command, which has the same behaviour but a less misleading name. +Host Architectures +------------------ + +System emulation on 32-bit Windows hosts (removed in 9.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Windows 11 has no support for 32-bit host installs, and Windows 10 did +not support new 32-bit installs, only upgrades. 32-bit Windows support +has now been dropped by the MSYS2 project. QEMU also is deprecating +and dropping support for 32-bit x86 host deployments in +general. 32-bit Windows is therefore no longer a supported host for +QEMU. Since all recent x86 hardware from the past >10 years is +capable of the 64-bit x86 extensions, a corresponding 64-bit OS should +be used instead. + Guest Emulator ISAs ------------------- From patchwork Tue Feb 20 17:44:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 13564324 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 88C16C48BC3 for ; Tue, 20 Feb 2024 17:44:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcUAF-0003Bb-Vy; Tue, 20 Feb 2024 12:44:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcUAE-0003Ae-N7 for qemu-devel@nongnu.org; Tue, 20 Feb 2024 12:44:18 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rcUAC-0005JC-OI for qemu-devel@nongnu.org; Tue, 20 Feb 2024 12:44:18 -0500 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-33d568fbf62so1228421f8f.3 for ; Tue, 20 Feb 2024 09:44:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708451055; x=1709055855; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nlwRkJ1nvi2u/ezbMvI34tkdFRINCnwrmEyU/SijG5w=; b=ukXIFeDWByhnZqM9UWleOQQKYWshEIpmSDUX6WSgb6cM94e6KjQQqaW3BNrk1YvbaK A8eUQrHuECPDAzGmty9jq55u80Rwkaipm77TlwbQyMl185YWKqo7Hi9+Bqw044wRhrr6 dNhOUSxcHabgFIMnCojTCoBOY6fAWT366V+O1Ub5ZxH3T1soOW3rb+sGLw5kQ2mb/skv EyPw/5iBKA7jCquaFi/ZjwghGg3wt1b/8uRFtMPEpcYucc5/qc51EYde6WkD/E2/unqj P/1zQWVS+7X0Xx1yh7JUGl8w5Ts2Wfp73c/bhSK60qx4+CO1/jwgHrHxc3YvJrpx/fOa JBmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708451055; x=1709055855; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nlwRkJ1nvi2u/ezbMvI34tkdFRINCnwrmEyU/SijG5w=; b=s58NGkBKxRvY35N9cFhFzVln0f3zO7fFiEFyDGU54ygGcF+6HlxMUxpaHuZ1oIr8mF GVk8jWZCNaf2CL+zbhOcdcpZc+ougTXCK28v9eeABBGjz3u+chTzQ3fwNKnaHspPJsXV eapgmSb3JWDO9sAhuQJwVYQsD9H0VkBcu52Es+X5vbEQkmF9OZ3M3/laBwQ+z1oDqXFe fzflJr6zYpj1qy60aBRpi3bL7dXErMnV9oMQhzJ8b89AK3ic0UC0V+pLKofnOe48DEt0 ChqHwx+ZgGqDSF3RueooBrmX3YOGgXGgh0yDymVC8OpN/H5r3QGbY8Hwubz0BueeShvW wisg== X-Gm-Message-State: AOJu0YzV8XMJ96ntB+FRquXIQ5afNBx5wuDjc70KUZtXE+TUw+pIK8Nx i7hfmZSBLXRFO1kHIuQuJIbkhYqXtge0B9nQuKgPRdYTcdj5/FPvSYDRCS+XMB71tJtcotBjlqX i X-Google-Smtp-Source: AGHT+IGXgLVOlBYqBSxwrrKrpr+9Ate+3mDzhvMki8Xsu4qyT52rPSQUfyBLe6ojGTNbuMBYwCak1w== X-Received: by 2002:a05:6000:400c:b0:33d:4adf:2949 with SMTP id cp12-20020a056000400c00b0033d4adf2949mr5717180wrb.11.1708451055022; Tue, 20 Feb 2024 09:44:15 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id k5-20020adfe3c5000000b0033b66c2d61esm13988443wrm.48.2024.02.20.09.44.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 09:44:14 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Yonggang Luo Subject: [PATCH 2/3] .gitlab-ci.d: Drop cross-win32-system job Date: Tue, 20 Feb 2024 17:44:11 +0000 Message-Id: <20240220174412.155885-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240220174412.155885-1-peter.maydell@linaro.org> References: <20240220174412.155885-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org We don't support 32-bit Windows any more, so we don't need to defend it with this CI job. Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth --- .gitlab-ci.d/container-cross.yml | 5 - .gitlab-ci.d/crossbuilds.yml | 14 --- .../dockerfiles/fedora-win32-cross.docker | 111 ------------------ tests/lcitool/refresh | 5 - 4 files changed, 135 deletions(-) delete mode 100644 tests/docker/dockerfiles/fedora-win32-cross.docker diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 8d235cbea01..e3103940a0e 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -101,11 +101,6 @@ cris-fedora-cross-container: variables: NAME: fedora-cris-cross -win32-fedora-cross-container: - extends: .container_job_template - variables: - NAME: fedora-win32-cross - win64-fedora-cross-container: extends: .container_job_template variables: diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index d19d98cde05..987ba9694ba 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -159,20 +159,6 @@ cross-mips64el-kvm-only: IMAGE: debian-mips64el-cross EXTRA_CONFIGURE_OPTS: --disable-tcg --target-list=mips64el-softmmu -cross-win32-system: - extends: .cross_system_build_job - needs: - job: win32-fedora-cross-container - variables: - IMAGE: fedora-win32-cross - EXTRA_CONFIGURE_OPTS: --enable-fdt=internal - CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu - microblazeel-softmmu mips64el-softmmu nios2-softmmu - artifacts: - when: on_success - paths: - - build/qemu-setup*.exe - cross-win64-system: extends: .cross_system_build_job needs: diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker deleted file mode 100644 index 08799219f98..00000000000 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ /dev/null @@ -1,111 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all --cross-arch mingw32 fedora-38 qemu -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM registry.fedoraproject.org/fedora:38 - -RUN dnf install -y nosync && \ - printf '#!/bin/sh\n\ -if test -d /usr/lib64\n\ -then\n\ - export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ -else\n\ - export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ -fi\n\ -exec "$@"\n' > /usr/bin/nosync && \ - chmod +x /usr/bin/nosync && \ - nosync dnf update -y && \ - nosync dnf install -y \ - bash \ - bc \ - bison \ - bzip2 \ - ca-certificates \ - ccache \ - ctags \ - dbus-daemon \ - diffutils \ - findutils \ - flex \ - gcc \ - gcovr \ - git \ - glib2-devel \ - glibc-langpack-en \ - hostname \ - llvm \ - make \ - meson \ - mtools \ - ninja-build \ - nmap-ncat \ - openssh-clients \ - pcre-static \ - python3 \ - python3-PyYAML \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx_rtd_theme \ - sed \ - socat \ - sparse \ - spice-protocol \ - swtpm \ - tar \ - tesseract \ - tesseract-langpack-eng \ - util-linux \ - which \ - xorriso \ - zstd && \ - nosync dnf autoremove -y && \ - nosync dnf clean all -y - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" - -RUN nosync dnf install -y \ - mingw32-SDL2 \ - mingw32-SDL2_image \ - mingw32-bzip2 \ - mingw32-curl \ - mingw32-gcc \ - mingw32-gcc-c++ \ - mingw32-gettext \ - mingw32-glib2 \ - mingw32-gnutls \ - mingw32-gtk3 \ - mingw32-libepoxy \ - mingw32-libgcrypt \ - mingw32-libjpeg-turbo \ - mingw32-libpng \ - mingw32-libtasn1 \ - mingw32-nettle \ - mingw32-nsis \ - mingw32-pixman \ - mingw32-pkg-config && \ - nosync dnf clean all -y && \ - rpm -qa | sort > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-c++ && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-g++ && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc - -ENV ABI "i686-w64-mingw32" -ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-w64-mingw32- -ENV DEF_TARGET_LIST i386-softmmu -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 0c93557ad67..fe7692c5006 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -192,11 +192,6 @@ try: trailer=cross_build("s390x-linux-gnu-", "s390x-softmmu,s390x-linux-user")) - generate_dockerfile("fedora-win32-cross", "fedora-38", - cross="mingw32", - trailer=cross_build("i686-w64-mingw32-", - "i386-softmmu")) - generate_dockerfile("fedora-win64-cross", "fedora-38", cross="mingw64", trailer=cross_build("x86_64-w64-mingw32-", From patchwork Tue Feb 20 17:44:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 13564325 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 B6758C5475B for ; Tue, 20 Feb 2024 17:44:55 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcUAG-0003Bc-7e; Tue, 20 Feb 2024 12:44:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcUAF-0003BD-7g for qemu-devel@nongnu.org; Tue, 20 Feb 2024 12:44:19 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rcUAD-0005JI-J4 for qemu-devel@nongnu.org; Tue, 20 Feb 2024 12:44:18 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-33aeb088324so3063490f8f.2 for ; Tue, 20 Feb 2024 09:44:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708451056; x=1709055856; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=laarQAHoeg6zp0ocxwYi8SXTwFh/gqSlyDW7enxYe6E=; b=tw80efnqEYnOj9bf1GUwtMsQAA0S81IJ3yf/pliXXlmjxP3DPS8PWI9cSGOVRAAltu f0MuF9taH4RFlLGQNzuNA79uWHdH7YAuKRQm6BsnsWqq72Z446qxLcplSI7cqyG7Pnl7 gAZ/A34NDp4t/Fb8n+p5cZ2/Pni9M4t5dLwKrWz0o6CNx759904z08+xBPAf8E/Y3aer PR1DJl14T0eGVUvRfQruc44n5AOeZBI6nDmqXeeNuS9tjlotWo8TFtlwMxu9+tONGXdl NGDTOOL1rRqRTZLb1vbVvie9OrDEpChva7f2bSZdza8s0FqXKysZ9H3XaxdoOZyLTUqx wajg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708451056; x=1709055856; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=laarQAHoeg6zp0ocxwYi8SXTwFh/gqSlyDW7enxYe6E=; b=EFJM/3Vm1V/j5UQRdXXT8rCVhRyW4VIcYcJlTO4LvKZIBPD4GJnJX0rx+xUWtD80gG pw9G8agrJVD95plbN1rVJOfgaCsOqI4f6z/xyyns/tfwt0M5LLSbiTnx7Yzmc3k2Amax FzYtnusngkKW6KZTo7Uu0c0tUTD548Z+pjZif1gzKxhrSAGpDUfJLVmZLwK4tjptJvRA EJEjiltSwxCol/urQFxu02x0PDG4nTso/sejp6AgkNgf3JX2R8s157nznErckZCMmYrP 46nluLdbPk2Yc25CRKrdmvL8Lmy0yCpoVaMjjFTMupUuh0wbppUk1fvVtFscaPoGT40c bf1w== X-Gm-Message-State: AOJu0YwuHwx3ektM9CgghiW2/3K0Hw9QBPA7CRvDx2JeE3R6sssxijvM IiXa4cISbaiXNAva1cXePvpKPc/NQMdGiETFXN6nYmRGdPIzlHNk5m2D3G7Et7WzFzVRnnlsyjK 2 X-Google-Smtp-Source: AGHT+IH5AifXsrok4dGQyRSdknMojwBsGMXIsYuFD7ttK4nwKwmc26EdLrZjZ4O1jou8uBWiQeNy0Q== X-Received: by 2002:adf:f2c3:0:b0:33c:deed:6745 with SMTP id d3-20020adff2c3000000b0033cdeed6745mr11548719wrp.13.1708451056037; Tue, 20 Feb 2024 09:44:16 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id k5-20020adfe3c5000000b0033b66c2d61esm13988443wrm.48.2024.02.20.09.44.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 09:44:15 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Yonggang Luo Subject: [PATCH 3/3] .gitlab-ci.d/windows.yml: Remove shared-msys2 abstraction Date: Tue, 20 Feb 2024 17:44:12 +0000 Message-Id: <20240220174412.155885-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240220174412.155885-1-peter.maydell@linaro.org> References: <20240220174412.155885-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org Now we don't build msys2-32bit we don't need the abstraction out of the common msys2 handling from the 32-vs-64-bit specifics. Collapse it down into the msys2-64bit job definition. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé --- .gitlab-ci.d/windows.yml | 84 +++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 44 deletions(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 8fc08218d28..e784d5a68cd 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -1,4 +1,4 @@ -.shared_msys2_builder: +msys2-64bit: extends: .base_job_template tags: - shared-windows @@ -14,9 +14,19 @@ stage: build timeout: 100m variables: + MINGW_TARGET: mingw-w64-x86_64 + MSYSTEM: MINGW64 # This feature doesn't (currently) work with PowerShell, it stops # the echo'ing of commands being run and doesn't show any timing FF_SCRIPT_SECTIONS: 0 + # do not remove "--without-default-devices"! + # commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by using --without-default-devices" + # changed to compile QEMU with the --without-default-devices switch + # for the msys2 64-bit job, due to the build could not complete within + CONFIGURE_ARGS: --target-list=x86_64-softmmu --without-default-devices -Ddebug=false -Doptimization=0 + # qTests don't run successfully with "--without-default-devices", + # so let's exclude the qtests from CI for now. + TEST_ARGS: --no-suite qtest artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" expire_in: 7 days @@ -72,33 +82,35 @@ - .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed bison diffutils flex git grep make sed - $MINGW_TARGET-binutils - $MINGW_TARGET-capstone - $MINGW_TARGET-ccache - $MINGW_TARGET-curl - $MINGW_TARGET-cyrus-sasl - $MINGW_TARGET-dtc - $MINGW_TARGET-gcc - $MINGW_TARGET-glib2 - $MINGW_TARGET-gnutls - $MINGW_TARGET-gtk3 - $MINGW_TARGET-libgcrypt - $MINGW_TARGET-libjpeg-turbo - $MINGW_TARGET-libnfs - $MINGW_TARGET-libpng - $MINGW_TARGET-libssh - $MINGW_TARGET-libtasn1 - $MINGW_TARGET-lzo2 - $MINGW_TARGET-nettle - $MINGW_TARGET-ninja - $MINGW_TARGET-pixman - $MINGW_TARGET-pkgconf - $MINGW_TARGET-python - $MINGW_TARGET-SDL2 - $MINGW_TARGET-SDL2_image - $MINGW_TARGET-snappy - $MINGW_TARGET-zstd - $EXTRA_PACKAGES " + mingw-w64-x86_64-binutils + mingw-w64-x86_64-capstone + mingw-w64-x86_64-ccache + mingw-w64-x86_64-curl + mingw-w64-x86_64-cyrus-sasl + mingw-w64-x86_64-dtc + mingw-w64-x86_64-gcc + mingw-w64-x86_64-glib2 + mingw-w64-x86_64-gnutls + mingw-w64-x86_64-gtk3 + mingw-w64-x86_64-libgcrypt + mingw-w64-x86_64-libjpeg-turbo + mingw-w64-x86_64-libnfs + mingw-w64-x86_64-libpng + mingw-w64-x86_64-libssh + mingw-w64-x86_64-libtasn1 + mingw-w64-x86_64-libusb + mingw-w64-x86_64-lzo2 + mingw-w64-x86_64-nettle + mingw-w64-x86_64-ninja + mingw-w64-x86_64-pixman + mingw-w64-x86_64-pkgconf + mingw-w64-x86_64-python + mingw-w64-x86_64-SDL2 + mingw-w64-x86_64-SDL2_image + mingw-w64-x86_64-snappy + mingw-w64-x86_64-spice + mingw-w64-x86_64-usbredir + mingw-w64-x86_64-zstd" - Write-Output "Running build at $(Get-Date -Format u)" - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink @@ -115,19 +127,3 @@ - ..\msys64\usr\bin\bash -lc "make check MTESTARGS='$TEST_ARGS' || { cat meson-logs/testlog.txt; exit 1; } ;" - ..\msys64\usr\bin\bash -lc "ccache --show-stats" - Write-Output "Finished build at $(Get-Date -Format u)" - -msys2-64bit: - extends: .shared_msys2_builder - variables: - MINGW_TARGET: mingw-w64-x86_64 - MSYSTEM: MINGW64 - # msys2 only ship these packages for 64-bit, not 32-bit - EXTRA_PACKAGES: $MINGW_TARGET-libusb $MINGW_TARGET-usbredir $MINGW_TARGET-spice - # do not remove "--without-default-devices"! - # commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by using --without-default-devices" - # changed to compile QEMU with the --without-default-devices switch - # for the msys2 64-bit job, due to the build could not complete within - CONFIGURE_ARGS: --target-list=x86_64-softmmu --without-default-devices -Ddebug=false -Doptimization=0 - # qTests don't run successfully with "--without-default-devices", - # so let's exclude the qtests from CI for now. - TEST_ARGS: --no-suite qtest