Received: by 2002:a17:906:535b:b0:a20:43fc:1f40 with SMTP id j27csp1910887ejo; Wed, 13 Dec 2023 13:14:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IHSRwiYCXKEEntD/KpSv8/12fyngd4T14WuAxLNL8VWvbR40XIbfYt40uqz0Gr+zgJqTEtm X-Received: by 2002:a05:6808:4445:b0:3ba:13ca:2584 with SMTP id ep5-20020a056808444500b003ba13ca2584mr5450144oib.108.1702502064159; Wed, 13 Dec 2023 13:14:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702502064; cv=none; d=google.com; s=arc-20160816; b=xUFkoLsVvl9x71J9fQ+oNpj3G+aWYYd5rGQOCg1djy+t3vI4LKdWz85ygdjng3p/H0 xW5t18FPoKCImYt8z+Ks4uCZNNiKs+J19xdkQ6RrwPIXPMc8VauBNwmvdN3s2wkVAxQb g7K57vYAbsonRIFaoUdjH8nsI9pv4czeKHQLgiB8wr6AOpWn+5fE4uBQljjqELYstpZR ypLozrAneMdFuVKj9Nvtdo452VIjy68hf6KN5xtcKAVviNi+Frc+1+jsU+++LORKVXdk OgD/3zmmFeoQ1kJrIkfiaMHaofWIBjAuQXhHxP1H9E1G6F7hTB+S7m8lOlceFYGhua9W aNFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:dkim-signature; bh=Dv+BwqU9G5p6t/Y+G3miUUTURJX1TKXf0664e8KgZsU=; fh=OVgzje/u0MSqOYVWCdg8e+3MkI2YfO1S4EIN7c+ONew=; b=BHoMK9FZaNfX7vp2vCcF5EDEsjNYZeLvwr1HiuWvDCXF15Pk96SpZF3NEuDhsHZU9v xfWtJ/PS6DIlqsxjO9Rd154OEn1fzqE9m5fk87JUiJQ0Xr6eAz/AUrtntWlXuWySCKNo VKssqbZtFpMi3BAprgBZhnN4epqQM1nZKFnX3d7tPmNF3H0FaUb5EE3rOT0hFmyJQZqQ 4hkJZE7VjNNNYGXtycfvsU9MdILATocLz9W7QzQSG1+2KCjh3m0WWTvZUf9tuY+N0whF LmmpMLvLddDTrmOU+pqmZxQo9gwfELPQmOM2bf75hL8W5QyT8JSqdHysLA7GW1BW1YDD CxRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YAoxA+ri; spf=pass (google.com: domain of crosa@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=crosa@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [170.10.133.124]) by mx.google.com with ESMTPS id fb24-20020a05622a481800b00423e4365c05si3674320qtb.409.2023.12.13.13.14.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 13:14:24 -0800 (PST) Received-SPF: pass (google.com: domain of crosa@redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YAoxA+ri; spf=pass (google.com: domain of crosa@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=crosa@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702502063; 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=Dv+BwqU9G5p6t/Y+G3miUUTURJX1TKXf0664e8KgZsU=; b=YAoxA+riFvfqL0mSKw9paDnILvypv/oG0RgJ65H39MjswVTMozJiBx8wwoh9N8q2Y+gjHf gwoWVw6mV7KBGxeeHQrfc4mDN/Ed+V+RghbSVAt+DhhjDBBdC7rnP4zGsZl04ITja+oyaO +hsDdGVUmzDTU4gvq8hHzMOmOFb9AZk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-122-czLEbr1nMc2OSSgy0b-KvA-1; Wed, 13 Dec 2023 16:14:22 -0500 X-MC-Unique: czLEbr1nMc2OSSgy0b-KvA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6BE12185A781; Wed, 13 Dec 2023 21:14:21 +0000 (UTC) Received: from p1.localdomain.some.host.somewhere.org (ovpn-114-21.gru2.redhat.com [10.97.114.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A08D22166B31; Wed, 13 Dec 2023 21:14:13 +0000 (UTC) From: Cleber Rosa To: Alex =?utf-8?Q?Benn=C3=A9e?= Cc: qemu-devel@nongnu.org, Jiaxun Yang , Radoslaw Biernacki , Paul Durrant , Akihiko Odaki , Leif Lindholm , Peter Maydell , Paolo Bonzini , kvm@vger.kernel.org, qemu-arm@nongnu.org, Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Beraldo Leal , Wainer dos Santos Moschetta , Sriram Yagnaraman , Marcin Juszkiewicz , David Woodhouse Subject: Re: [PATCH 04/10] tests/avocado: machine aarch64: standardize location and RO/RW access In-Reply-To: <87wmtkeils.fsf@draig.linaro.org> References: <20231208190911.102879-1-crosa@redhat.com> <20231208190911.102879-5-crosa@redhat.com> <87wmtkeils.fsf@draig.linaro.org> Date: Wed, 13 Dec 2023 16:14:03 -0500 Message-ID: <87h6klvm90.fsf@p1.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-TUID: o3o7wB6Wbgw1 Alex Benn=C3=A9e writes: > Cleber Rosa writes: > >> The tests under machine_aarch64_virt.py do not need read-write access >> to the ISOs. The ones under machine_aarch64_sbsaref.py, on the other >> hand, will need read-write access, so let's give each test an unique >> file. > > I think we are making two separate changes here so probably best split > the patch. > Sure, but, do you mean separating the "readonly=3Don" and the "writable file" changes? Or separating those two from the ISO url code style change? >> And while at it, let's use a single code style and hash for the ISO >> url. >> >> Signed-off-by: Cleber Rosa >> --- >> tests/avocado/machine_aarch64_sbsaref.py | 9 +++++++-- >> tests/avocado/machine_aarch64_virt.py | 14 +++++++------- >> 2 files changed, 14 insertions(+), 9 deletions(-) >> >> diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/ma= chine_aarch64_sbsaref.py >> index 528c7d2934..6ae84d77ac 100644 >> --- a/tests/avocado/machine_aarch64_sbsaref.py >> +++ b/tests/avocado/machine_aarch64_sbsaref.py >> @@ -7,6 +7,7 @@ >> # SPDX-License-Identifier: GPL-2.0-or-later >>=20=20 >> import os >> +import shutil >>=20=20 >> from avocado import skipUnless >> from avocado.utils import archive >> @@ -123,13 +124,15 @@ def boot_alpine_linux(self, cpu): >>=20=20 >> iso_hash =3D "5a36304ecf039292082d92b48152a9ec21009d3a62f459de6= 23e19c4bd9dc027" >> iso_path =3D self.fetch_asset(iso_url, algorithm=3D"sha256", as= set_hash=3Diso_hash) >> + iso_path_rw =3D os.path.join(self.workdir, os.path.basename(iso= _path)) >> + shutil.copy(iso_path, iso_path_rw) >>=20=20 >> self.vm.set_console() >> self.vm.add_args( >> "-cpu", >> cpu, >> "-drive", >> - f"file=3D{iso_path},format=3Draw", >> + f"file=3D{iso_path_rw},format=3Draw", > > Instead of copying why not add ",snapshot=3Don" to preserve the original > image. We don't want to persist data between tests. > >> "-device", >> "virtio-rng-pci,rng=3Drng0", >> "-object", >> @@ -170,13 +173,15 @@ def boot_openbsd73(self, cpu): >>=20=20 >> img_hash =3D "7fc2c75401d6f01fbfa25f4953f72ad7d7c18650056d30755= c44b9c129b707e5" >> img_path =3D self.fetch_asset(img_url, algorithm=3D"sha256", as= set_hash=3Dimg_hash) >> + img_path_rw =3D os.path.join(self.workdir, os.path.basename(img= _path)) >> + shutil.copy(img_path, img_path_rw) >>=20=20 >> self.vm.set_console() >> self.vm.add_args( >> "-cpu", >> cpu, >> "-drive", >> - f"file=3D{img_path},format=3Draw", >> + f"file=3D{img_path_rw},format=3Draw", > > ditto. > > >> "-device", >> "virtio-rng-pci,rng=3Drng0", >> "-object", >> diff --git a/tests/avocado/machine_aarch64_virt.py b/tests/avocado/machi= ne_aarch64_virt.py >> index a90dc6ff4b..093d68f837 100644 >> --- a/tests/avocado/machine_aarch64_virt.py >> +++ b/tests/avocado/machine_aarch64_virt.py >> @@ -37,13 +37,13 @@ def test_alpine_virt_tcg_gic_max(self): >> :avocado: tags=3Dmachine:virt >> :avocado: tags=3Daccel:tcg >> """ >> - iso_url =3D ('https://dl-cdn.alpinelinux.org/' >> - 'alpine/v3.17/releases/aarch64/' >> - 'alpine-standard-3.17.2-aarch64.iso') >> + iso_url =3D ( >> + "https://dl-cdn.alpinelinux.org/" >> + "alpine/v3.17/releases/aarch64/alpine-standard-3.17.2-aarch= 64.iso" >> + ) >>=20=20 >> - # Alpine use sha256 so I recalculated this myself >> - iso_sha1 =3D '76284fcd7b41fe899b0c2375ceb8470803eea839' >> - iso_path =3D self.fetch_asset(iso_url, asset_hash=3Diso_sha1) >> + iso_hash =3D "5a36304ecf039292082d92b48152a9ec21009d3a62f459de6= 23e19c4bd9dc027" >> + iso_path =3D self.fetch_asset(iso_url, algorithm=3D"sha256", as= set_hash=3Diso_hash) >>=20=20 >> self.vm.set_console() >> kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + >> @@ -60,7 +60,7 @@ def test_alpine_virt_tcg_gic_max(self): >> self.vm.add_args("-smp", "2", "-m", "1024") >> self.vm.add_args('-bios', os.path.join(BUILD_DIR, 'pc-bios', >> 'edk2-aarch64-code.fd')) >> - self.vm.add_args("-drive", f"file=3D{iso_path},format=3Draw") >> + self.vm.add_args("-drive", >> f"file=3D{iso_path},readonly=3Don,format=3Draw") > > Perhaps we can set ",media=3Dcdrom" here. > Yes, but more importantly, adding both "readonly=3Don" and "media=3Dcdrom" to the tests under machine_aarch64_sbsaref.py do the trick. Now, the behavior explained in my previous response still warrants investigation IMO. Thanks - Cleber.