From nobody Fri May 3 10:09:55 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652865272; cv=none; d=zohomail.com; s=zohoarc; b=Mlr2cFs6bmo4bxVWaJpvK3SJaxTFD3RmLc8VUcezpCsr373F740Ake6IkUsRclKpZBONlJySKLP0XbGNBYJZa98aMHEQbfpIsvXpMqBhbdiUySk7umIFb7F+CjuzW3o9OR7QwHJdKZTZettJY3V5rr7kHImMmjalkD9bdcBFka0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652865272; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/5QoxONeJCcY+Ymq+2bbsjVD3pVw+gch9C8gnLYyXR4=; b=XOKgbXKTVV5ihJk/mTMo3IiD9aHrmtiRXBRhW1Ly4UX5o69WkOV9Tm46dzS2BG+Rw9zzMle+oyGCHnsuGShtIWtWx7/B/iD34TzWN/fVngIN54bHl+06E6AtH48CIToh0RNYKKBlptmr7pIQESRYYQwDKZyVz//ZeJKKvdWuV3U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652865272904403.0986790837329; Wed, 18 May 2022 02:14:32 -0700 (PDT) Received: from localhost ([::1]:46518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrFlH-000847-QZ for importer2@patchew.org; Wed, 18 May 2022 05:14:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFby-0008Fe-Sf for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:21258) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFbu-0004N8-5Y for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:53 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-368-F1_aKAr5N2asVH69Yf2sDg-1; Wed, 18 May 2022 05:04:41 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8D5D63AF42B0; Wed, 18 May 2022 09:04:41 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB3C01410DD5; Wed, 18 May 2022 09:04:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652864685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/5QoxONeJCcY+Ymq+2bbsjVD3pVw+gch9C8gnLYyXR4=; b=eeuBMO94GAUMGp9rQoZ893t8I4gx6gNZG7R3HMpQZG4NZuorhOvOOxCVyodciFLEH/hnUP jCVmN0mYn7FY18NLJNRGLJhKamyreQMAEo/5l7+qN/kCckiQFmhh1KFb7dl0VuDBqv+d4V Bp2Uruz7Zgyl1RTSV/qpnsZNLVAtCTk= X-MC-Unique: F1_aKAr5N2asVH69Yf2sDg-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , John Snow Subject: [PULL 1/8] gitlab-ci: Switch the container of the 'check-patch' & 'check-dco' jobs Date: Wed, 18 May 2022 11:04:31 +0200 Message-Id: <20220518090438.158475-2-thuth@redhat.com> In-Reply-To: <20220518090438.158475-1-thuth@redhat.com> References: <20220518090438.158475-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652865274921100001 The 'check-patch' and 'check-dco' jobs only need Python and git for checking the patches, so it's not really necessary to use a container here that has all the other build dependencies installed. By using a lightweight Alpine container, we can improve the runtime here quite a bit, cutting it down from ca. 1:30 minutes to ca. 45 seconds. Suggested-by: Daniel P. Berrang=C3=A9 Message-Id: <20220516082310.33876-1-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: John Snow Signed-off-by: Thomas Huth --- .gitlab-ci.d/static_checks.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml index 5e955540d3..94858e3272 100644 --- a/.gitlab-ci.d/static_checks.yml +++ b/.gitlab-ci.d/static_checks.yml @@ -1,12 +1,13 @@ check-patch: stage: build - image: $CI_REGISTRY_IMAGE/qemu/centos8:latest - needs: - job: amd64-centos8-container + image: python:3.10-alpine + needs: [] script: - .gitlab-ci.d/check-patch.py variables: GIT_DEPTH: 1000 + before_script: + - apk -U add git perl rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project"' when: never @@ -15,12 +16,13 @@ check-patch: =20 check-dco: stage: build - image: $CI_REGISTRY_IMAGE/qemu/centos8:latest - needs: - job: amd64-centos8-container + image: python:3.10-alpine + needs: [] script: .gitlab-ci.d/check-dco.py variables: GIT_DEPTH: 1000 + before_script: + - apk -U add git rules: - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D=3D $CI_DEFAULT_BRANCH' when: never --=20 2.27.0 From nobody Fri May 3 10:09:55 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652865627; cv=none; d=zohomail.com; s=zohoarc; b=MjNLCHjpbFBiKDpoIsV4RujdGakt4b9dTN/VbnXZCp9RGVinNOyK3lPQwM7lbxkblzcylGBsRSgARwzTgGbURgMMHrSJuYinM+CDXjJ+6uMkZsy1PJAyWIUmvXbvAGtKdcSTI2MRTfuLLDv2y+KdmCGvMDhV5CGrcbJrl1jNr3M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652865627; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ktoMqX4RnYl7VI9NssK6VB/5fYiUruG7UB0OBinRsYI=; b=E0Esz4mfe3kPEh8Kc8OGDnbtNXIPNPqrnbyjKFMBdSra96MgEZvZxjHSgiihbGap+HL6qz1FVp2X6pUhKh7uE7Kos07Bw8rTgVzFGZVdKanrJlg1CrZX7IsRCjow1emTcYPWTU6I6bngdT3orOUBgnSiJmgn6ekVXMZnIUitq0I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652865627004743.3620376849375; Wed, 18 May 2022 02:20:27 -0700 (PDT) Received: from localhost ([::1]:51958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrFqz-0003WM-KZ for importer2@patchew.org; Wed, 18 May 2022 05:20:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFbw-0008CJ-Df for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:28256) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFbu-0004NI-3D for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:52 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-416-rTUAVRAQNIivzWMdaiSSAA-1; Wed, 18 May 2022 05:04:42 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 462D73AF42A7; Wed, 18 May 2022 09:04:42 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC13C1410F37; Wed, 18 May 2022 09:04:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652864685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ktoMqX4RnYl7VI9NssK6VB/5fYiUruG7UB0OBinRsYI=; b=gMJpT0WC9FgkxdlvkU0Y44vCjRYwpdZwBY9oYpxMZmTZ8170Qxi1gAgqDz0CrX47pZQIQa pmimVRpWIKeLJRz2PjYsu7OAWYGOGX+OFY5NGivb66tj+hm8R7jEW11OM91s0RLo+UlB2K UrrA1DINKwNINgOTQ0jVWX/q8yteEKo= X-MC-Unique: rTUAVRAQNIivzWMdaiSSAA-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 2/8] Remove Ubuntu 18.04 container support from the repository Date: Wed, 18 May 2022 11:04:32 +0200 Message-Id: <20220518090438.158475-3-thuth@redhat.com> In-Reply-To: <20220518090438.158475-1-thuth@redhat.com> References: <20220518090438.158475-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652865627716100001 According to our "Supported build platforms" policy, we now do not support Ubuntu 18.04 anymore. Remove the related container files and entries from our CI. Message-Id: <20220516115912.120951-1-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- .gitlab-ci.d/containers.yml | 5 - .../custom-runners/ubuntu-20.04-aarch32.yml | 2 +- .../custom-runners/ubuntu-20.04-aarch64.yml | 2 +- scripts/ci/setup/build-environment.yml | 14 +- tests/docker/dockerfiles/ubuntu1804.docker | 144 ------------------ tests/lcitool/refresh | 7 - 6 files changed, 4 insertions(+), 170 deletions(-) delete mode 100644 tests/docker/dockerfiles/ubuntu1804.docker diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index b9b675fdcb..e9df90bbdd 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -19,11 +19,6 @@ amd64-debian-container: variables: NAME: debian-amd64 =20 -amd64-ubuntu1804-container: - extends: .container_job_template - variables: - NAME: ubuntu1804 - amd64-ubuntu2004-container: extends: .container_job_template variables: diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml b/.gitlab= -ci.d/custom-runners/ubuntu-20.04-aarch32.yml index 9c589bc4cf..47856ac53c 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml @@ -1,6 +1,6 @@ # All ubuntu-20.04 jobs should run successfully in an environment # setup by the scripts/ci/setup/qemu/build-environment.yml task -# "Install basic packages to build QEMU on Ubuntu 18.04/20.04" +# "Install basic packages to build QEMU on Ubuntu 20.04" =20 ubuntu-20.04-aarch32-all: needs: [] diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml b/.gitlab= -ci.d/custom-runners/ubuntu-20.04-aarch64.yml index 920e388bd0..951e490db1 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml @@ -1,6 +1,6 @@ # All ubuntu-20.04 jobs should run successfully in an environment # setup by the scripts/ci/setup/qemu/build-environment.yml task -# "Install basic packages to build QEMU on Ubuntu 18.04/20.04" +# "Install basic packages to build QEMU on Ubuntu 20.04" =20 ubuntu-20.04-aarch64-all-linux-static: needs: [] diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/buil= d-environment.yml index 9182e0c253..232525b91d 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -33,10 +33,9 @@ when: - ansible_facts['distribution'] =3D=3D 'Ubuntu' =20 - - name: Install basic packages to build QEMU on Ubuntu 18.04/20.04 + - name: Install basic packages to build QEMU on Ubuntu 20.04 package: name: - # Originally from tests/docker/dockerfiles/ubuntu1804.docker - ccache - gcc - gettext @@ -90,7 +89,7 @@ when: - ansible_facts['distribution'] =3D=3D 'Ubuntu' =20 - - name: Install packages to build QEMU on Ubuntu 18.04/20.04 on non-s3= 90x + - name: Install packages to build QEMU on Ubuntu 20.04 on non-s390x package: name: - libspice-server-dev @@ -100,15 +99,6 @@ - ansible_facts['distribution'] =3D=3D 'Ubuntu' - ansible_facts['architecture'] !=3D 's390x' =20 - - name: Install basic packages to build QEMU on Ubuntu 18.04 - package: - name: - # Originally from tests/docker/dockerfiles/ubuntu1804.docker - - clang - when: - - ansible_facts['distribution'] =3D=3D 'Ubuntu' - - ansible_facts['distribution_version'] =3D=3D '18.04' - - name: Install basic packages to build QEMU on Ubuntu 20.04 package: name: diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dock= erfiles/ubuntu1804.docker deleted file mode 100644 index b3f2156580..0000000000 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ /dev/null @@ -1,144 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all ubuntu-1804 qemu -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/ubuntu:18.04 - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bsdmainutils \ - bzip2 \ - ca-certificates \ - ccache \ - clang \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - g++ \ - gcc \ - gcovr \ - genisoimage \ - gettext \ - git \ - glusterfs-common \ - hostname \ - libaio-dev \ - libasan5 \ - libasound2-dev \ - libattr1-dev \ - libbrlapi-dev \ - libbz2-dev \ - libc6-dev \ - libcacard-dev \ - libcap-ng-dev \ - libcapstone-dev \ - libcurl4-gnutls-dev \ - libdaxctl-dev \ - libdrm-dev \ - libepoxy-dev \ - libfdt-dev \ - libffi-dev \ - libgbm-dev \ - libgcrypt20-dev \ - libglib2.0-dev \ - libgnutls28-dev \ - libgtk-3-dev \ - libibumad-dev \ - libibverbs-dev \ - libiscsi-dev \ - libjemalloc-dev \ - libjpeg-turbo8-dev \ - liblttng-ust-dev \ - liblzo2-dev \ - libncursesw5-dev \ - libnfs-dev \ - libnuma-dev \ - libpam0g-dev \ - libpcre2-dev \ - libpixman-1-dev \ - libpmem-dev \ - libpng-dev \ - libpulse-dev \ - librbd-dev \ - librdmacm-dev \ - libsasl2-dev \ - libsdl2-dev \ - libsdl2-image-dev \ - libseccomp-dev \ - libselinux1-dev \ - libsnappy-dev \ - libspice-protocol-dev \ - libspice-server-dev \ - libssh-dev \ - libsystemd-dev \ - libtasn1-6-dev \ - libubsan1 \ - libudev-dev \ - libusb-1.0-0-dev \ - libusbredirhost-dev \ - libvdeplug-dev \ - libvirglrenderer-dev \ - libvte-2.91-dev \ - libxen-dev \ - libzstd-dev \ - llvm \ - locales \ - make \ - multipath-tools \ - netcat-openbsd \ - nettle-dev \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-setuptools \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-wheel \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - systemtap-sdt-dev \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo \ - xfslibs-dev \ - zlib1g-dev && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /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 && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - -RUN pip3 install meson=3D=3D0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -# https://bugs.launchpad.net/qemu/+bug/1838763 -ENV QEMU_CONFIGURE_OPTS --disable-libssh diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 2d198ad281..fb49bbc441 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -65,11 +65,6 @@ def generate_cirrus(target, trailer=3DNone): cmd =3D lcitool_cmd + ["variables", target, "qemu"] generate(filename, cmd, trailer) =20 -ubuntu1804_skipssh =3D [ - "# https://bugs.launchpad.net/qemu/+bug/1838763\n", - "ENV QEMU_CONFIGURE_OPTS --disable-libssh\n" -] - ubuntu2004_tsanhack =3D [ "# Apply patch https://reviews.llvm.org/D75820\n", "# This is required for TSan in clang-10 to compile with QEMU.\n", @@ -85,8 +80,6 @@ def debian_cross_build(prefix, targets): try: generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("fedora", "fedora-35") - generate_dockerfile("ubuntu1804", "ubuntu-1804", - trailer=3D"".join(ubuntu1804_skipssh)) generate_dockerfile("ubuntu2004", "ubuntu-2004", trailer=3D"".join(ubuntu2004_tsanhack)) generate_dockerfile("opensuse-leap", "opensuse-leap-152") --=20 2.27.0 From nobody Fri May 3 10:09:55 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652864960; cv=none; d=zohomail.com; s=zohoarc; b=DTK+GZenNU14BBfNsHPtfAHVW8ZTuwKQBAMDc+6OL+/upLVAfGTrdUX1qh/HN2nkZne82PFna8ybuTmT0ecc8mW5rjyiOs0Hla41YODtj2BC1Pa9do/jThg4Le0vbuEUr+JEFwQTRzeF5bAQQ82mFobsPuXZNBWga06NWYbMTWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652864960; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cc6au0B6JALxPRdOYC3kfmJMafKytVuqtWe1tVyMNgM=; b=PdNEtLxEr/xtzD9oNOKY3bqDeEtNB/ExH3iSKiKWIH/k2bIRl9VscSf6DX7tMnGWgYO4Ashr0XBRDY+mDtB3oToPIKOrzuMREJS/rwwRhkGW3DyGUwgkA/QWtvV0Bq7n1JOY1K2nDQxizX0tZwPphNNuzV7Pkr3wiV7HB/X8dAE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652864960310870.5771389021646; Wed, 18 May 2022 02:09:20 -0700 (PDT) Received: from localhost ([::1]:39772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrFgE-0003Dt-OJ for importer2@patchew.org; Wed, 18 May 2022 05:09:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFbx-0008EY-Ek for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:48680) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFbu-0004N2-3n for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:53 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-497-lzcxByAYNQ-nyxJHOe6qVQ-1; Wed, 18 May 2022 05:04:43 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F35A42999B5A; Wed, 18 May 2022 09:04:42 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 74B281410DD5; Wed, 18 May 2022 09:04:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652864684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cc6au0B6JALxPRdOYC3kfmJMafKytVuqtWe1tVyMNgM=; b=iMMSqCHEmAR73EUI834fFntLh3zikY6ugAhQtuGYcs5pjRd7D8dkvveXlx1Iy4mea0mWoU 7WBhqMoRHBdYhh+0oRI6ZifJ1ock6u98gUm4t6G65EpjvqhdLl4bd04GA/KobL4sgX1W/Q ZhJWuuhyegnj/0T/Ldn1QAfdepULBlk= X-MC-Unique: lzcxByAYNQ-nyxJHOe6qVQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 3/8] tests/qtest: fix registration of ABRT handler for QEMU cleanup Date: Wed, 18 May 2022 11:04:33 +0200 Message-Id: <20220518090438.158475-4-thuth@redhat.com> In-Reply-To: <20220518090438.158475-1-thuth@redhat.com> References: <20220518090438.158475-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652864962454100001 From: Daniel P. Berrang=C3=A9 qtest_init registers a hook to cleanup the running QEMU process should g_assert() fire before qtest_quit is called. When the first hook is registered, it is supposed to triggere registration of the SIGABRT handler. Unfortunately the logic in hook_list_is_empty is inverted, so the SIGABRT handler never gets registered, unless 2 or more QEMU processes are run concurrently. This caused qtest to leak QEMU processes anytime g_assert triggers. Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20220513154906.206715-2-berrange@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- tests/qtest/libqtest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 228357f1ea..4a4697c0d1 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -197,11 +197,11 @@ static bool hook_list_is_empty(GHookList *hook_list) GHook *hook =3D g_hook_first_valid(hook_list, TRUE); =20 if (!hook) { - return false; + return true; } =20 g_hook_unref(hook_list, hook); - return true; + return false; } =20 void qtest_add_abrt_handler(GHookFunc fn, const void *data) --=20 2.27.0 From nobody Fri May 3 10:09:55 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652865877; cv=none; d=zohomail.com; s=zohoarc; b=Jl5ttxl731bqUYsIES2o1X7xFRHNLttgzfeEmd257hFdshThclD5jel7WVyYuP6sXsQ7gorFxgBUyYcKljRCYPZmaSGteFCs+OQmopwEIJc2k4hxGFWbY+Ni0kY2tKSW6pDsuGKps84Tz2MyVnWzPHRpMUnN9wGbNg89vIh4P50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652865877; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mpjD4d1Ru+HPNRkWzijal/B02WoIxSM17EmdFi5iF2g=; b=M8uq6MBBv7LCugKwqSwawAsgfMuKAuyIxIA/qvkYnq8IrbfJhji9D9gCLwN7b/wo+1eAFq7WHMhEZmsBUzZ7sUopglSjEo4E6WmEHJ6aVy+Gb6f4rUQ1y0/3zRA1iWOPu6mhsvhXVTw270kn29wYBMpJ9aQO0qOCool/EIQoCE0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652865877860387.77156326181534; Wed, 18 May 2022 02:24:37 -0700 (PDT) Received: from localhost ([::1]:57850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrFv2-0007vd-Mb for importer2@patchew.org; Wed, 18 May 2022 05:24:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFc1-0008Jy-4g for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:49887) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFbu-0004NB-4x for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:56 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-351-CnfIWxnwOSimS8ixZJToCw-1; Wed, 18 May 2022 05:04:44 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ABC0C3AF42A5; Wed, 18 May 2022 09:04:43 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D3EB140EBD5; Wed, 18 May 2022 09:04:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652864685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mpjD4d1Ru+HPNRkWzijal/B02WoIxSM17EmdFi5iF2g=; b=H0cLrjrV4XQ6aNPqGU/9mBE6uqF3TM9ef2NORKpPuLVdWs+6DHvSnDXeN/NCKgmDn7kQvO QfO0RcHpBIKwD9lEE1K+qkHpCH5udIhp2tLgUlHFkHlVGDwbtAExaHlNzhb4G73wqhgalJ Bekr6eTbfV5FoCJo5GuYlmeOOV96Ae0= X-MC-Unique: CnfIWxnwOSimS8ixZJToCw-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 4/8] tests/qtest: use prctl(PR_SET_PDEATHSIG) as fallback to kill QEMU Date: Wed, 18 May 2022 11:04:34 +0200 Message-Id: <20220518090438.158475-5-thuth@redhat.com> In-Reply-To: <20220518090438.158475-1-thuth@redhat.com> References: <20220518090438.158475-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652865879584100001 From: Daniel P. Berrang=C3=A9 Although we register a ABRT handler to kill off QEMU when g_assert() triggers, we want an extra safety net. The QEMU process might be non-functional and thus not have responded to SIGTERM. The test script might also have crashed with SEGV, in which case the cleanup handlers won't ever run. Using the Linux specific prctl(PR_SET_PDEATHSIG) syscall, we can ensure that QEMU gets sent SIGKILL as soon as the controlling qtest exits, if nothing else has correctly told it to quit. Note, technically the death signal is sent when the *thread* that called fork() exits. IOW, if you are calling qtest_init() in one thread, letting that thread exit, and then expecting to run qtest_quit() in a different thread, things are not going to work out. Fortunately that is not a scenario that exists in qtests, as pairs of qtest_init and qtest_quit are always called from the same thread. Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20220513154906.206715-3-berrange@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- tests/qtest/libqtest.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 4a4697c0d1..2e49618454 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -19,6 +19,9 @@ #include #include #include +#ifdef __linux__ +#include +#endif /* __linux__ */ =20 #include "libqtest.h" #include "libqmp.h" @@ -301,6 +304,20 @@ QTestState *qtest_init_without_qmp_handshake(const cha= r *extra_args) s->expected_status =3D 0; s->qemu_pid =3D fork(); if (s->qemu_pid =3D=3D 0) { +#ifdef __linux__ + /* + * Although we register a ABRT handler to kill off QEMU + * when g_assert() triggers, we want an extra safety + * net. The QEMU process might be non-functional and + * thus not have responded to SIGTERM. The test script + * might also have crashed with SEGV, in which case the + * cleanup handlers won't ever run. + * + * This PR_SET_PDEATHSIG setup will ensure any remaining + * QEMU will get terminated with SIGKILL in these cases. + */ + prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0); +#endif /* __linux__ */ if (!g_setenv("QEMU_AUDIO_DRV", "none", true)) { exit(1); } --=20 2.27.0 From nobody Fri May 3 10:09:55 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652865817; cv=none; d=zohomail.com; s=zohoarc; b=KnRF83wirYALpgdD7Q1p5MRRHee18HZDPSVMn/kqBI/g89J3P+MfJ7tLAhhSQ9q2z+4rraEqIgPYirW/6ZvDJIIi8fpl22WhNOddEruVvdNsvetJyC6Gw15lQVLQzB+GUpPSOOky3SZmKXT+BT859RXi7x9t6rlwNIAqa3Eohyg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652865817; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uJqG4kgaxZj4t5+r2z3WWTaf/pnWD9wMUPYUXfMbGZE=; b=G5AuD4hlWjKMkmF2YAGgzDLxAbl1zJ4/iAPkvvAFXGks1wzwD+hNbTlHYuoJIM9j0l2uDsGAnsSUNHkny+c9L0IkC8ajeyqLQn/nxkYLUN+XmCwAt7yxf8xHpG+w5bO0cSbwwXQOMbzmkpKAuwEZlhjLiR6yLvWnq2sKFvw7VBY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652865817281882.1741333014311; Wed, 18 May 2022 02:23:37 -0700 (PDT) Received: from localhost ([::1]:54876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrFu3-0005fx-HR for importer2@patchew.org; Wed, 18 May 2022 05:23:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFbz-0008Em-20 for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:47811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFbu-0004NR-3X for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:53 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-232-3enW6J69NdOiRV1OCAnRxw-1; Wed, 18 May 2022 05:04:45 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AA65F811E90; Wed, 18 May 2022 09:04:44 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id DACA81410DD5; Wed, 18 May 2022 09:04:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652864688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uJqG4kgaxZj4t5+r2z3WWTaf/pnWD9wMUPYUXfMbGZE=; b=fIIJ437n9r1KTyHjK6FzqysEEMkipeL8nxvT6EwfkO59fWtTiRCUrNkD2FL2M4SKlYRxnN qkMKv5VNddrFaRYnOmYtAASTbuAEitJIhtzbSpaDbZe4U7gIPWJtOmiSr3mtIp02logSBr +2IstA7NsK5xvKobStITXUy4x3dgJ54= X-MC-Unique: 3enW6J69NdOiRV1OCAnRxw-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Stefan Weil Subject: [PULL 5/8] docs/about: Update the support statement for Windows Date: Wed, 18 May 2022 11:04:35 +0200 Message-Id: <20220518090438.158475-6-thuth@redhat.com> In-Reply-To: <20220518090438.158475-1-thuth@redhat.com> References: <20220518090438.158475-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652865819376100001 Our support statement for Windows currently talks about "Vista / Server 2008" - which is related to the API of Windows, and this is not easy to understand for the non-technical users. Additionally, glib sets the _WIN32_WINNT macro to 0x0601 already, which indicates the Windows 7 API, so QEMU effectively depends on the Windows 7 API, too. Thus let's bump the _WIN32_WINNT setting in QEMU to the same level as glib uses and adjust our support statement in the documentation to something similar that we're using for Linux and the *BSD systems (i.e. only the two most recent versions), which should hopefully be easier to understand for the users now. And since we're nowadays also compile-testing QEMU with MSYS2 on Windows itself, I think we could mention this build environment here, too. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/880 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Stefan Weil Message-Id: <20220513063958.1181443-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- docs/about/build-platforms.rst | 14 +++++++++----- configure | 2 ++ include/qemu/osdep.h | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/about/build-platforms.rst b/docs/about/build-platforms.rst index e9163ba556..1958edb430 100644 --- a/docs/about/build-platforms.rst +++ b/docs/about/build-platforms.rst @@ -86,11 +86,15 @@ similar versions. Windows ------- =20 -The project supports building with current versions of the MinGW toolchain, -hosted on Linux (Debian/Fedora). - -The version of the Windows API that's currently targeted is Vista / Server -2008. +The project aims to support the two most recent versions of Windows that a= re +still supported by the vendor. The minimum Windows API that is currently +targeted is "Windows 7", so theoretically the QEMU binaries can still be r= un +on older versions of Windows, too. However, such old versions of Windows a= re +not tested anymore, so it is recommended to use one of the latest versions= of +Windows instead. + +The project supports building QEMU with current versions of the MinGW +toolchain, either hosted on Linux (Debian/Fedora) or via MSYS2 on Windows. =20 .. _Homebrew: https://brew.sh/ .. _MacPorts: https://www.macports.org/ diff --git a/configure b/configure index 0cc8c876f7..103a7b02e8 100755 --- a/configure +++ b/configure @@ -1486,6 +1486,8 @@ fi ########################################## # glib support probe =20 +# When bumping glib_req_ver, please check also whether we should increase +# the _WIN32_WINNT setting in osdep.h according to the value from glib glib_req_ver=3D2.56 glib_modules=3Dgthread-2.0 if test "$modules" =3D yes; then diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 1c1e7eca98..a72e99db85 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -75,7 +75,7 @@ QEMU_EXTERN_C int daemon(int, int); #ifdef _WIN32 /* as defined in sdkddkver.h */ #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 /* Vista */ +#define _WIN32_WINNT 0x0601 /* Windows 7 API (should be in sync with glib)= */ #endif /* reduces the number of implicitly included headers */ #ifndef WIN32_LEAN_AND_MEAN --=20 2.27.0 From nobody Fri May 3 10:09:55 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652866176; cv=none; d=zohomail.com; s=zohoarc; b=KOrG6QYC2NtioOysonTEW36bOF+LMtSb3eoLCxzjXQ2r4Cfia+cXBuEReCH5QKG8mE/2E568De7JL7yig71lmqusmtWdAlw0iDbvyF543+WR27e6aT/0IzerJsiOBJCvwlD8c0lQP42KD6E+RlLL2iwGvOZExiF2DbP+NWlzths= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652866176; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=So0Ck0PBlIGUIl+Gt+D++S/hXqrdjG39QNv9hWvhAxo=; b=EIYBAPSwbnAcaqBTxcXhjwrZ8uyIcyIyFJrsofFORbrSoebUmhWo5DY5xS5HEvVv7Xw6VWqxPFKMCuT6vRPuJzAGGPtXSdRJfbDjUFnIK3uri1tuEoifFdgKiALJlgNJmPY7bBzXzAMvt5tH0GuvaxlUgFh4SME3V5jGI6Bdt30= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652866176658999.0699534077769; Wed, 18 May 2022 02:29:36 -0700 (PDT) Received: from localhost ([::1]:37890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrFzr-0005J9-Aj for importer2@patchew.org; Wed, 18 May 2022 05:29:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFby-0008Fm-OV for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59320) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFbu-0004NY-6E for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:54 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-70-CNQGvgCJMgiK5GpnkSnnJg-1; Wed, 18 May 2022 05:04:45 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 49D7A3C6052D; Wed, 18 May 2022 09:04:45 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id D87D71410DD5; Wed, 18 May 2022 09:04:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652864689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=So0Ck0PBlIGUIl+Gt+D++S/hXqrdjG39QNv9hWvhAxo=; b=AiwAdxHuPDQjEx+BG7Mvqlk2qw6F4dk9ldrfubKi+2fJmYjxy13zrs4lYAMdxzKOIiHfXK 8en8ODLGn/vpUAg4eEO7ORncXbOVI2jxetN02ouYlmjOBGqxiYcG+tJit9Ffe+mG/LOYrl sh4MEjvKTBdkkNODBA1DlW8Zf3G0rts= X-MC-Unique: CNQGvgCJMgiK5GpnkSnnJg-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PULL 6/8] tests/vm: Add capstone to the NetBSD and OpenBSD VMs Date: Wed, 18 May 2022 11:04:36 +0200 Message-Id: <20220518090438.158475-7-thuth@redhat.com> In-Reply-To: <20220518090438.158475-1-thuth@redhat.com> References: <20220518090438.158475-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652866177662100001 Content-Type: text/plain; charset="utf-8" The Capstone library that is shipped with NetBSD and OpenBSD works fine when compiling QEMU, so let's enable this in our build-test VMs to get a little bit more build-test coverage. Message-Id: <20220516145823.148450-2-thuth@redhat.com> Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- tests/vm/netbsd | 3 ++- tests/vm/openbsd | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 4cc58df130..45aa9a7fda 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -46,7 +46,8 @@ class NetBSDVM(basevm.BaseVM): "jpeg", "png", =20 - # libs: ui + # libs: ui + "capstone", "SDL2", "gtk3+", "libxkbcommon", diff --git a/tests/vm/openbsd b/tests/vm/openbsd index dc34b2718b..13c8254214 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -48,7 +48,8 @@ class OpenBSDVM(basevm.BaseVM): "jpeg", "png", =20 - # libs: ui + # libs: ui + "capstone", "sdl2", "gtk+3", "libxkbcommon", --=20 2.27.0 From nobody Fri May 3 10:09:55 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652865526; cv=none; d=zohomail.com; s=zohoarc; b=E/LZ4FreLVPDRH2JPRSA5Iskk3vqffstnZeMyMTBuQO2X6VqlLeaJB2Mq4DSxG+i1qiPoZegHMCmAwrbGdQswrfAUip84+IeJ95uptWzFiLFPKQ5ptjULL/v1FSZswjH52p20aD+r/mDyn9FfAAmOGTKV2J7xwbNoASsY6Rhttc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652865526; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/tZMNdMCXP+GscgGyvKm6rk9GfriGjCNq4KuNsJESVw=; b=JKvKuNRMTfMn5BD8yfgXRhm69mwT/Rz4MLPNq6yJ9VD3vNk8QV92y7zUWxEEqkEaP1e3X0h1z9/unVBt5Y3ghDKZX9TIckT75CiIhxUavFTwRVIvIU/u/CUPv0hiuGjagouexEAQUutNGHQ15UqL9Sh7U/on8oEKeKr1a2pCMUQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652865526204684.6676139424364; Wed, 18 May 2022 02:18:46 -0700 (PDT) Received: from localhost ([::1]:50054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrFpM-00020Y-To for importer2@patchew.org; Wed, 18 May 2022 05:18:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFbv-0008B8-Ud for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41184) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFbu-0004NM-3j for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:51 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-228-Ys_dyhirMfSCh_GM06p8Fw-1; Wed, 18 May 2022 05:04:46 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DDA2E803D7C; Wed, 18 May 2022 09:04:45 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78CD81410DD9; Wed, 18 May 2022 09:04:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652864687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/tZMNdMCXP+GscgGyvKm6rk9GfriGjCNq4KuNsJESVw=; b=V7gmWLpRLtVmbviIRqqfyQ9bA6eSgKh/Z6si7cg596hylX6RO+TmJiY/y8ODi63dvkcawY /HpMT+EnIyY6KwGUN74VjoVv4PRPpvD502eGCGUSrD2R0C/i7HfsTU5BfOG2NbPmuYHZ46 YbvCeOnRmOUmRdW2FRU9ZLjGKXf1Hv4= X-MC-Unique: Ys_dyhirMfSCh_GM06p8Fw-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PULL 7/8] capstone: Allow version 3.0.5 again Date: Wed, 18 May 2022 11:04:37 +0200 Message-Id: <20220518090438.158475-8-thuth@redhat.com> In-Reply-To: <20220518090438.158475-1-thuth@redhat.com> References: <20220518090438.158475-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652865527481100001 Content-Type: text/plain; charset="utf-8" According to https://lore.kernel.org/qemu-devel/20200921174118.39352-1-richard.henderso= n@linaro.org/ there was an issue with Capstone 3.0.4 from Ubuntu 18, which was the reason for bumping our minimum Capstone requirement to version 4.0. And indeed, compiling with that version 3.0.4 from Ubuntu 18.04 still fails (after allowing it with a hack in meson.build). But now that we've dropped support for Ubuntu 18.04, that issue is not relevant anymore. Compiling with Capsto= ne version 3.0.5 (e.g. used in Ubuntu 20.04) seems to work fine, so let's allow that version again. Message-Id: <20220516145823.148450-3-thuth@redhat.com> Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- meson.build | 2 +- .gitlab-ci.d/buildtest.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 53a4728250..526ff29a86 100644 --- a/meson.build +++ b/meson.build @@ -2525,7 +2525,7 @@ capstone =3D not_found capstone_opt =3D get_option('capstone') if capstone_opt in ['enabled', 'auto', 'system'] have_internal =3D fs.exists(meson.current_source_dir() / 'capstone/Makef= ile') - capstone =3D dependency('capstone', version: '>=3D4.0', + capstone =3D dependency('capstone', version: '>=3D3.0.5', kwargs: static_kwargs, method: 'pkg-config', required: capstone_opt =3D=3D 'system' or capstone_opt =3D=3D 'enabled' and not ha= ve_internal) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 0aea7ab84c..a4d43d743b 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -42,6 +42,7 @@ build-system-ubuntu: variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --enable-docs --enable-fdt=3Dsystem --enable-slirp=3Ds= ystem + --enable-capstone=3Dsystem TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build --=20 2.27.0 From nobody Fri May 3 10:09:55 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652865455; cv=none; d=zohomail.com; s=zohoarc; b=ipCcFH6C44exolR2ubkCNbul4/+3Sj+3l3UMA0GhpR1lJwSqDHVgHFsHAoExeAryKkzqT91+teNtBFwOtIFhv7DEBEl4eRvMjDHU/sBJM1Z1EhDi7Ld5Vop2rmW8pWQP5z3Lq5AZ28s1J0NVWbCKPBtZoWlCyUUY6UztEAFjigw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652865455; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=akAoBwwSWaFULFcDYz2V0O+8vn45H8TDz8aOJOkcGk8=; b=XOQQEscToluMd+bJQGd0w2A/xmpthiBYX6GVY5GgyR2/XsY42sBP7WqZLvKfOa/nYy2eRxLX1OLy2A4osPHM693esfDhel8+SJ8ObKTS/4YrWBof/ZyvW16ip+Rah0uLdt/KcHN6K3jAOEq6F7J0wxMXc4oLcL/vrDu4VDG1gSE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652865455792919.7220282616728; Wed, 18 May 2022 02:17:35 -0700 (PDT) Received: from localhost ([::1]:48338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrFoE-0000qh-13 for importer2@patchew.org; Wed, 18 May 2022 05:17:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFbz-0008Fy-J1 for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:53328) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrFbu-0004NQ-5D for qemu-devel@nongnu.org; Wed, 18 May 2022 05:04:55 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-509-lWSnxpgpOYGSivYUeBEtEg-1; Wed, 18 May 2022 05:04:46 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7ED7880B718; Wed, 18 May 2022 09:04:46 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18BA11410DD5; Wed, 18 May 2022 09:04:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652864688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=akAoBwwSWaFULFcDYz2V0O+8vn45H8TDz8aOJOkcGk8=; b=VEtMXJpdSb1C8xudob2ZAxqi2NiuISFL28uqDWrbE7u4Jn7pbFgd4JZT7S2vKW4y7ggPzB TCFQNpq2XW4ts8hY6eoqfVmU+njaNOdN0bqsXQXhX2a8BwDAZMfM0hTRkaudWqSE4f3iAF yovscHdeblMDXOkoiAVn9P4fsWbLz4M= X-MC-Unique: lWSnxpgpOYGSivYUeBEtEg-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PULL 8/8] capstone: Remove the capstone submodule Date: Wed, 18 May 2022 11:04:38 +0200 Message-Id: <20220518090438.158475-9-thuth@redhat.com> In-Reply-To: <20220518090438.158475-1-thuth@redhat.com> References: <20220518090438.158475-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652865458141100001 Content-Type: text/plain; charset="utf-8" Now that we allow compiling with Capstone v3.0.5 again, all our supported build hosts should provide at least this version of the disassembler library, so we do not need to ship this as a submodule anymore. Message-Id: <20220516145823.148450-4-thuth@redhat.com> Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- configure | 21 ------- meson.build | 113 ++-------------------------------- .gitlab-ci.d/buildtest.yml | 4 +- .gitlab-ci.d/windows.yml | 5 +- .gitmodules | 3 - capstone | 1 - meson_options.txt | 3 +- scripts/meson-buildoptions.sh | 5 +- 8 files changed, 11 insertions(+), 144 deletions(-) delete mode 160000 capstone diff --git a/configure b/configure index 103a7b02e8..180ee688dc 100755 --- a/configure +++ b/configure @@ -307,10 +307,8 @@ skip_meson=3Dno =20 # 1. Track which submodules are needed if test "$default_feature" =3D no ; then - capstone=3D"disabled" slirp=3D"disabled" else - capstone=3D"auto" slirp=3D"auto" fi fdt=3D"auto" @@ -869,14 +867,6 @@ for opt do --enable-uuid|--disable-uuid) echo "$0: $opt is obsolete, UUID support is always built" >&2 ;; - --disable-capstone) capstone=3D"disabled" - ;; - --enable-capstone) capstone=3D"enabled" - ;; - --enable-capstone=3Dgit) capstone=3D"internal" - ;; - --enable-capstone=3D*) capstone=3D"$optarg" - ;; --with-git=3D*) git=3D"$optarg" ;; --with-git-submodules=3D*) @@ -1566,16 +1556,6 @@ case "$fdt" in ;; esac =20 -########################################## -# capstone - -case "$capstone" in - auto | enabled | internal) - # Simpler to always update submodule, even if not needed. - git_submodules=3D"${git_submodules} capstone" - ;; -esac - ########################################## # check and set a backend for coroutine =20 @@ -2220,7 +2200,6 @@ if test "$skip_meson" =3D no; then test "$werror" =3D yes && meson_option_add -Dwerror=3Dtrue =20 # QEMU options - test "$capstone" !=3D auto && meson_option_add "-Dcapstone=3D$capstone" test "$cfi" !=3D false && meson_option_add "-Dcfi=3D$cfi" test "$fdt" !=3D auto && meson_option_add "-Dfdt=3D$fdt" test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engin= e=3D$LIB_FUZZING_ENGINE" diff --git a/meson.build b/meson.build index 526ff29a86..c4fb8fa5d0 100644 --- a/meson.build +++ b/meson.build @@ -2522,13 +2522,10 @@ genh +=3D custom_target('config-poison.h', ############## =20 capstone =3D not_found -capstone_opt =3D get_option('capstone') -if capstone_opt in ['enabled', 'auto', 'system'] - have_internal =3D fs.exists(meson.current_source_dir() / 'capstone/Makef= ile') +if not get_option('capstone').auto() or have_system or have_user capstone =3D dependency('capstone', version: '>=3D3.0.5', kwargs: static_kwargs, method: 'pkg-config', - required: capstone_opt =3D=3D 'system' or - capstone_opt =3D=3D 'enabled' and not ha= ve_internal) + required: get_option('capstone')) =20 # Some versions of capstone have broken pkg-config file # that reports a wrong -I path, causing the #include to @@ -2537,110 +2534,10 @@ if capstone_opt in ['enabled', 'auto', 'system'] if capstone.found() and not cc.compiles('#include ', dependencies: [capstone]) capstone =3D not_found - if capstone_opt =3D=3D 'system' - error('system capstone requested, it does not appear to work') + if get_option('capstone').enabled() + error('capstone requested, but it does not appear to work') endif endif - - if capstone.found() - capstone_opt =3D 'system' - elif have_internal - capstone_opt =3D 'internal' - else - capstone_opt =3D 'disabled' - endif -endif -if capstone_opt =3D=3D 'internal' - capstone_data =3D configuration_data() - capstone_data.set('CAPSTONE_USE_SYS_DYN_MEM', '1') - - capstone_files =3D files( - 'capstone/cs.c', - 'capstone/MCInst.c', - 'capstone/MCInstrDesc.c', - 'capstone/MCRegisterInfo.c', - 'capstone/SStream.c', - 'capstone/utils.c' - ) - - if 'CONFIG_ARM_DIS' in config_all_disas - capstone_data.set('CAPSTONE_HAS_ARM', '1') - capstone_files +=3D files( - 'capstone/arch/ARM/ARMDisassembler.c', - 'capstone/arch/ARM/ARMInstPrinter.c', - 'capstone/arch/ARM/ARMMapping.c', - 'capstone/arch/ARM/ARMModule.c' - ) - endif - - # FIXME: This config entry currently depends on a c++ compiler. - # Which is needed for building libvixl, but not for capstone. - if 'CONFIG_ARM_A64_DIS' in config_all_disas - capstone_data.set('CAPSTONE_HAS_ARM64', '1') - capstone_files +=3D files( - 'capstone/arch/AArch64/AArch64BaseInfo.c', - 'capstone/arch/AArch64/AArch64Disassembler.c', - 'capstone/arch/AArch64/AArch64InstPrinter.c', - 'capstone/arch/AArch64/AArch64Mapping.c', - 'capstone/arch/AArch64/AArch64Module.c' - ) - endif - - if 'CONFIG_PPC_DIS' in config_all_disas - capstone_data.set('CAPSTONE_HAS_POWERPC', '1') - capstone_files +=3D files( - 'capstone/arch/PowerPC/PPCDisassembler.c', - 'capstone/arch/PowerPC/PPCInstPrinter.c', - 'capstone/arch/PowerPC/PPCMapping.c', - 'capstone/arch/PowerPC/PPCModule.c' - ) - endif - - if 'CONFIG_S390_DIS' in config_all_disas - capstone_data.set('CAPSTONE_HAS_SYSZ', '1') - capstone_files +=3D files( - 'capstone/arch/SystemZ/SystemZDisassembler.c', - 'capstone/arch/SystemZ/SystemZInstPrinter.c', - 'capstone/arch/SystemZ/SystemZMapping.c', - 'capstone/arch/SystemZ/SystemZModule.c', - 'capstone/arch/SystemZ/SystemZMCTargetDesc.c' - ) - endif - - if 'CONFIG_I386_DIS' in config_all_disas - capstone_data.set('CAPSTONE_HAS_X86', 1) - capstone_files +=3D files( - 'capstone/arch/X86/X86Disassembler.c', - 'capstone/arch/X86/X86DisassemblerDecoder.c', - 'capstone/arch/X86/X86ATTInstPrinter.c', - 'capstone/arch/X86/X86IntelInstPrinter.c', - 'capstone/arch/X86/X86InstPrinterCommon.c', - 'capstone/arch/X86/X86Mapping.c', - 'capstone/arch/X86/X86Module.c' - ) - endif - - configure_file(output: 'capstone-defs.h', configuration: capstone_data) - - capstone_cargs =3D [ - # FIXME: There does not seem to be a way to completely replace the c_a= rgs - # that come from add_project_arguments() -- we can only add to them. - # So: disable all warnings with a big hammer. - '-Wno-error', '-w', - - # Include all configuration defines via a header file, which will wind= up - # as a dependency on the object file, and thus changes here will result - # in a rebuild. - '-include', 'capstone-defs.h' - ] - - libcapstone =3D static_library('capstone', - build_by_default: false, - sources: capstone_files, - c_args: capstone_cargs, - include_directories: 'capstone/include') - capstone =3D declare_dependency(link_with: libcapstone, - include_directories: 'capstone/include/cap= stone') endif =20 slirp =3D not_found @@ -3970,7 +3867,7 @@ summary_info +=3D {'bzip2 support': libbzip2} summary_info +=3D {'lzfse support': liblzfse} summary_info +=3D {'zstd support': zstd} summary_info +=3D {'NUMA host support': numa} -summary_info +=3D {'capstone': capstone_opt =3D=3D 'internal' ? c= apstone_opt : capstone} +summary_info +=3D {'capstone': capstone} summary_info +=3D {'libpmem support': libpmem} summary_info +=3D {'libdaxctl support': libdaxctl} summary_info +=3D {'libudev': libudev} diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index a4d43d743b..e9620c3074 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -42,7 +42,7 @@ build-system-ubuntu: variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --enable-docs --enable-fdt=3Dsystem --enable-slirp=3Ds= ystem - --enable-capstone=3Dsystem + --enable-capstone TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build @@ -119,7 +119,7 @@ build-system-fedora: variables: IMAGE: fedora CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs - --enable-fdt=3Dsystem --enable-slirp=3Dsystem --enable-capsto= ne=3Dsystem + --enable-fdt=3Dsystem --enable-slirp=3Dsystem --enable-capsto= ne TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-soft= mmu MAKE_CHECK_ARGS: check-build diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 47f6073773..cf7724b8e5 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -57,7 +57,7 @@ msys2-64bit: - $env:CHERE_INVOKING =3D 'yes' # Preserve the current working directory - $env:MSYSTEM =3D 'MINGW64' # Start a 64 bit Mingw environment - .\msys64\usr\bin\bash -lc './configure --target-list=3Dx86_64-softmmu - --enable-capstone=3Dsystem --without-default-devices' + --enable-capstone --without-default-devices' - .\msys64\usr\bin\bash -lc "sed -i '/^ROMS=3D/d' build/config-host.mak" - .\msys64\usr\bin\bash -lc 'make -j2' - .\msys64\usr\bin\bash -lc 'make check' @@ -90,7 +90,6 @@ msys2-32bit: - $env:MSYSTEM =3D 'MINGW32' # Start a 32-bit MinG environment - mkdir output - cd output - - ..\msys64\usr\bin\bash -lc "../configure --target-list=3Dppc64-softmmu - --enable-capstone=3Dsystem" + - ..\msys64\usr\bin\bash -lc "../configure --target-list=3Dppc64-softmmu" - ..\msys64\usr\bin\bash -lc 'make -j2' - ..\msys64\usr\bin\bash -lc 'make check' diff --git a/.gitmodules b/.gitmodules index f4b6a9b401..b8bff47df8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,9 +31,6 @@ [submodule "ui/keycodemapdb"] path =3D ui/keycodemapdb url =3D https://gitlab.com/qemu-project/keycodemapdb.git -[submodule "capstone"] - path =3D capstone - url =3D https://gitlab.com/qemu-project/capstone.git [submodule "roms/seabios-hppa"] path =3D roms/seabios-hppa url =3D https://gitlab.com/qemu-project/seabios-hppa.git diff --git a/capstone b/capstone deleted file mode 160000 index f8b1b83301..0000000000 --- a/capstone +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f8b1b833015a4ae47110ed068e0deb7106ced66d diff --git a/meson_options.txt b/meson_options.txt index 29c6b90cec..fcdc43f7db 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -252,8 +252,7 @@ option('virtfs', type: 'feature', value: 'auto', option('virtiofsd', type: 'feature', value: 'auto', description: 'build virtiofs daemon (virtiofsd)') =20 -option('capstone', type: 'combo', value: 'auto', - choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], +option('capstone', type: 'feature', value: 'auto', description: 'Whether and how to find the capstone library') option('slirp', type: 'combo', value: 'auto', choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 5d2172bfb4..7fc56d3f4a 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -16,9 +16,6 @@ meson_options_help() { printf "%s\n" ' --enable-block-drv-whitelist-in-tools' printf "%s\n" ' use block whitelist also in to= ols instead of only' printf "%s\n" ' QEMU' - printf "%s\n" ' --enable-capstone[=3DCHOICE]' - printf "%s\n" ' Whether and how to find the ca= pstone library' - printf "%s\n" ' (choices: auto/disabled/enable= d/internal/system)' printf "%s\n" ' --enable-cfi Control-Flow Integrity (CFI)' printf "%s\n" ' --enable-cfi-debug Verbose errors in case of CFI = violation' printf "%s\n" ' --enable-debug-mutex mutex debugging support' @@ -77,6 +74,7 @@ meson_options_help() { printf "%s\n" ' brlapi brlapi character device driver' printf "%s\n" ' bzip2 bzip2 support for DMG images' printf "%s\n" ' cap-ng cap_ng support' + printf "%s\n" ' capstone Whether and how to find the capstone li= brary' printf "%s\n" ' cloop cloop image format support' printf "%s\n" ' cocoa Cocoa user interface (macOS only)' printf "%s\n" ' coreaudio CoreAudio sound support' @@ -209,7 +207,6 @@ _meson_option_parse() { --disable-cap-ng) printf "%s" -Dcap_ng=3Ddisabled ;; --enable-capstone) printf "%s" -Dcapstone=3Denabled ;; --disable-capstone) printf "%s" -Dcapstone=3Ddisabled ;; - --enable-capstone=3D*) quote_sh "-Dcapstone=3D$2" ;; --enable-cfi) printf "%s" -Dcfi=3Dtrue ;; --disable-cfi) printf "%s" -Dcfi=3Dfalse ;; --enable-cfi-debug) printf "%s" -Dcfi_debug=3Dtrue ;; --=20 2.27.0