From nobody Fri May 17 07:55:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1661354018; cv=none; d=zohomail.com; s=zohoarc; b=Z5s2oLExWF2o6ceAsEbAt6m/Ibr/5C1OAWMS06rxPMJVMvKVznhS1pNFv14o9h2ULNKlGWmVt/tSU3RuSJmbpX0objmq2lEAOltkON0HyAqqrOWcWYwWu3BIpuS+6oxNzMPkIGAZ3dgEeoNvd7gz9ON+K+qkG9GfuxZsAvP91Is= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661354018; 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=ZB6qjYydTYmE5zphFDDL9Ps2PXuNyHs7sGzcjHcrOaI=; b=L9mwzN8Obyz/wnXzQyWfJzSXVUd/f3DqAYGpfij/Hsohu3VIUbUmRrp39aQYhB1eY+BSWO/cJzik0Lhs6MeHl3vjCw5fp+063FTO1tySwYaQtSH6+NWY42iIgBiuaHibr++PPvpNCY0RI7OXqC8WXCryueAM2sw0FeXTGySQu8w= 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+importer=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 1661354018493412.3965963137981; Wed, 24 Aug 2022 08:13:38 -0700 (PDT) Received: from localhost ([::1]:44636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQs4W-00037y-Rf for importer@patchew.org; Wed, 24 Aug 2022 11:13:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQs2a-0000RL-AZ for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:11:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23288) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQs2Y-0003mw-Mt for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:11:36 -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-26-GRhjp1CSPTSxiB-CLe0vqw-1; Wed, 24 Aug 2022 11:11:30 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4ABD01C14B63; Wed, 24 Aug 2022 15:11:30 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id C0C4D492C3B; Wed, 24 Aug 2022 15:11:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661353893; 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=ZB6qjYydTYmE5zphFDDL9Ps2PXuNyHs7sGzcjHcrOaI=; b=I4XuXwhw3ZwgDIcjzfzzK4h3ZB72iO4eVF4AfaiZevHmAsBYBb1H2SUOckQQfEFh7RBodG b++6sPyHyaIw8v4fKqgOX7JY9sT2DsvolJJx5UwSTpxJDs6kX+bumo5qV9cvAKDs1pa38p 20O249zvw7vwq4yjr2TkJURcoTLj89k= X-MC-Unique: GRhjp1CSPTSxiB-CLe0vqw-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Samuel Thibault Cc: Paolo Bonzini , Warner Losh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" Subject: [PATCH 1/6] tests/docker: Update the debian-all-test-cross container to Debian 11 Date: Wed, 24 Aug 2022 17:11:17 +0200 Message-Id: <20220824151122.704946-2-thuth@redhat.com> In-Reply-To: <20220824151122.704946-1-thuth@redhat.com> References: <20220824151122.704946-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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+importer=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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1661354021089100001 Content-Type: text/plain; charset="utf-8" The "build-tci" job in our CI is running the pxe-test that requires slirp. However, we are going to remove the slirp submodule from QEMU, so we need to run the test in a container that provides libslirp from the OS distribution. Currently, the debian-all-test-cross container that is used for the "build-tci" job is based on Debian 10 - which is not supported by QEMU anymore and does not have libslirp as a system library. Thus we really need to update the container to Debian 11 now to keep the "build-tci" job working. Signed-off-by: Thomas Huth Acked-by: Samuel Thibault --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-all-test-cross.docker | 9 ++++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index 505b267542..0971c6ac8b 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -15,7 +15,6 @@ amd64-debian-cross-container: amd64-debian-user-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-all-test-cross =20 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 9a45e8890b..e60588cdc9 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -139,7 +139,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/de= bian-toolchain.docker \ =20 # Specialist build images, sometimes very limited tools docker-image-debian-tricore-cross: docker-image-debian10 -docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/= docker/dockerfiles/debian-all-test-cross.docker index dedcea58b4..afdf0261d3 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -6,16 +6,23 @@ # basic compilers for as many targets as possible. We shall use this # to build and run linux-user tests on GitLab # -FROM qemu/debian10 +FROM docker.io/library/debian:bullseye-slim + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list =20 # What we need to build QEMU itself RUN apt update && \ + DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt build-dep -yy qemu =20 # Add the foreign architecture we want and install dependencies RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt install -y --no-install-recommends \ + clang \ + git \ + gdb-multiarch \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-alpha-linux-gnu \ --=20 2.31.1 From nobody Fri May 17 07:55:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1661354220; cv=none; d=zohomail.com; s=zohoarc; b=iAyNF5weHRSPWiUNqU6VzJVRiDuCRYTehoM/hnYkb32G/zp/HbdEUkptLESTWYt+4ULn1Tnh7ZM2y9egCndXD5S6IgnwNt/Hii+ER09kSt6SI9Qq1hMJp5Ihf8xFuxRJarFzF9PD/KnnR0SM0PPhm31891TbkGBiMdT1Dq9COfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661354220; 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=1bv1s1NV1pWA22SbMD9BocQAHmUHfasyOVlgtouDrWM=; b=UEjX0J22/F8/9b+r9+eIKooezrWtinb/AIIzWtSaoBi6NyJesFB6bXhBSGWuqIYYYC446JI3zp/RC5iMhFnMque5hECVhjK496WOqkAGvA4YNOY+E2q3aTI+P70gcL5HGLjV54+eT7FawPi/NNEL0/jZ6OB43sDEF6MtKFgCxRw= 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+importer=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 1661354220388131.5431263489504; Wed, 24 Aug 2022 08:17:00 -0700 (PDT) Received: from localhost ([::1]:54480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQs7n-00085M-Ao for importer@patchew.org; Wed, 24 Aug 2022 11:16:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQs2b-0000UN-Uo for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:11:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:32988) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQs2a-0003nB-EG for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:11:37 -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-187--Y-Zj5SrM3OgHRMqZLn7rw-1; Wed, 24 Aug 2022 11:11:32 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3D5898039B2; Wed, 24 Aug 2022 15:11:32 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FD9C403348; Wed, 24 Aug 2022 15:11:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661353895; 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=1bv1s1NV1pWA22SbMD9BocQAHmUHfasyOVlgtouDrWM=; b=VTyyTUoDbnNBhO5mFmmXynPz+Wvf4JQSmV4cToQodf7h1ybQHZWnGyDgluk7GSXlcFpcv0 N1cfpu3nAcnk1DWno981zE41TtlqonjrrDRixkc/920VY31XtdngVsCzkPDJm1+vDD9vny bxGlUNAaY8ULPMshzM9FIoTmP+bXnvM= X-MC-Unique: -Y-Zj5SrM3OgHRMqZLn7rw-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Samuel Thibault Cc: Paolo Bonzini , Warner Losh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" Subject: [PATCH 2/6] tests/vm: Add libslirp to the VM tests Date: Wed, 24 Aug 2022 17:11:18 +0200 Message-Id: <20220824151122.704946-3-thuth@redhat.com> In-Reply-To: <20220824151122.704946-1-thuth@redhat.com> References: <20220824151122.704946-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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+importer=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: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1661354222088100001 Content-Type: text/plain; charset="utf-8" We are going to remove the slirp submodule from the QEMU repository, so we should make sure to install the distro's libslirp to get the same test coverage as before in the VMs. Signed-off-by: Thomas Huth Acked-by: Samuel Thibault --- tests/vm/freebsd | 3 +++ tests/vm/haiku.x86_64 | 3 ++- tests/vm/netbsd | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/vm/freebsd b/tests/vm/freebsd index cd1fabde52..3643fe325d 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -63,6 +63,9 @@ class FreeBSDVM(basevm.BaseVM): =20 # libs: migration "zstd", + + # libs: networking + "libslirp", ] =20 BUILD_SCRIPT =3D """ diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64 index 936f7d2ae2..29668bc272 100755 --- a/tests/vm/haiku.x86_64 +++ b/tests/vm/haiku.x86_64 @@ -71,6 +71,7 @@ class HaikuVM(basevm.BaseVM): "devel:libpixman_1", "devel:libpng16", "devel:libsdl2_2.0", + "devel:libslirp", "devel:libsnappy", "devel:libssh2", "devel:libtasn1", @@ -89,7 +90,7 @@ class HaikuVM(basevm.BaseVM): mkdir -p /usr/bin ln -s /boot/system/bin/env /usr/bin/env cd ../build - ../src/configure --disable-slirp {configure_opts}; + ../src/configure {configure_opts}; make --output-sync -j{jobs} {target} {verbose}; """ =20 diff --git a/tests/vm/netbsd b/tests/vm/netbsd index aa883ec23c..da6773ff59 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -54,6 +54,9 @@ class NetBSDVM(basevm.BaseVM): =20 # libs: migration "zstd", + + # libs: networking + "libslirp", ] =20 BUILD_SCRIPT =3D """ --=20 2.31.1 From nobody Fri May 17 07:55:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1661354222; cv=none; d=zohomail.com; s=zohoarc; b=HprvBhjTpazI0o/AZY0i+M/PGVh0SOSrw88siF7NbwgKJe6mHuX6rqNOddJwAmELlIAz4bbslEMyzmWfPcNDILWQtsJOvGkpgJb1IgCCUZ3XSn0WG1MCBkb8USopiNJ03MRQsKzhk5X7ABIGq7GVH/ImEt+lTF6+AuGBMrRjU0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661354222; 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=/KkmcK7pYwjamXohGMACGxGrSvMgHO4KmlbV2ufdo/Y=; b=F9KftpblsZBJcdPx9PVPEjiknngOXESCBALhdp2w+r0E9wBlHz/Mk1nRD5z9QtCxv510GEl/+1InBZhLtCm2QFf1myD+9E0/WQGx4TnedfebSE/S+NmwHvwAF1vV2L0e18ZY5PoNRGq3UvMhL09Y60O+4jYj7i8NJ6ofVVfEYdI= 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+importer=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 1661354222404336.3867570715929; Wed, 24 Aug 2022 08:17:02 -0700 (PDT) Received: from localhost ([::1]:54482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQs7p-0008AU-Em for importer@patchew.org; Wed, 24 Aug 2022 11:17:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQs2e-0000Zn-SR for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:11:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:31986) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQs2c-0003nV-8S for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:11:39 -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-498-yMus-Wg5No2yfLZgxhEbkw-1; Wed, 24 Aug 2022 11:11:34 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2EEEF3815D2B; Wed, 24 Aug 2022 15:11:34 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id A03A3492C3B; Wed, 24 Aug 2022 15:11:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661353897; 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=/KkmcK7pYwjamXohGMACGxGrSvMgHO4KmlbV2ufdo/Y=; b=VDeI2Jg8jqArWFq81HMPh/hSyj/7lQK8sY8KI6Jkd/icm0c3tUv3+Bv69lQ0gFKvl5muEe qiF4MakwRKXuPNUA05OKN+DfWwJH90SVE6PP85X8FzDF6NCibb82by7PSuU/wkrULL3Ilf GbAllzxDknY2TjNOLUWxczPJsRHR/AQ= X-MC-Unique: yMus-Wg5No2yfLZgxhEbkw-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Samuel Thibault Cc: Paolo Bonzini , Warner Losh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" Subject: [PATCH 3/6] tests/lcitool/libvirt-ci: Update the lcitool module to the latest version Date: Wed, 24 Aug 2022 17:11:19 +0200 Message-Id: <20220824151122.704946-4-thuth@redhat.com> In-Reply-To: <20220824151122.704946-1-thuth@redhat.com> References: <20220824151122.704946-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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+importer=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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1661354224077100003 Content-Type: text/plain; charset="utf-8" The latest version of the lcitool now supports libslirp on FreeBSD, too. Signed-off-by: Thomas Huth Acked-by: Samuel Thibault --- tests/lcitool/libvirt-ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 324355cf62..bc06b58be9 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 324355cf62e86fb551408575afb123bac989ac37 +Subproject commit bc06b58be9ff74e50e410cace1cd054e6f99a57a --=20 2.31.1 From nobody Fri May 17 07:55:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1661354533; cv=none; d=zohomail.com; s=zohoarc; b=R56+kPkXwPnAarRcULW9KEe/8hh+MaoBPw2NscLmvfWUwdPnAuR6PFuqyWZ9Y+zbdWqtgyaRTMscYl3EzkBlgAUMqBzpLNQ7WtpiyymCOnhJK8frv4Q+GB9fky6V+0ypL2ZjPe9vtxoD+ZFzHr7QR4UiG3Bvk+XndPYO9j7s+aw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661354533; 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=IjsJ8cZf9tdCwc7P03LvLDQYqqwzGk+43ETPL/FXunQ=; b=Wmw0oMtZJA7F5Wp1CkCmj6rsN+kgmdhTWXeCQsXog6RHIyUi5SGKFzf+ZF/sBc9+hKXuah3j66sFTZMu0EfYuPU9IHOO7+3UX/a2hI8sQHlR+YaxMZy9WceBJ2AaDSKPv9tCFn+YHkzQB3J2ZHifw4oypyB4G3SlrHQaL1PWJi8= 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+importer=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 16613545334331009.3832832354182; Wed, 24 Aug 2022 08:22:13 -0700 (PDT) Received: from localhost ([::1]:41418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQsCo-0002qr-Ct for importer@patchew.org; Wed, 24 Aug 2022 11:22:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQs2j-0000jV-O8 for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:11:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:38257) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQs2h-0003p8-Id for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:11:45 -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-208-53rzR_hdORuDW14UFee9kA-1; Wed, 24 Aug 2022 11:11:36 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0F53F811E76; Wed, 24 Aug 2022 15:11:36 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 75119492C3B; Wed, 24 Aug 2022 15:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661353902; 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=IjsJ8cZf9tdCwc7P03LvLDQYqqwzGk+43ETPL/FXunQ=; b=F8LIdEE4Khe9w46PmGh7i5jJyyQS6tzy8WBhVm00TaIrijVMqKEupIjWhOauEGClVUH+b1 XhTWtBUq4EAKzV/Zw+7nFxLKH7q0aoRR/yPJkcJGst9mY75DIalVFzaJUXNfIcwXVTobx6 Xs2kZh2f0RRauNiW1UIAYxrD5FwbLFw= X-MC-Unique: 53rzR_hdORuDW14UFee9kA-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Samuel Thibault Cc: Paolo Bonzini , Warner Losh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" Subject: [PATCH 4/6] tests: Refresh dockerfiles and FreeBSD vars with lcitool Date: Wed, 24 Aug 2022 17:11:20 +0200 Message-Id: <20220824151122.704946-5-thuth@redhat.com> In-Reply-To: <20220824151122.704946-1-thuth@redhat.com> References: <20220824151122.704946-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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+importer=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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1661354534128100001 Content-Type: text/plain; charset="utf-8" Run tests/lcitool/refresh to get the latest updates (like libslirp in the FreeBSD files) from lcitool. Signed-off-by: Thomas Huth Acked-by: Samuel Thibault --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- tests/docker/dockerfiles/opensuse-leap.docker | 2 +- tests/docker/dockerfiles/ubuntu2004.docker | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/free= bsd-12.vars index 8fa5a320e9..1a5959810f 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' -PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git = glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo = libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja= opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphin= x py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy s= pice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git = glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo = libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses net= tle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip p= y39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image= snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/free= bsd-13.vars index 8ed7e33a77..5e5aafd7e5 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' -PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git = glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo = libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja= opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphin= x py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy s= pice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git = glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo = libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses net= tle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip p= y39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image= snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 047a435ab5..193df305af 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -127,7 +127,7 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -RUN pip3 install meson=3D=3D0.56.0 +RUN /usr/bin/pip3 install meson=3D=3D0.56.0 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index 99803b343b..e1f4ed7c80 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -137,7 +137,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -RUN pip3 install meson=3D=3D0.56.0 +RUN /usr/bin/pip3 install meson=3D=3D0.56.0 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" --=20 2.31.1 From nobody Fri May 17 07:55:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1661354092; cv=none; d=zohomail.com; s=zohoarc; b=F2/idqtsNE9Ar8ISeX0iqEY//GLA9b9hAzL0dUIVsSaL2vNwFlXGhsT17ZCA+5zdovQpqwdIUbiOGcQqKO3RPt3auAODqAXMRFbIy6tHWsKvs5xR+BBKBQSMdfXtN2brv/tinFUOq3RKcLXuX4Lhf4Aqcu/nMyU2LBgf3+itkWw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661354092; 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=wjDuD1u+EFXhsvOTUtvdLjGMmlI5tOCJeVxR0yge+7g=; b=d8AV5ZFusEY0bJK57ptTPHf/4ihTo8yS/B+WaniAxfdEVFYkNyrIMuQCUVxoSOKLjCka61PmGME+TtB1mcLC8jBWNky+x5npbmiZ0vCkaCDF4ZmWX/i/EJOPuMErny/7b/6TgSSmKEYqH+LXJUV3xiKL81FLEqsN/LJICuC+JT4= 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+importer=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 1661354092412217.36614614069777; Wed, 24 Aug 2022 08:14:52 -0700 (PDT) Received: from localhost ([::1]:59758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQs5i-0004hX-CD for importer@patchew.org; Wed, 24 Aug 2022 11:14:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQs2j-0000jX-O4 for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:11:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:54835) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQs2h-0003oU-LP for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:11:45 -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-231-i6GEL0FDMc-wXZO4wOgG1A-1; Wed, 24 Aug 2022 11:11:39 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4DF76294EDF4; Wed, 24 Aug 2022 15:11:38 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F00A492C3B; Wed, 24 Aug 2022 15:11:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661353902; 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=wjDuD1u+EFXhsvOTUtvdLjGMmlI5tOCJeVxR0yge+7g=; b=Bw+VMvN/14A2E0H14qpYoWyPnacFeXuEa8vSKNV5kqJst/q6ZHnigJaPDdkX6NqI/q29Wr iGZs2Ot4KhYM7wh7bvX77/nPoWTlu3sPA/Ub6UTwoGHchbYgj4GegFoLedWuzDOxmKpp4h V3+qOtByQ2W7v7tNs7BX1Bic3M5IFM8= X-MC-Unique: i6GEL0FDMc-wXZO4wOgG1A-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Samuel Thibault Cc: Paolo Bonzini , Warner Losh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" Subject: [PATCH 5/6] tests/avocado: Do not run tests that require libslirp if it is not available Date: Wed, 24 Aug 2022 17:11:21 +0200 Message-Id: <20220824151122.704946-6-thuth@redhat.com> In-Reply-To: <20220824151122.704946-1-thuth@redhat.com> References: <20220824151122.704946-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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+importer=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: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1661354093350100001 Content-Type: text/plain; charset="utf-8" Some avocado tests blindly assume that QEMU has been compiled with libslirp enabled and fail badly if it is missing. Add a proper check to cancel the tests in this case. Signed-off-by: Thomas Huth Acked-by: Samuel Thibault --- tests/avocado/avocado_qemu/__init__.py | 7 +++++++ tests/avocado/info_usernet.py | 1 + tests/avocado/replay_linux.py | 1 + 3 files changed, 9 insertions(+) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index ed4853c805..5ebf5c1766 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -295,6 +295,12 @@ def require_accelerator(self, accelerator): self.cancel("%s accelerator does not seem to be " "available" % accelerator) =20 + def require_netdev(self, netdevname): + netdevhelp =3D run_cmd([self.qemu_bin, + '-M', 'none', '-netdev', 'help'])[0]; + if netdevhelp.find('\n' + netdevname + '\n') < 0: + self.cancel('no support for user networking') + def _new_vm(self, name, *args): self._sd =3D tempfile.TemporaryDirectory(prefix=3D"avo_qemu_sock_") vm =3D QEMUMachine(self.qemu_bin, base_temp_dir=3Dself.workdir, @@ -547,6 +553,7 @@ def _set_distro(self): =20 def setUp(self, ssh_pubkey=3DNone, network_device_type=3D'virtio-net'): super().setUp() + self.require_netdev('user') self._set_distro() self.vm.add_args('-smp', self.smp) self.vm.add_args('-m', self.memory) diff --git a/tests/avocado/info_usernet.py b/tests/avocado/info_usernet.py index dc01f74150..b862a47dba 100644 --- a/tests/avocado/info_usernet.py +++ b/tests/avocado/info_usernet.py @@ -16,6 +16,7 @@ class InfoUsernet(QemuSystemTest): =20 def test_hostfwd(self): + self.require_netdev('user') self.vm.add_args('-netdev', 'user,id=3Dvnet,hostfwd=3D:127.0.0.1:0= -:22') self.vm.launch() res =3D self.vm.command('human-monitor-command', diff --git a/tests/avocado/replay_linux.py b/tests/avocado/replay_linux.py index e1f9981a34..a76dd507fc 100644 --- a/tests/avocado/replay_linux.py +++ b/tests/avocado/replay_linux.py @@ -55,6 +55,7 @@ def vm_add_disk(self, vm, path, id, device): '%s,drive=3Ddisk%s-rr%s' % (device, id, bus_string)) =20 def launch_and_wait(self, record, args, shift): + self.require_netdev('user') vm =3D self.get_vm() vm.add_args('-smp', '1') vm.add_args('-m', '1024') --=20 2.31.1 From nobody Fri May 17 07:55:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1661354046; cv=none; d=zohomail.com; s=zohoarc; b=bnE2AA6yzb5+JO9e2Pjw+igY61WnIxgK40opICR6x/DyaAjlh2DF2+/TWJi7DUgIjzyhgr3qcen+CVAPRRkIDI7/LS7AVKMuqgiXEirN+A9VCA5TkW3WNwvPOgdLvjRzoL1q80o9XjlK0geuT4mV6C+L4ycXmawwX5c373UXHuA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661354046; 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=3GIJrf6S36ie5QG3sBjQUkb7rHIJrIMLztP+NcvxeTk=; b=J7oDT3XvTLAENJRJrM9CDWSM+LOLFgld79vz0cDyMCAyjNuSmyWwFnjX92TXiVkKqkHVe4F0T52GDEErpaGonfH4mRcTuDSREqIzKHGjyt1SJMBL5RFGj654zXx4AuGl8Admf2F0I189+WuoNVgdCc+hUHFbq5z3QAqD3VAvGM8= 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+importer=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 1661354046885854.1152673270467; Wed, 24 Aug 2022 08:14:06 -0700 (PDT) Received: from localhost ([::1]:44638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQs4y-0003TG-Qw for importer@patchew.org; Wed, 24 Aug 2022 11:14:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQs2l-0000l1-CD for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:11:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:29894) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQs2i-0003qm-K4 for qemu-devel@nongnu.org; Wed, 24 Aug 2022 11:11:47 -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-543-4xmgNe5tOLuTC9zu_kUtuA-1; Wed, 24 Aug 2022 11:11:40 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4739F101A56D; Wed, 24 Aug 2022 15:11:40 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFB34403348; Wed, 24 Aug 2022 15:11:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661353904; 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=3GIJrf6S36ie5QG3sBjQUkb7rHIJrIMLztP+NcvxeTk=; b=fWvBkzHXEL50Rg/q3Yiz9Tvy1ZVOG8hB0CySggEvP+BcbCU3TJ5Mfu2c/1b2rqgsMi+cqI GyHAip6mwRl9HTSw8n7wRo2TluW35ohh23ZvI6QmhdNc5+/B1ibGoeYnz8GisQoAli4J7/ lFk2MQFqMcY8Q1aq0CP4Q4/0w2acDvg= X-MC-Unique: 4xmgNe5tOLuTC9zu_kUtuA-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Samuel Thibault Cc: Paolo Bonzini , Warner Losh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" Subject: [PATCH v2 6/6] Remove the slirp submodule (i.e. compile only with an external libslirp) Date: Wed, 24 Aug 2022 17:11:22 +0200 Message-Id: <20220824151122.704946-7-thuth@redhat.com> In-Reply-To: <20220824151122.704946-1-thuth@redhat.com> References: <20220824151122.704946-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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+importer=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: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1661354049218100001 Content-Type: text/plain; charset="utf-8" Since QEMU 7.1 we don't support Ubuntu 18.04 anymore, so the last big important Linux distro that did not have a pre-packaged libslirp has been dismissed. All other major distros seem to have a libslirp package in their distribution already - according to repology.org: Fedora 35: 4.6.1 CentOS 8 (RHEL-8): 4.4.0 Debian 11: 4.4.0 OpenSUSE Leap 15.3: 4.3.1 Ubuntu LTS 20.04: 4.1.0 FreeBSD Ports: 4.7.0 NetBSD pkgsrc: 4.7.0 Homebrew: 4.7.0 MSYS2 mingw: 4.7.0 The only one that was still missing a libslirp package is OpenBSD - but the next version (OpenBSD 7.2 which will be shipped in October) is going to include a libslirp package. Since QEMU 7.2 will be published after OpenBSD 7.2, we should be fine there, too. So there is no real urgent need for keeping the slirp submodule in the QEMU tree anymore. Thus let's drop the slirp submodule now and rely on the libslirp packages from the distributions instead. Signed-off-by: Thomas Huth Acked-by: Samuel Thibault --- configure | 24 ------- meson.build | 121 +++++++--------------------------- .gitlab-ci.d/buildtest.yml | 20 +++--- .gitmodules | 3 - MAINTAINERS | 1 - meson_options.txt | 5 +- scripts/archive-source.sh | 2 +- scripts/meson-buildoptions.sh | 4 +- slirp | 1 - 9 files changed, 34 insertions(+), 147 deletions(-) delete mode 160000 slirp diff --git a/configure b/configure index 72ab03f11a..b8ac0f8e56 100755 --- a/configure +++ b/configure @@ -321,11 +321,6 @@ vfio_user_server=3D"disabled" # are included in the automatically generated help message) =20 # 1. Track which submodules are needed -if test "$default_feature" =3D no ; then - slirp=3D"disabled" -else - slirp=3D"auto" -fi fdt=3D"auto" =20 # 2. Automatically enable/disable other options @@ -829,14 +824,6 @@ for opt do ;; --disable-tsan) tsan=3D"no" ;; - --disable-slirp) slirp=3D"disabled" - ;; - --enable-slirp) slirp=3D"enabled" - ;; - --enable-slirp=3Dgit) slirp=3D"internal" - ;; - --enable-slirp=3D*) slirp=3D"$optarg" - ;; --disable-tcg) tcg=3D"disabled" plugins=3D"no" ;; @@ -1828,16 +1815,6 @@ EOF fi fi =20 -########################################## -# check for slirp - -case "$slirp" in - auto | enabled | internal) - # Simpler to always update submodule, even if not needed. - git_submodules=3D"${git_submodules} slirp" - ;; -esac - ########################################## # functions to probe cross compilers =20 @@ -2746,7 +2723,6 @@ if test "$skip_meson" =3D no; then 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" test "$qemu_suffix" !=3D qemu && meson_option_add "-Dqemu_suffix=3D$qemu= _suffix" - test "$slirp" !=3D auto && meson_option_add "-Dslirp=3D$slirp" test "$smbd" !=3D '' && meson_option_add "-Dsmbd=3D$smbd" test "$tcg" !=3D enabled && meson_option_add "-Dtcg=3D$tcg" test "$vfio_user_server" !=3D auto && meson_option_add "-Dvfio_user_serv= er=3D$vfio_user_server" diff --git a/meson.build b/meson.build index 20fddbd707..fa55145d1a 100644 --- a/meson.build +++ b/meson.build @@ -643,6 +643,26 @@ else method: 'pkg-config', kwargs: static_kwargs) endif =20 +slirp =3D not_found +if not get_option('slirp').auto() or have_system + slirp =3D dependency('slirp', required: get_option('slirp'), + method: 'pkg-config', kwargs: static_kwargs) + # slirp < 4.7 is incompatible with CFI support in QEMU. This is because + # it passes function pointers within libslirp as callbacks for timers. + # When using a system-wide shared libslirp, the type information for the + # callback is missing and the timer call produces a false positive with = CFI. + # Do not use the "version" keyword argument to produce a better error. + # with control-flow integrity. + if get_option('cfi') and slirp.found() and slirp.version().version_compa= re('<4.7') + if get_option('slirp').enabled() + error('Control-Flow Integrity requires libslirp 4.7.') + else + warning('Cannot use libslirp since Control-Flow Integrity requires l= ibslirp >=3D 4.7.') + slirp =3D not_found + endif + endif +endif + vde =3D not_found if not get_option('vde').auto() or have_system or have_tools vde =3D cc.find_library('vdeplug', has_headers: ['libvdeplug.h'], @@ -2614,103 +2634,6 @@ if not get_option('capstone').auto() or have_system= or have_user endif endif =20 -slirp =3D not_found -slirp_opt =3D 'disabled' -if have_system - slirp_opt =3D get_option('slirp') - if slirp_opt in ['enabled', 'auto', 'system'] - have_internal =3D fs.exists(meson.current_source_dir() / 'slirp/meson.= build') - slirp_dep_required =3D (slirp_opt =3D=3D 'system' or - slirp_opt =3D=3D 'enabled' and not have_internal) - slirp =3D dependency('slirp', kwargs: static_kwargs, - method: 'pkg-config', version: '>=3D4.1.0', - required: slirp_dep_required) - # slirp <4.7 is incompatible with CFI support in QEMU. This is because - # it passes function pointers within libslirp as callbacks for timers. - # When using a system-wide shared libslirp, the type information for t= he - # callback is missing and the timer call produces a false positive wit= h CFI. - # Do not use the "version" keyword argument to produce a better error. - # with control-flow integrity. - if get_option('cfi') and slirp.found() and slirp.version().version_com= pare('<4.7') - if slirp_dep_required - error('Control-Flow Integrity requires libslirp 4.7.') - else - warning('Control-Flow Integrity requires libslirp 4.7, not using s= ystem-wide libslirp.') - slirp =3D not_found - endif - endif - if slirp.found() - slirp_opt =3D 'system' - elif have_internal - slirp_opt =3D 'internal' - else - slirp_opt =3D 'disabled' - endif - endif - if slirp_opt =3D=3D 'internal' - slirp_deps =3D [] - if targetos =3D=3D 'windows' - slirp_deps =3D cc.find_library('iphlpapi') - elif targetos =3D=3D 'darwin' - slirp_deps =3D cc.find_library('resolv') - endif - slirp_conf =3D configuration_data() - slirp_conf.set('SLIRP_MAJOR_VERSION', meson.project_version().split('.= ')[0]) - slirp_conf.set('SLIRP_MINOR_VERSION', meson.project_version().split('.= ')[1]) - slirp_conf.set('SLIRP_MICRO_VERSION', meson.project_version().split('.= ')[2]) - slirp_conf.set_quoted('SLIRP_VERSION_STRING', meson.project_version()) - slirp_cargs =3D ['-DG_LOG_DOMAIN=3D"Slirp"'] - slirp_files =3D [ - 'slirp/src/arp_table.c', - 'slirp/src/bootp.c', - 'slirp/src/cksum.c', - 'slirp/src/dhcpv6.c', - 'slirp/src/dnssearch.c', - 'slirp/src/if.c', - 'slirp/src/ip6_icmp.c', - 'slirp/src/ip6_input.c', - 'slirp/src/ip6_output.c', - 'slirp/src/ip_icmp.c', - 'slirp/src/ip_input.c', - 'slirp/src/ip_output.c', - 'slirp/src/mbuf.c', - 'slirp/src/misc.c', - 'slirp/src/ncsi.c', - 'slirp/src/ndp_table.c', - 'slirp/src/sbuf.c', - 'slirp/src/slirp.c', - 'slirp/src/socket.c', - 'slirp/src/state.c', - 'slirp/src/stream.c', - 'slirp/src/tcp_input.c', - 'slirp/src/tcp_output.c', - 'slirp/src/tcp_subr.c', - 'slirp/src/tcp_timer.c', - 'slirp/src/tftp.c', - 'slirp/src/udp.c', - 'slirp/src/udp6.c', - 'slirp/src/util.c', - 'slirp/src/version.c', - 'slirp/src/vmstate.c', - ] - - configure_file( - input : 'slirp/src/libslirp-version.h.in', - output : 'libslirp-version.h', - configuration: slirp_conf) - - slirp_inc =3D include_directories('slirp', 'slirp/src') - libslirp =3D static_library('slirp', - build_by_default: false, - sources: slirp_files, - c_args: slirp_cargs, - include_directories: slirp_inc) - slirp =3D declare_dependency(link_with: libslirp, - dependencies: slirp_deps, - include_directories: slirp_inc) - endif -endif - libvfio_user_dep =3D not_found if have_system and vfio_user_server_allowed have_internal =3D fs.exists(meson.current_source_dir() / 'subprojects/li= bvfio-user/meson.build') @@ -3717,7 +3640,7 @@ summary_info +=3D {'genisoimage': config_host['= GENISOIMAGE']} if targetos =3D=3D 'windows' and have_ga summary_info +=3D {'wixl': wixl} endif -if slirp_opt !=3D 'disabled' and have_system +if slirp.found() and have_system summary_info +=3D {'smbd': have_slirp_smbd ? smbd_path : fals= e} endif summary(summary_info, bool_yn: true, section: 'Host binaries') @@ -3911,7 +3834,7 @@ summary_info +=3D {'SDL image support': sdl_image} summary_info +=3D {'GTK support': gtk} summary_info +=3D {'pixman': pixman} summary_info +=3D {'VTE support': vte} -summary_info +=3D {'slirp support': slirp_opt =3D=3D 'internal' ? slir= p_opt : slirp} +summary_info +=3D {'slirp support': slirp} summary_info +=3D {'libtasn1': tasn1} summary_info +=3D {'PAM': pam} summary_info +=3D {'iconv support': iconv} diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 1931b77b49..6c05c46397 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -41,8 +41,7 @@ build-system-ubuntu: job: amd64-ubuntu2004-container variables: IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-docs --enable-fdt=3Dsystem --enable-slirp=3Ds= ystem - --enable-capstone + CONFIGURE_ARGS: --enable-docs --enable-fdt=3Dsystem --enable-capstone TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build @@ -120,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 + --enable-fdt=3Dsystem --enable-slirp --enable-capstone TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-soft= mmu MAKE_CHECK_ARGS: check-build @@ -339,10 +338,8 @@ clang-user: # On gitlab runners, default value sometimes end up calling 2 lds concurre= ntly and # triggers an Out-Of-Memory error # -# Since slirp callbacks are used in QEMU Timers, slirp needs to be compile= d together -# with QEMU and linked as a static library to avoid false positives in CFI= checks. -# This can be accomplished by using -enable-slirp=3Dgit, which avoids the = use of -# a system-wide version of the library +# Since slirp callbacks are used in QEMU Timers, we cannot use libslirp wi= th +# CFI builds, and thus have to disable it here. # # Split in three sets of build/check/avocado to limit the execution time o= f each # job @@ -355,7 +352,7 @@ build-cfi-aarch64: AR: llvm-ar IMAGE: fedora CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug - --enable-safe-stack --enable-slirp=3Dgit + --enable-safe-stack --disable-slirp TARGETS: aarch64-softmmu MAKE_CHECK_ARGS: check-build # FIXME: This job is often failing, likely due to out-of-memory proble= ms in @@ -395,7 +392,7 @@ build-cfi-ppc64-s390x: AR: llvm-ar IMAGE: fedora CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug - --enable-safe-stack --enable-slirp=3Dgit + --enable-safe-stack --disable-slirp TARGETS: ppc64-softmmu s390x-softmmu MAKE_CHECK_ARGS: check-build # FIXME: This job is often failing, likely due to out-of-memory proble= ms in @@ -435,7 +432,7 @@ build-cfi-x86_64: AR: llvm-ar IMAGE: fedora CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-cfi --enable-cfi= -debug - --enable-safe-stack --enable-slirp=3Dgit + --enable-safe-stack --disable-slirp TARGETS: x86_64-softmmu MAKE_CHECK_ARGS: check-build timeout: 70m @@ -469,7 +466,7 @@ tsan-build: variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --enable-tsan --cc=3Dclang-10 --cxx=3Dclang++-10 - --enable-trace-backends=3Dust --enable-fdt=3Dsystem --enable-sli= rp=3Dsystem + --enable-trace-backends=3Dust --enable-fdt=3Dsystem --disable-sl= irp TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user MAKE_CHECK_ARGS: bench V=3D1 =20 @@ -571,7 +568,6 @@ build-without-default-features: --disable-capstone --disable-pie --disable-qom-cast-debug - --disable-slirp --disable-strip TARGETS: avr-softmmu i386-softmmu mips64-softmmu s390x-softmmu sh4-sof= tmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user diff --git a/.gitmodules b/.gitmodules index aedd9a03d4..24cffa87d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,9 +46,6 @@ [submodule "roms/edk2"] path =3D roms/edk2 url =3D https://gitlab.com/qemu-project/edk2.git -[submodule "slirp"] - path =3D slirp - url =3D https://gitlab.com/qemu-project/libslirp.git [submodule "roms/opensbi"] path =3D roms/opensbi url =3D https://gitlab.com/qemu-project/opensbi.git diff --git a/MAINTAINERS b/MAINTAINERS index 5ce4227ff6..5e2c0d649e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2978,7 +2978,6 @@ F: include/hw/registerfields.h SLIRP M: Samuel Thibault S: Maintained -F: slirp/ F: net/slirp.c F: include/net/slirp.h T: git https://people.debian.org/~sthibault/qemu.git slirp diff --git a/meson_options.txt b/meson_options.txt index e58e158396..53fca1c554 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -199,6 +199,8 @@ option('l2tpv3', type : 'feature', value : 'auto', description: 'l2tpv3 network backend support') option('netmap', type : 'feature', value : 'auto', description: 'netmap network backend support') +option('slirp', type: 'feature', value: 'auto', + description: 'libslirp user mode network backend support') option('vde', type : 'feature', value : 'auto', description: 'vde network backend support') option('vmnet', type : 'feature', value : 'auto', @@ -264,9 +266,6 @@ option('vduse_blk_export', type: 'feature', value: 'aut= o', =20 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'], - description: 'Whether and how to find the slirp library') option('fdt', type: 'combo', value: 'auto', choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], description: 'Whether and how to find the libfdt library') diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index c6169db69f..23e042dacd 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -26,7 +26,7 @@ sub_file=3D"${sub_tdir}/submodule.tar" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -submodules=3D"dtc slirp meson ui/keycodemapdb" +submodules=3D"dtc meson ui/keycodemapdb" submodules=3D"$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-= testfloat-3" sub_deinit=3D"" =20 diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 359b04e0e6..c68ba32ce2 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -35,8 +35,6 @@ meson_options_help() { printf "%s\n" ' --enable-qom-cast-debug cast debugging support' printf "%s\n" ' --enable-rng-none dummy RNG, avoid using /dev/(u= )random and' printf "%s\n" ' getrandom()' - printf "%s\n" ' --enable-slirp[=3DCHOICE] Whether and how to find the = slirp library' - printf "%s\n" ' (choices: auto/disabled/enable= d/internal/system)' printf "%s\n" ' --enable-strip Strip targets on install' printf "%s\n" ' --enable-tcg-interpreter TCG with bytecode interpreter = (slow)' printf "%s\n" ' --enable-trace-backends=3DCHOICES' @@ -141,6 +139,7 @@ meson_options_help() { printf "%s\n" ' sdl-image SDL Image support for icons' printf "%s\n" ' seccomp seccomp support' printf "%s\n" ' selinux SELinux support in qemu-nbd' + printf "%s\n" ' slirp libslirp user mode network backend supp= ort' printf "%s\n" ' slirp-smbd use smbd (at path --smbd=3D*) in slirp = networking' printf "%s\n" ' smartcard CA smartcard emulation support' printf "%s\n" ' snappy snappy compression support' @@ -386,7 +385,6 @@ _meson_option_parse() { --disable-selinux) printf "%s" -Dselinux=3Ddisabled ;; --enable-slirp) printf "%s" -Dslirp=3Denabled ;; --disable-slirp) printf "%s" -Dslirp=3Ddisabled ;; - --enable-slirp=3D*) quote_sh "-Dslirp=3D$2" ;; --enable-slirp-smbd) printf "%s" -Dslirp_smbd=3Denabled ;; --disable-slirp-smbd) printf "%s" -Dslirp_smbd=3Ddisabled ;; --enable-smartcard) printf "%s" -Dsmartcard=3Denabled ;; diff --git a/slirp b/slirp deleted file mode 160000 index 9d59bb775d..0000000000 --- a/slirp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9d59bb775d6294c8b447a88512f7bb43f12a25a8 --=20 2.31.1