From nobody Mon May 6 02:29:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1609887544; cv=none; d=zohomail.com; s=zohoarc; b=J5xwna4GFqhUNyxJSUjAFsTZNtdYbRghvrlXXS56qhCYGKt54KjWC/7SGXnGicknWGWbDYHLLFnQcyUUy1FAbYW/rXb1rM7WGOSCr1gmiJ0eANGGKeVmZhaeKOlS5FS/yFLTdbDtAxhg6xx+zgG/e280RywejYTl6SiYUxDqD5E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609887544; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ZrJWK9vgEt9USjGv+Ruj+RwXDJRQSlWuvNI1fWmwz/U=; b=TbyZfgxPPFN8DQu9V/Q1Nuzd3JVaFzVOFkXZi2Br6Lq27pVIWOSfi5s9yCKoJqUe2AqI2ANQ7RdSwTKChbyPMj3+hcZGt9lskxMgU33oIQs7RF5bvQgI25yX9i3jECQJYuMl0u/LaKTgASzKD7Cjcq0ikIv1RcXCQ6HgmuKjMBg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1609887544902957.9197603589075; Tue, 5 Jan 2021 14:59:04 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.62215.110042 (Exim 4.92) (envelope-from ) id 1kwvHt-000316-So; Tue, 05 Jan 2021 22:58:49 +0000 Received: by outflank-mailman (output) from mailman id 62215.110042; Tue, 05 Jan 2021 22:58:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwvHt-00030y-PS; Tue, 05 Jan 2021 22:58:49 +0000 Received: by outflank-mailman (input) for mailman id 62215; Tue, 05 Jan 2021 22:58:48 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwvHs-00030R-HK for xen-devel@lists.xenproject.org; Tue, 05 Jan 2021 22:58:48 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 44fe46ea-2084-4b22-b8cb-912c24e72333; Tue, 05 Jan 2021 22:58:47 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id D426E22E00; Tue, 5 Jan 2021 22:58:46 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 44fe46ea-2084-4b22-b8cb-912c24e72333 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609887527; bh=Bo3bpKNOhSBLPNUCPy6Vwzq5MAk46fQZxQTlaelSBr8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kSoEGvDnU5JkEAXA122w5lnMpw4EtlZzZLmRRd9WP17zZN7lulghgZz+/CoNTdA7D LMrLncIVOegwQBLq9uymPBcfuSbX0RdyTznx+o6XGtEuDz0tHM8wjPqBeoyFDAX02c zAul4G5s37krKKJKD638zgRiG50XrU7Z8x6Zwkl3S5ssbZDbyBpqcpPnY1ovn3T8bR T8XhmXDSFg0xSxTxFq5oDKD9e3VFZW0/JqCMZ7o67FwJtWu+Kt/h+1bznKDBJrWnbn Y9/ieXMj794XDxDERglJOp6VDkCdGFiOyvXX3nYgafXo2aNHsI4KtdOgi7NBeVOfH7 RTkluNg1acyNA== From: Stefano Stabellini To: andrew.cooper3@citrix.com, cardoe@cardoe.com, wl@xen.org Cc: sstabellini@kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini Subject: [PATCH 1/3] automation: add qemu-system-aarch64 to test-artifacts Date: Tue, 5 Jan 2021 14:58:43 -0800 Message-Id: <20210105225845.30346-1-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ZohoMail-DKIM: pass (identity @kernel.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently we are using Debian's qemu-system-aarch64 for our tests. However, sometimes it crashes. It is hard to debug and even harder to apply any fixes to it. Instead, build our own QEMU as one of our test-artifacts, which are only built once, then imported into each pipeline via phony jobs. Signed-off-by: Stefano Stabellini Acked-by: Wei Liu --- .../5.2.0-arm64v8.dockerfile | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 automation/tests-artifacts/qemu-system-aarch64/5.2.0-ar= m64v8.dockerfile diff --git a/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.d= ockerfile b/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.do= ckerfile new file mode 100644 index 0000000000..e105a1c636 --- /dev/null +++ b/automation/tests-artifacts/qemu-system-aarch64/5.2.0-arm64v8.dockerfi= le @@ -0,0 +1,75 @@ +FROM arm64v8/debian:unstable +LABEL maintainer.name=3D"The Xen Project" \ + maintainer.email=3D"xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=3Dnoninteractive +ENV QEMU_VERSION=3D5.2.0 +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + curl \ + python3 \ + ninja-build \ + pkg-config \ + libglib2.0-dev \ + libpixman-1-dev \ + && \ + \ + curl -fsSLO https://download.qemu.org/qemu-"$QEMU_VERSION".tar.xz && \ + tar xvJf qemu-"$QEMU_VERSION".tar.xz && \ + cd qemu-"$QEMU_VERSION" && \ + ./configure \ + --target-list=3Daarch64-softmmu \ + --enable-system \ + --disable-blobs \ + --disable-bsd-user \ + --disable-debug-info \ + --disable-glusterfs \ + --disable-gtk \ + --disable-guest-agent \ + --disable-linux-user \ + --disable-sdl \ + --disable-spice \ + --disable-tpm \ + --disable-vhost-net \ + --disable-vhost-scsi \ + --disable-vhost-user \ + --disable-vhost-vsock \ + --disable-virtfs \ + --disable-vnc \ + --disable-werror \ + --disable-xen \ + --disable-safe-stack \ + --disable-libssh \ + --disable-opengl \ + --disable-tools \ + --disable-virglrenderer \ + --disable-stack-protector \ + --disable-containers \ + --disable-replication \ + --disable-cloop \ + --disable-dmg \ + --disable-vvfat \ + --disable-vdi \ + --disable-parallels \ + --disable-qed \ + --disable-bochs \ + --disable-qom-cast-debug \ + --disable-vhost-vdpa \ + --disable-vhost-kernel \ + --disable-qcow1 \ + --disable-live-block-migration \ + && \ + make -j$(nproc) && \ + cp ./build/qemu-system-aarch64 / && \ + cd /build && \ + rm -rf qemu-"$QEMU_VERSION"* && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* --=20 2.17.1 From nobody Mon May 6 02:29:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1609887548; cv=none; d=zohomail.com; s=zohoarc; b=JdV+exklGfwv3uAQRTO67T9jbYzx5W2fQK48v/ZJDsrejWXofDv0b27EKmu8FMx3FoBTrJ7V3ydGYqfAEocwbJrxvRPjKBbKv7lxxjVF0PvqBwTWTxh8CyLZNANO4rkL87GnK3AhePrynH53kv4OwWFemxxoCSZUBs1i2CMI0yk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609887548; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=EzUD/DKYL9wiKLisz+/Bk7T2YEiDIjyRYXeFMPVsUXA=; b=mUUnb5pjiTjM6nh/eTUTzvn//P5rv0h/DNUFyra5WBDdF+ueZvzrEH/fnQzYh6Rxlsv6J1xTBnv538ovcV6JN9DNteUbQKXKH92ii3lUKD+Xzh5sG+0Dkw4C5RF1ZZ8GnIyE5/vub0uL5ME/or+QLIor/vRgdXHQkJRut5rE40k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1609887548465754.5163765014761; Tue, 5 Jan 2021 14:59:08 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.62218.110066 (Exim 4.92) (envelope-from ) id 1kwvHy-00036i-Nr; Tue, 05 Jan 2021 22:58:54 +0000 Received: by outflank-mailman (output) from mailman id 62218.110066; Tue, 05 Jan 2021 22:58:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwvHy-00036X-KZ; Tue, 05 Jan 2021 22:58:54 +0000 Received: by outflank-mailman (input) for mailman id 62218; Tue, 05 Jan 2021 22:58:53 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwvHx-00030R-CD for xen-devel@lists.xenproject.org; Tue, 05 Jan 2021 22:58:53 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 314513df-bb53-472b-acfb-883f77fa6ebe; Tue, 05 Jan 2021 22:58:48 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 38345230FA; Tue, 5 Jan 2021 22:58:47 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 314513df-bb53-472b-acfb-883f77fa6ebe DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609887527; bh=4/ZOhJJoO9bRXaJSQwwhoEyBdlkDxu6In1n3JrReNrI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QjA3FucPSSMdpsEKnOtC/5N2O4Rc1RqXXPvaSfm3zApKm1ZwynP85am24J6LbLZ7a ZvaLwdJ5ydutqiy2lBfBFmgND5hefxmUUUtqx6iUaLqcXDjZeIGNEaBecBGsJwQd9h lDPir6fAznywebagV2gK1tfyysR+TRg65xL07FOnB/3yu/01Z5TT+mYwZI8SD0P3cp fQVJ4Le+si7kpn9CwAjHPkDG2EBvxBpMOSOMt5FBig5b1BUOc+JRNLRtAL4Mg7EwfL bYm9FLt6xE3sgbgS3RA+yHPuyHvOY5lxT8HEsdRtkTvlNb/NDSxg4SADzKtnymlJ8i qrzvsoX0FMdkw== From: Stefano Stabellini To: andrew.cooper3@citrix.com, cardoe@cardoe.com, wl@xen.org Cc: sstabellini@kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini Subject: [PATCH 2/3] automation: add a job to import qemu-system-aarch64 into the pipeline Date: Tue, 5 Jan 2021 14:58:44 -0800 Message-Id: <20210105225845.30346-2-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ZohoMail-DKIM: pass (identity @kernel.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In order to use the pre-built test-artifacts/qemu-system-aarch64 binary for our tests, first we need to import it into the pipeline. Let's do that the same way we did it for the kernel and Alpine Linux filesystem: by creating a special job for it. Signed-off-by: Stefano Stabellini Acked-by: Wei Liu --- automation/gitlab-ci/build.yaml | 11 +++++++++++ automation/gitlab-ci/test.yaml | 2 ++ 2 files changed, 13 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.y= aml index e5246828f8..db68dd0b69 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -494,3 +494,14 @@ kernel-5.9.9-arm64-export: tags: - arm64 =20 +qemu-system-aarch64-5.2.0-arm64-export: + stage: build + image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-a= arch64:5.2.0-arm64v8 + script: + - mkdir binaries && cp /qemu-system-aarch64 binaries/qemu-system-aarch= 64 + artifacts: + paths: + - binaries/qemu-system-aarch64 + tags: + - arm64 + diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 9448651187..91a10febbf 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -33,6 +33,7 @@ qemu-alpine-arm64-gcc: - alpine-3.12-gcc-arm64 - alpine-3.12-arm64-rootfs-export - kernel-5.9.9-arm64-export + - qemu-system-aarch64-5.2.0-arm64-export artifacts: paths: - smoke.serial @@ -56,6 +57,7 @@ qemu-smoke-arm64-gcc: dependencies: - debian-unstable-gcc-arm64 - kernel-5.9.9-arm64-export + - qemu-system-aarch64-5.2.0-arm64-export artifacts: paths: - smoke.serial --=20 2.17.1 From nobody Mon May 6 02:29:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1609887548; cv=none; d=zohomail.com; s=zohoarc; b=NASryuSVDjXR8K3YE8/adLX+9A+z1LTKEQgdLmh2niYc++jjY1KeSAsr4lhJHR4c71vO4gf60q5u2kKpnQNA3msR0TOqFgIUZbZLge58MKUANepCPpxEAolLMNLmTyuypZR5w5UmJfiWKANgzuqSrsXmpYJcvPXNLDLgFWoEIU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609887548; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=qN9i7nUjLJZBCJV5xT4fDEJ+rCravO64w/RIbVTTJcg=; b=JzNfk56306VYLcURtpt9MnL1fpRRHfQ22ey4MlKpARJ9wMtDAHlsZqYoK7eGD7mFb6FUu3TTthFKFtNOqCUHR8j8TRP8m4Qy3b4+3hq0gnTxgJL4lDgZN/LoNQJBpKUVPg0aVQFOxmgNaZwfqXHK0yDrEnMdDifPqCS2LIlJrrs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1609887548312974.6101053191942; Tue, 5 Jan 2021 14:59:08 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.62217.110054 (Exim 4.92) (envelope-from ) id 1kwvHw-00033E-8E; Tue, 05 Jan 2021 22:58:52 +0000 Received: by outflank-mailman (output) from mailman id 62217.110054; Tue, 05 Jan 2021 22:58:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwvHw-000337-37; Tue, 05 Jan 2021 22:58:52 +0000 Received: by outflank-mailman (input) for mailman id 62217; Tue, 05 Jan 2021 22:58:50 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwvHt-00030e-Vn for xen-devel@lists.xenproject.org; Tue, 05 Jan 2021 22:58:50 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1220e9e9-57a2-4a0e-9602-e26d1599fed5; Tue, 05 Jan 2021 22:58:48 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 8E0D622EBF; Tue, 5 Jan 2021 22:58:47 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1220e9e9-57a2-4a0e-9602-e26d1599fed5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609887527; bh=4ImKsx+erO3Ecjdqg5yQK8y8Fltn64yVoowIoXjxlPQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H1xrNHpWriJWwoY2VSZZ7HUJ9Su8/fn6Z2aImA/7F1tnPfVSKN9M2iKIel/AtVoiK Gzbnf0MNXGqkB+5CM1Fipf4EADdZGT2FA46MtY9+86V/ASRfuSCmX2v8C9MW/P22Sp Xb2rAq9wY4Ygd3jvV+KLFcyWc7Ort6bpF1PVtGpgP5nUmOozbNnGYTxNZGjEEiWhHN y+U6a3D/PSznDjHx0sJcosUQ/iDOv11V3LFk+xS3GOxks3szSR5a3bxDBNCOtA72hB 7d7+vDcw4t6Z4QL+VUptkQ3uo1D4MALK6YrDpesSvr41JmhnLvVnm+dn+Rb2EE8Ec7 D1PLrDnYvgvCw== From: Stefano Stabellini To: andrew.cooper3@citrix.com, cardoe@cardoe.com, wl@xen.org Cc: sstabellini@kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini Subject: [PATCH 3/3] automation: use test-artifacts/qemu-system-aarch64 instead of Debian's Date: Tue, 5 Jan 2021 14:58:45 -0800 Message-Id: <20210105225845.30346-3-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ZohoMail-DKIM: pass (identity @kernel.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead apt-get'ing Debian's qemu-system-aarch64, simply use the provided QEMU binary under binaries. Signed-off-by: Stefano Stabellini Acked-by: Wei Liu --- automation/scripts/qemu-alpine-arm64.sh | 12 +++++------- automation/scripts/qemu-smoke-arm64.sh | 15 +++++++-------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/automation/scripts/qemu-alpine-arm64.sh b/automation/scripts/q= emu-alpine-arm64.sh index b43a654270..e2240f9ab4 100755 --- a/automation/scripts/qemu-alpine-arm64.sh +++ b/automation/scripts/qemu-alpine-arm64.sh @@ -3,8 +3,7 @@ set -ex =20 apt-get -qy update -apt-get -qy install --no-install-recommends qemu-system-aarch64 \ - u-boot-qemu \ +apt-get -qy install --no-install-recommends u-boot-qemu \ u-boot-tools \ device-tree-compiler \ cpio \ @@ -69,10 +68,9 @@ echo "rc_verbose=3Dyes" >> etc/rc.conf find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz cd ../.. =20 -# XXX Silly workaround to get the following QEMU command to work -# QEMU looks for "efi-virtio.rom" even if it is unneeded -cp /usr/share/qemu/pvh.bin /usr/share/qemu/efi-virtio.rom -qemu-system-aarch64 \ +# XXX QEMU looks for "efi-virtio.rom" even if it is unneeded +curl -fsSLO curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/ef= i-virtio.rom +./binaries/qemu-system-aarch64 \ -machine virtualization=3Dtrue \ -cpu cortex-a57 -machine type=3Dvirt \ -m 1024 -display none \ @@ -107,7 +105,7 @@ rm -f smoke.serial set +e echo " virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000"| \ timeout -k 1 720 \ -qemu-system-aarch64 \ +./binaries/qemu-system-aarch64 \ -machine virtualization=3Dtrue \ -cpu cortex-a57 -machine type=3Dvirt \ -m 2048 -monitor none -serial stdio \ diff --git a/automation/scripts/qemu-smoke-arm64.sh b/automation/scripts/qe= mu-smoke-arm64.sh index bdef0717ad..53086a5ac7 100755 --- a/automation/scripts/qemu-smoke-arm64.sh +++ b/automation/scripts/qemu-smoke-arm64.sh @@ -5,17 +5,16 @@ set -ex # Install QEMU export DEBIAN_FRONTENT=3Dnoninteractive apt-get -qy update -apt-get -qy install --no-install-recommends qemu-system-aarch64 \ - u-boot-qemu \ +apt-get -qy install --no-install-recommends u-boot-qemu \ u-boot-tools \ device-tree-compiler \ busybox-static \ - cpio + cpio \ + curl =20 -# XXX Silly workaround to get the following QEMU command to work -# QEMU looks for "efi-virtio.rom" even if it is unneeded -cp /usr/share/qemu/pvh.bin /usr/share/qemu/efi-virtio.rom -qemu-system-aarch64 \ +# XXX QEMU looks for "efi-virtio.rom" even if it is unneeded +curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom +./binaries/qemu-system-aarch64 \ -machine virtualization=3Dtrue \ -cpu cortex-a57 -machine type=3Dvirt \ -m 1024 -display none \ @@ -79,7 +78,7 @@ rm -f smoke.serial set +e echo " virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000"| \ timeout -k 1 240 \ -qemu-system-aarch64 \ +./binaries/qemu-system-aarch64 \ -machine virtualization=3Dtrue \ -cpu cortex-a57 -machine type=3Dvirt \ -m 1024 -monitor none -serial stdio \ --=20 2.17.1