From nobody Tue Feb 10 14:33:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1573570526; cv=none; d=zoho.com; s=zohoarc; b=QA5KqkRHoy+5UMXw3lbesk2jqdup98Be+TtOzswSHRyNRMplUVNz49IkkBKNcvO7tYgdNRpVL3DlV3ghvyC0MIYo3oYiNiUK4LKLQgbpz8s/P2EgJq7c3P28M7gXmfPTr4yFsAbodBlJi6R0/PB8GmtBDafnu/LP/3uMZ8fJWeA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573570526; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OuBID0cJqkigSPofx9+aC0NVHfNM9AtTCEr/b96Ovls=; b=KjoIyPiT8p0JnYNxFzRzGci48grev5jxYHFbPD8jEo14p7rARF10vjwM8OFcxHQ9CTYcEq8i3QSb6YmnXaiKWsLZWz+pHtv7o7icL0ARqp9ZaHD1JaqHRowDywNFWwv9XZJC/ROWN1M1/5dgAl6nz5JbI50MXiBPMb0effbnwCM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1573570526317336.7145457002721; Tue, 12 Nov 2019 06:55:26 -0800 (PST) Received: from localhost ([::1]:35940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUXZk-00006p-Q9 for importer@patchew.org; Tue, 12 Nov 2019 09:55:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59767) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUXVC-0003X9-LD for qemu-devel@nongnu.org; Tue, 12 Nov 2019 09:50:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUXVB-00036j-Af for qemu-devel@nongnu.org; Tue, 12 Nov 2019 09:50:42 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:39611) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUXVB-00035s-3v for qemu-devel@nongnu.org; Tue, 12 Nov 2019 09:50:41 -0500 Received: by mail-wr1-x436.google.com with SMTP id l7so7265691wrp.6 for ; Tue, 12 Nov 2019 06:50:41 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q15sm18905974wrr.82.2019.11.12.06.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2019 06:50:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8E4131FF93; Tue, 12 Nov 2019 14:50:29 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OuBID0cJqkigSPofx9+aC0NVHfNM9AtTCEr/b96Ovls=; b=eh4Liq78aWKNj3ut3flg/QtyGPjidZUrYm/7rObzK7AEItIjVFcq2nEAgXUGIm6nzE olyra1ItCQjBgNIq2Q32/ogAwZlUix/0t8HlMoEfvmgi8GkRpYjYXvONrrH1V4M78pX1 Z/jV5ij7ZShlM4Q3gpmwOLcrwX1oe+mbD6p+jfq7R2wegnRTAKKCe+702lic+JqcHT4n 1038Iv+LbXafXLFe4usUOaS9Kg9zBZ4h/63ccbpO5FC+ND804KJ+HazhZsqw+kRIZScZ OwmdFuaww9VJfr/l8/TkH09Du9fGu4dIXsZwNNmzt55vvw1UHnqr2mcNBM6JO4iUkMzF okxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OuBID0cJqkigSPofx9+aC0NVHfNM9AtTCEr/b96Ovls=; b=LUkiKEvhr8XVDrsAlM2Bq9tNTwWrWJ9Ab9HwLVTHSAFuphKau+/4qekOMRnlaj8BTy 2MTYftPXYR3jwdKTXSuk2Ki20KsCGUm8qiIdCy2FoewbBIa/7wqdmo84Jc2zys8epcbS AfLB99OXq3RdRHv7+ZoWhUIUChmGHnCMcXI0nSl9IzshbkflMpdIbtMWwWb2ibIj1OP2 cGLMi+dMcINCwX4I8bT/6OGYoaG/ZG1p2BhdmVTq1MjysFJ25opp0oO+220cjLsgndGo nrUWaPHeeKjYxZIb7NmdzUkcz6SfKhM31Uvz4JKm3eaJmDwgJ8ZC1B3FQFLJcahbCSHe 2XOg== X-Gm-Message-State: APjAAAXTytTTc9pUZ1zMyIuOz2+4skHX2uvtW0DBBMuRAHCdNvqYz/fL 6WRVL47voEa/Xmf9bGzIXEyy/Q== X-Google-Smtp-Source: APXvYqzBdxMKEK4v7nZeNMQgzL7UBpGRb8+TPOcfwwiagNsffbMGBeT2aqtw00npxSjcxfFF9pLVdw== X-Received: by 2002:adf:dc06:: with SMTP id t6mr26944129wri.378.1573570238599; Tue, 12 Nov 2019 06:50:38 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 6/8] tests/vm: support sites with sha512 checksums Date: Tue, 12 Nov 2019 14:50:26 +0000 Message-Id: <20191112145028.26386-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191112145028.26386-1-alex.bennee@linaro.org> References: <20191112145028.26386-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The NetBSD project uses SHA512 for its checksums so lets support that in the download helper. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 086bfb2c66d..91a9226026d 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -95,19 +95,25 @@ class BaseVM(object): logging.info("KVM not available, not using -enable-kvm") self._data_args =3D [] =20 - def _download_with_cache(self, url, sha256sum=3DNone): + def _download_with_cache(self, url, sha256sum=3DNone, sha512sum=3DNone= ): def check_sha256sum(fname): if not sha256sum: return True checksum =3D subprocess.check_output(["sha256sum", fname]).spl= it()[0] return sha256sum =3D=3D checksum.decode("utf-8") =20 + def check_sha512sum(fname): + if not sha512sum: + return True + checksum =3D subprocess.check_output(["sha512sum", fname]).spl= it()[0] + return sha512sum =3D=3D checksum.decode("utf-8") + cache_dir =3D os.path.expanduser("~/.cache/qemu-vm/download") if not os.path.exists(cache_dir): os.makedirs(cache_dir) fname =3D os.path.join(cache_dir, hashlib.sha1(url.encode("utf-8")).hexdigest()) - if os.path.exists(fname) and check_sha256sum(fname): + if os.path.exists(fname) and check_sha256sum(fname) and check_sha5= 12sum(fname): return fname logging.debug("Downloading %s to %s...", url, fname) subprocess.check_call(["wget", "-c", url, "-O", fname + ".download= "], diff --git a/tests/vm/netbsd b/tests/vm/netbsd index c48c60853e7..611e6cc5b5c 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -23,6 +23,7 @@ class NetBSDVM(basevm.BaseVM): arch =3D "x86_64" =20 link =3D "https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.1/images/NetBSD-8= .1-amd64.iso" + csum =3D "718f275b7e0879599bdac95630c5e3f2184700032fdb6cdebf3bdd636878= 98c48ff3f08f57b89f4437a86cdd8ea07c01a39d432dbb37e1e4b008f4985f98da3f" size =3D "20G" pkgs =3D [ # tools @@ -70,7 +71,7 @@ class NetBSDVM(basevm.BaseVM): ipv6 =3D False =20 def build_image(self, img): - cimg =3D self._download_with_cache(self.link) + cimg =3D self._download_with_cache(self.link, sha512sum=3Dself.csu= m) img_tmp =3D img + ".tmp" iso =3D img + ".install.iso" =20 --=20 2.20.1