From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:504:5965:b0:1be9:327d:8ee3 with SMTP id xe5csp1705263njb; Mon, 29 Jul 2024 03:34:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV5OwG9ju+lwHbCR1cGfu+mvtUF5Q79UUDKIOBGlWPb2ED3ojZd8YLpth0lR0hzarWRNpWdHu/3J4+/6rAVFRSCSPQbO9x3 X-Google-Smtp-Source: AGHT+IEjKismUyrqLdDUHHncBCOPN1x7ke5Bxgj4UqKUCBeSy4AwGN+dG1P/1oIRDmvWvul/buEH X-Received: by 2002:a05:622a:19a0:b0:447:f73b:6e2f with SMTP id d75a77b69052e-45004f2a514mr107521051cf.39.1722249272791; Mon, 29 Jul 2024 03:34:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722249272; cv=none; d=google.com; s=arc-20160816; b=f28YBAXAyQs2ylxv36SIvnl13dhq2VCqNF5PMmxDQ+xwUiAZztrS7bwxmleTckezbF fVQQDNF50wdi2Fronm3RT3fktsq+iQsqB9OTqKxvhkXgYyb4MlmDkkSzETYOJBQbGjv6 3gvr7wD60Uk3V2FYakyApR7/NjPHhsKUdNZn7oyA2zjdrY7Jbvi/iGySFD8KXKK3R933 KEMP/nL6zlVXC0GeTXdzm2+fTX4bF/4ifN6ExQiWpQax+Peyu0TrPItEu2xl8CtCmVU8 CIlZoI18Yk3yzeg0nzz0KgZAt0mVNHeTe+qRpzX1DGEfNxgmrr7q2bw/LpsrTKkVh1Ah H7+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:mime-version:references :reply-to:message-id:subject:cc:to:from:date:dkim-signature; bh=jrsIQdxPsAZhxdWinFuSjToBMhcCX2rBPI5tFjYosOQ=; fh=wNhxSdiHg8xiqcUd0ic1q+ay8XePjEEHF9Rtf9iA5Kw=; b=TPZW3M0LIqnWXoXN2uk2qnbCm/xpWmIneUud/1BZcM5vDrGjPl0qvbPhPaIcVK2E1n BEyfNArfaCIgnUZc5FMBJircay3px4hSPM2wRHCD07m3L9VHV/+9FkQUzhvwO5erBExc cw2HJxzulwKxVh/ypt8DXAj1B7CI0RrP665vq16kL3zWHcnmVFKra1DPw4NK85o82Abp cqH8k13Lf2frNh6EZxX9lIC5LEzykElMqPxSLkPSal4U2qWboOgM7c1ZzVbXt0xwajMl M+AqqsQFj+7cIuIwtKyAvVa4gBBU9N5Lwpk0wGSTvyDCDw+WP3dThNl2AEubXpKRSPp1 v/1w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=h9szyC93; spf=pass (google.com: domain of berrange@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=berrange@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.129.124]) by mx.google.com with ESMTPS id d75a77b69052e-44fe8421ba1si95359831cf.563.2024.07.29.03.34.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 03:34:32 -0700 (PDT) Received-SPF: pass (google.com: domain of berrange@redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=h9szyC93; spf=pass (google.com: domain of berrange@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=berrange@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=1722249272; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=jrsIQdxPsAZhxdWinFuSjToBMhcCX2rBPI5tFjYosOQ=; b=h9szyC935bBybkh26yxW48gxglK0KktjP5QAIJKOuiVY7+msPvL8OV5LJ4bYYBiwZTkXZm 4CDMdSmuaKaLwLAiAEi9Su2RjJwJBFTlZiDu8oGvpd+qKMYV0uuY41LncLSd4qr4O7zJ69 lgZdWOHDaUavNbVKxvliZHEJHSwCuas= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-99-kSaR1ZIRMG6tWIK5qN8daA-1; Mon, 29 Jul 2024 06:34:26 -0400 X-MC-Unique: kSaR1ZIRMG6tWIK5qN8daA-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A9D4F1955D4D; Mon, 29 Jul 2024 10:34:23 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.58]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5160A300018D; Mon, 29 Jul 2024 10:34:17 +0000 (UTC) Date: Mon, 29 Jul 2024 11:34:13 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Cleber Rosa Cc: qemu-devel@nongnu.org, Peter Maydell , Thomas Huth , Beraldo Leal , Sriram Yagnaraman , David Woodhouse , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Leif Lindholm , Jiaxun Yang , kvm@vger.kernel.org, Alex =?utf-8?Q?Benn=C3=A9e?= , Marcin Juszkiewicz , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Radoslaw Biernacki , Paul Durrant , Paolo Bonzini , Akihiko Odaki Subject: Re: [PATCH 05/13] tests/avocado: machine aarch64: standardize location and RO access Message-ID: Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= References: <20240726134438.14720-1-crosa@redhat.com> <20240726134438.14720-6-crosa@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20240726134438.14720-6-crosa@redhat.com> User-Agent: Mutt/2.2.12 (2023-09-09) X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-TUID: 9AMPe8t7MhdS On Fri, Jul 26, 2024 at 09:44:30AM -0400, Cleber Rosa wrote: > The tests under machine_aarch64_virt.py and machine_aarch64_sbsaref.py > should not be writing to the ISO files. By adding "media=cdrom" the > "ro" is autmatically set. > > 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 | 6 +++++- > tests/avocado/machine_aarch64_virt.py | 14 +++++++------- > 2 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py > index e920bbf08c..1275f24532 100644 > --- a/tests/avocado/machine_aarch64_sbsaref.py > +++ b/tests/avocado/machine_aarch64_sbsaref.py > @@ -129,7 +129,11 @@ def boot_alpine_linux(self, cpu): > "-cpu", > cpu, > "-drive", > - f"file={iso_path},format=raw", > + f"file={iso_path},media=cdrom,format=raw", > + "-device", > + "virtio-rng-pci,rng=rng0", > + "-object", > + "rng-random,id=rng0,filename=/dev/urandom", > ) The commit message doesn't say anything about adding virtio-rng. If that's needed for some reason, do it as a separate commit with an explanation of the bug its fixing. > diff --git a/tests/avocado/machine_aarch64_virt.py b/tests/avocado/machine_aarch64_virt.py > index a90dc6ff4b..6831d2c0ed 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=machine:virt > :avocado: tags=accel:tcg > """ > - iso_url = ('https://dl-cdn.alpinelinux.org/' > - 'alpine/v3.17/releases/aarch64/' > - 'alpine-standard-3.17.2-aarch64.iso') > + iso_url = ( > + "https://dl-cdn.alpinelinux.org/" > + "alpine/v3.17/releases/aarch64/alpine-standard-3.17.2-aarch64.iso" > + ) > > - # Alpine use sha256 so I recalculated this myself > - iso_sha1 = '76284fcd7b41fe899b0c2375ceb8470803eea839' > - iso_path = self.fetch_asset(iso_url, asset_hash=iso_sha1) > + iso_hash = "5a36304ecf039292082d92b48152a9ec21009d3a62f459de623e19c4bd9dc027" > + iso_path = self.fetch_asset(iso_url, algorithm="sha256", asset_hash=iso_hash) > > self.vm.set_console() > kernel_command_line = (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={iso_path},format=raw") > + self.vm.add_args("-drive", f"file={iso_path},media=cdrom,format=raw") > self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0') > self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom') > > -- > 2.45.2 > > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|