From patchwork Wed Mar 25 15:15:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184808 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp731344ile; Wed, 25 Mar 2020 08:17:37 -0700 (PDT) X-Google-Smtp-Source: ADFU+vs8Q43pDV/OgopLE5j40veKpiUwh5XLZlYtgoJ7lPox1GjbiCp3wg4004wzSskKayCWS2FV X-Received: by 2002:ac8:6d0b:: with SMTP id o11mr3366839qtt.324.1585149457589; Wed, 25 Mar 2020 08:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585149457; cv=none; d=google.com; s=arc-20160816; b=N/cUK/5NiOvR27y2xgmKEOEInY8FFRxaf+fCbD98FJ80BlCGD3ToFUSE1j0XWiMFTS 2OLBebwdsCsphdQTR1O6Outnne0iVWfPVl2iavgo5eslKDfKyFRrgAzGCEeiwL2P1lXk IM/z82h9ofvBWySSCqUjYzRU5VUlLR0T7rrAM6wwQmLW4K86TbVpEdqYA33vrAJHDkQl Uw4oNUFLI+XDN57olY8vmyidfB6nxhzU0Rzo8Mn7M818iAoupLouc+Vrrpd5osmlRLVA PaIhs7sOt/nK5MkEw/CJN5PKDcY9hnAtLmKBqS/AkSLr2nakMw9cLrCT5BcaDkoTj+Dg uu4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=gyO7FMb6Kog7HFYI2emP9ylf6WG5qE9183WrVkkssuU=; b=Wc0XOjqHTmZJ7Wwpo4lxbSIsajPS9d7VH1tOFFjaqzk6HxxOWAg5amzuqTp5vkLaA0 ran9EQud6Oj8rwqRs5Yl7ebLrOu7cz4hZI7ILEl2yXZb8juhdBx0LRZwm4/PxbGImU3R ZEtmJBBrnxdA4yJu0BO1WVKYyXwC9EiFIoJiAFxIqvDaetm/+A8OXjF6zGgntyY4VZqz Q3t1WJe1bBf2vJpcApVRCcLWuMhUieeYPdxrWtm3Tikmmlz1Z6NyukT+JYLpRvuPgsEO /xmU+QjpaIvUA7zPm0EfzhZj44vKofMt5YYyVNn2Fe2jIFcCfMae2/7hswyh20L6kyO1 Ua4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="DY/7yBu2"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n3si4862935qtd.403.2020.03.25.08.17.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 08:17:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="DY/7yBu2"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7mi-0006kK-So for patch@linaro.org; Wed, 25 Mar 2020 11:17:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41421) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7kz-0003Sy-Pv for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7ky-0007xD-R1 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:49 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:46365) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7ky-0007wQ-Kh for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:48 -0400 Received: by mail-wr1-x430.google.com with SMTP id j17so3521798wru.13 for ; Wed, 25 Mar 2020 08:15:48 -0700 (PDT) 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=gyO7FMb6Kog7HFYI2emP9ylf6WG5qE9183WrVkkssuU=; b=DY/7yBu2uCN1ul0cNqvpch+bDgQ2niscBAmEUfPjrotOI5WO2qoHoBatgOhQ3c4fFO ybIQKqQY4x3f0qFbMokyOLF5mWZPAnnHQ7+qSAzsp+wpYEYYckMQx8IJuCdQ/HaT6gmP McuB5WhqV6upz0+T1QhujcWyx53M9XVkHI/GV5o/DAqkx0Wh5E4T+7iGJy6yCf9J64+B grTlmY6kH5WXqW23EMNRRPOEYHmKtmp+eZsXRhTsNRnsbOG6tGk0B725uBFCZvxq1JEy VfVj5i/Sdvynaw2aVVLgkPybnvOgwRwKiuQtCP72T0ghkttmEY0HhICPZKLUjnnxXv1K CKqw== 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=gyO7FMb6Kog7HFYI2emP9ylf6WG5qE9183WrVkkssuU=; b=QlUi9COy2JwbdKq6vXliGP1Fm/AcxXLJ2EuHffPlFFxjtp+zsjgeY50lulSeeqQRQe yyDZwdpm3x+SkTiBKGKDGBvzCv9JKwODZHJWf0581JRkfaFMweRsD8SKT2kg/TciJSae JV56uuG2dCqeF3aBnLk91PAR1t8MQg65a88p+nIBiUrF63hj7yEUAC+4taxnMMtX57F0 TRNDi0eJnNRDciLXZ8qZORZj0r91voIlpew5sESN3SHHsKhqKsFlFL1NbDxb6a/oQf32 TWgaCa5n5XPcfIijLVKPX8j+TQRIH7W3yq3Awk8xFCeXSP7+Of2ot1YdKFP00+i+CQuJ so8g== X-Gm-Message-State: ANhLgQ2VXRatXTH+Z2RSv03OBLEEPZ8P2tEHp8m3TO2MOdJ9gW3WjArX Ly/9DLIk4tfTuB2+GByncNGthQ== X-Received: by 2002:a05:6000:111:: with SMTP id o17mr3911770wrx.111.1585149347375; Wed, 25 Mar 2020 08:15:47 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u11sm1633773wrt.29.2020.03.25.08.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 08:15:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 56D371FF87; Wed, 25 Mar 2020 15:15:43 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 01/11] tests/vm: write raw console log Date: Wed, 25 Mar 2020 15:15:33 +0000 Message-Id: <20200325151543.32478-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 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_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann Run "tail -f /var/tmp/*/qemu*console.raw" in another terminal to watch the install console. Signed-off-by: Gerd Hoffmann Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200310083218.26355-2-kraxel@redhat.com> Message-Id: <20200323161514.23952-2-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 8400b0e07f6..c53fd354d95 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -213,6 +213,9 @@ class BaseVM(object): def console_init(self, timeout = 120): vm = self._guest vm.console_socket.settimeout(timeout) + self.console_raw_path = os.path.join(vm._temp_dir, + vm._name + "-console.raw") + self.console_raw_file = open(self.console_raw_path, 'wb') def console_log(self, text): for line in re.split("[\r\n]", text): @@ -234,6 +237,9 @@ class BaseVM(object): while True: try: chars = vm.console_socket.recv(1) + if self.console_raw_file: + self.console_raw_file.write(chars) + self.console_raw_file.flush() except socket.timeout: sys.stderr.write("console: *** read timeout ***\n") sys.stderr.write("console: waiting for: '%s'\n" % expect) From patchwork Wed Mar 25 15:15:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184813 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp736778ile; Wed, 25 Mar 2020 08:22:46 -0700 (PDT) X-Google-Smtp-Source: ADFU+vv7mwS2AhRSqkF457KsdtiZn17IOauT0Loys2/bTltqDuDpsU6zzsb72yxC4bBYIwae3Uek X-Received: by 2002:ac8:6b4b:: with SMTP id x11mr3557386qts.118.1585149766838; Wed, 25 Mar 2020 08:22:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585149766; cv=none; d=google.com; s=arc-20160816; b=PSyQ1bzIzpArE6nDlGQKx62oiPlRXt37S1ztIPbGT/k3p3bi8s19Wjfw1KDdDQFaC+ YQcpjlkLujbV1W15xGNs0FJxGYc4+X3k2L65vwxKgRiqdSvBc9WqxfHxx+uq8Me958BZ qHLs+v1xY8AAazZVqdMnZFQ2KqZcL62Zt/cNmcRNArTJyo4CW+x05GOyIZ2w/pP3H6HA yIEwCy6/z3qnJ54j5N7FhK5G6Z++5wW5Qc0OHC8ofiNqH1XTKzvqRvhm3gwxxDhCJxc+ ocVsI2gFth7PtYFWi4n5I34iQ24MO2bxnl8htsthH/pTh9mqc4ydGLRKgKlzFEbg2pTx RQFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=BVjll0Btf0ZgFKbd+CxXv9O+AQAJq5w3JoNQuRDkfgk=; b=JFGkUPQkh4I5kvGc77pTwRXn7xAY7xDUmwIgt4hwlgXkdve2ZDfjbcmHlxo1/lD7ED OAASnbErmu+2tkM+Aw3Ryad500ml1KrdKJFtT5WNd8vr+8+3c23zdkvYBsaHtc4scKoD Ivfw0wM8sH51uufjc8tuuHvmg88hTB6Y+we9AkFtDrg86GS1jI00nsOtZkVmGA1BvFzM dLLE0SyKB7eEW4UYGHMz0DBpo+27kuXcmbkNOorIGdxCbxAv3Unz1oC+IyDdNyeOeBRO aOIH1EqknSR/mpBZMfxpXxxvuQyawPfcq6tF7OvO/9qIMlwkPhyc4DLC4LYcsu0jF/pM rifA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dXdDAZXv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h3si12316673qkf.148.2020.03.25.08.22.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 08:22:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dXdDAZXv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7ri-00076p-D9 for patch@linaro.org; Wed, 25 Mar 2020 11:22:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41489) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7l5-0003dS-4a for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7l3-00080i-So for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:55 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:34637) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7l3-000808-Lp for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:53 -0400 Received: by mail-wr1-x42c.google.com with SMTP id 65so3644739wrl.1 for ; Wed, 25 Mar 2020 08:15:53 -0700 (PDT) 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=BVjll0Btf0ZgFKbd+CxXv9O+AQAJq5w3JoNQuRDkfgk=; b=dXdDAZXvntr0mdoAlmfxO6t0sZemPQDj8L03pHyEeVI7Evlqe+8fhLUdwL2u3Wot5T HoMJ3JUAcFsgHMwKycZiuBhVUCQTt4vTBb9kdJqIKiP3+IoymMDdFIDv2rXDVN3lgNd1 xXB90gxO3ebaLdGwQIbW2pGmjfvoxX/+fg0iO5Ce03tdRw0ER4V/wETsDff1GcVxCOAr wWmAPweSFQtLWsc9vNFCja9igeubXZOF0d+qaJiLnbVqkwusKZ6QN9lVQ0q4vyZfRI8e x2SrQdY5Apojkbe75e58j3eoc55Ybd9F70It3MQN4g+ouNwj6ex5xTrcAeHnhvvlRRpr 7njg== 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=BVjll0Btf0ZgFKbd+CxXv9O+AQAJq5w3JoNQuRDkfgk=; b=M84WhnW7rIKYkfH0W3W1sfw5aKnFakUTq1l5hn84AdGfq6QfeR0/pT0zjcFusiFjhZ wK2UDY0IRTYlnCwTnsi0ORQoJwESx9BlfvRpIdx7Lq3w3V+/HheUrZqpjyAAzuILpOdC RO8PwTh0iwfmHhPqj1xugXv34K6NbKeypmhafiNmxUO6vFLvPjtanF8X9TphDIA3P5Wi U7UG7gIeouSwWteV186RT0zokEfUbre875vKdVI9NPLCS3zISlpRNlFuGR/yNcj1Mx19 XPjELTJTb9dJq1DMivY6fcOQJFBTZNZESB0SeiQ2Ia7LMNbwEU1eC9xqLX4byqn/kn0C UYGg== X-Gm-Message-State: ANhLgQ2YYe+9FVfncBh3vQAdxMDQHxR2UucOJseTxsNgGdYZTI52FoYF Fv3MNqGyGkCF5zVMEK/S5KiEHw== X-Received: by 2002:adf:d4ce:: with SMTP id w14mr4037020wrk.101.1585149352555; Wed, 25 Mar 2020 08:15:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n2sm36609784wro.25.2020.03.25.08.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 08:15:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 730561FF8C; Wed, 25 Mar 2020 15:15:43 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 02/11] tests/vm: move vga setup Date: Wed, 25 Mar 2020 15:15:34 +0000 Message-Id: <20200325151543.32478-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c 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_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann Move '-device VGA' from basevm.py to the guests, so they have the chance to opt out and run without display device. Signed-off-by: Gerd Hoffmann Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200310083218.26355-3-kraxel@redhat.com> Message-Id: <20200323161514.23952-3-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index c53fd354d95..cffe7c4600e 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -179,7 +179,6 @@ class BaseVM(object): def boot(self, img, extra_args=[]): args = self._args + [ - "-device", "VGA", "-drive", "file=%s,if=none,id=drive0,cache=writeback" % img, "-device", "virtio-blk,drive=drive0,bootindex=0"] args += self._data_args + extra_args diff --git a/tests/vm/fedora b/tests/vm/fedora index 4843b4175e0..bd9c6cf295c 100755 --- a/tests/vm/fedora +++ b/tests/vm/fedora @@ -82,6 +82,7 @@ class FedoraVM(basevm.BaseVM): self.boot(img_tmp, extra_args = [ "-bios", "pc-bios/bios-256k.bin", "-machine", "graphics=off", + "-device", "VGA", "-cdrom", iso ]) self.console_init(300) diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 86770878b67..58166766d91 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -92,6 +92,7 @@ class FreeBSDVM(basevm.BaseVM): self.boot(img_tmp, extra_args = [ "-bios", "pc-bios/bios-256k.bin", "-machine", "graphics=off", + "-device", "VGA", "-cdrom", iso ]) self.console_init() diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 55590f46015..f3257bc245a 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -86,6 +86,7 @@ class NetBSDVM(basevm.BaseVM): self.boot(img_tmp, extra_args = [ "-bios", "pc-bios/bios-256k.bin", "-machine", "graphics=off", + "-device", "VGA", "-cdrom", iso ]) self.console_init() diff --git a/tests/vm/openbsd b/tests/vm/openbsd index ab6abbedab5..0b705f49452 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -82,6 +82,7 @@ class OpenBSDVM(basevm.BaseVM): self.boot(img_tmp, extra_args = [ "-bios", "pc-bios/bios-256k.bin", "-machine", "graphics=off", + "-device", "VGA", "-cdrom", iso ]) self.console_init() diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 3266038fbde..15707753353 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -36,7 +36,10 @@ class UbuntuX86VM(basevm.BaseVM): img_tmp = img + ".tmp" subprocess.check_call(["cp", "-f", cimg, img_tmp]) self.exec_qemu_img("resize", img_tmp, "50G") - self.boot(img_tmp, extra_args = ["-cdrom", self.gen_cloud_init_iso()]) + self.boot(img_tmp, extra_args = [ + "-device", "VGA", + "-cdrom", self.gen_cloud_init_iso() + ]) self.wait_ssh() self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") self.ssh_root_check("apt-get update") From patchwork Wed Mar 25 15:15:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184806 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp729661ile; Wed, 25 Mar 2020 08:16:03 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvfdl1bPMqd/CSolfWW1pH4SqQ4MT41BNhGzI5XTliRWLFgUowL5q1hvC6cNcELr+Wc6NQq X-Received: by 2002:a0c:fe01:: with SMTP id x1mr3553581qvr.243.1585149363293; Wed, 25 Mar 2020 08:16:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585149363; cv=none; d=google.com; s=arc-20160816; b=WC4mQtQmsk7ITHOWlXoPm5Gq20MLkQXPZlsATZZrBKkBspfpCUdBJ0XoNQ73CZKYT+ gqAo+HKeY5d+R+xK6+2pELls+0/Panz9jCdZR2Yq6IRAXBXcyLqg9S3rHofV/2Zdzitg edrhEgKCDK/mhyaQ6Krj/26ew3jC5l7KYsMthgjjcYkVk3nhlawQmaTLXmLUzizWlCF7 zG/oj0RDERIPU8X8Y8XPd1Og6Z12D0GjXsDCre1ISHF/f1UbvAanLE4iI5s9b69x0z1F SNpqB1EYhV0VvZDUNsbwYLUN0Blx4PdmKm1gbZ8vgEdICiugBCx5jIwyGExM7ijEtYOM ICgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=mFcHuHvBSlpN6GNuePYdv4kQDYYjvabQ2NuBORJmALw=; b=pBLhuQci6ZR5J98zNMlMSwiq/OKz0/mUks1M8N36IFTHt8sdXc16gAcsqZQItKQk2W WuKC7zPU2R8HHYPOEV1cLGwC/zUrONqJEXpEi1j1dZTmm82dcFb16Pb5DbmgN8kK4NqQ P9eL0Fo8Nm6CrAcOIt5lCaicMI1muFJ8FRRnVH3dC3vhV1RjsB/GR8s40CXM2wzEizUR IlUkvhqYrgONLtZB/KlLLkwQrbnrQOkrJJLy71MVsnDUo7DTjy69lnhdx/yzCZ9bBJY4 9RDs3HcZ9NqdNszW9rmw2UHybxIVZHLEji9iQxoiXnYfLPe+zCiQT9eqdu2oddzhsmnl 3rWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Co16tyqr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p50si13397973qtb.219.2020.03.25.08.16.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 08:16:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Co16tyqr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7lC-0003Us-PG for patch@linaro.org; Wed, 25 Mar 2020 11:16:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41417) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7kz-0003Sk-Iv for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7ky-0007wu-IS for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:49 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:52388) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7ky-0007w7-CF for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:48 -0400 Received: by mail-wm1-x32b.google.com with SMTP id z18so2890871wmk.2 for ; Wed, 25 Mar 2020 08:15:48 -0700 (PDT) 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=mFcHuHvBSlpN6GNuePYdv4kQDYYjvabQ2NuBORJmALw=; b=Co16tyqrY5fzBTuelgKZD/cxPhYSX1O+54bxQ5de2a9RvOcs4EPiFnzLlu1RWoM2Nm T7R3P+rK3GKOJX15WvGHjcJTleY7CVyU5PunVZTRCibxoDgN08wwT4EP3vp82IXGTWZA 4Y5ReJLGekSnV20lNAhgfRW8/UHL0oos1tMt3vpO7QiQxYpAuGGdgs4wILb7IFHr4kAa GryqvuGG3UM0pvU0jC/RDBSZOxrVLcPLyqsgiQ3T2F5aYR9GYti3Clzt1rDvCvhKOW4A qVSoDAfl+IKvVQIsSMtRSiu+DygdekQ5lQt0IcsNt6+O0qN283GyLrrlfXeNsU/25F6n iBHQ== 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=mFcHuHvBSlpN6GNuePYdv4kQDYYjvabQ2NuBORJmALw=; b=iwqMt8g/RxFBCFiVEEnZtod20a4KMc73E80ySzbP5FsiRtaOxHUQ9KhQuczbPvRAZA YzSnoIHEZgZitRd5xhFYZJMBCgOuiorJWfbXblcMhUYPe/yhVk234myB9apuv46YZjDa JC8U1RgjQNV0mmNyB8WuPwdTgmJoRV0AREP04YcUOXo/8KWmZdrk+3jGXElO1q/wgMbp 0lM4qIQx7LHTX7gPY9NXHjgPe9+YRDMqr6NsM9MzPvt0Kt8yi/okuxwjsUWxGrLqkg/Q R3wj6FSlXcuUSUxMaYqDb6pZqNjMvTLF3Hl7PKEUCqyPdcZ22HN5AT2DVSB6LEaAc/2M cxAQ== X-Gm-Message-State: ANhLgQ29i1+oXDu59ed3jYtLSTfV9Qtg/rLSToG4IO+WztJZOYuf0CPi lyeV4T9ngUho21HmEpkax2/ajg== X-Received: by 2002:a1c:1b0e:: with SMTP id b14mr3898561wmb.8.1585149346146; Wed, 25 Mar 2020 08:15:46 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u5sm28139225wrp.81.2020.03.25.08.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 08:15:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 89B721FF8F; Wed, 25 Mar 2020 15:15:43 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 03/11] tests/vm: update FreeBSD to 12.1 Date: Wed, 25 Mar 2020 15:15:35 +0000 Message-Id: <20200325151543.32478-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32b 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_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Signed-off-by: Alex Bennée Message-Id: <20200310083218.26355-4-kraxel@redhat.com> Message-Id: <20200323161514.23952-4-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 58166766d91..298967fe9cf 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -24,8 +24,8 @@ class FreeBSDVM(basevm.BaseVM): name = "freebsd" arch = "x86_64" - link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-amd64-disc1.iso.xz" - csum = "1d40015bea89d05b8bd13e2ed80c40b522a9ec1abd8e7c8b80954fb485fb99db" + link = "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.1/FreeBSD-12.1-RELEASE-amd64-disc1.iso.xz" + csum = "7394c3f60a1e236e7bd3a05809cf43ae39a3b8e5d42d782004cf2f26b1cfcd88" size = "20G" pkgs = [ # build tools From patchwork Wed Mar 25 15:15:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184810 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp733266ile; Wed, 25 Mar 2020 08:19:26 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvb6JxztGdFxVwHw8HPhSN9m1tb0dIkyKsdyNigfe7JALHDeaMuwVPDlnOb6hHPTB5PiypY X-Received: by 2002:ac8:7450:: with SMTP id h16mr3372098qtr.11.1585149566447; Wed, 25 Mar 2020 08:19:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585149566; cv=none; d=google.com; s=arc-20160816; b=SQpNquyj3yLnfSD6sEZHHt3AUSUMxc7bNSub1+7H0ifgO/ctX5ebbPvxQ//J/XJFJ+ h2/fyChH5n+EU7kMO+rqELfh2Xy6XotpYCghucdK4qrwJs2PN+RxXl7At7i7ogIqcMg3 QIOFKYM9qnOPWpHoymTX+GfpycfaDrKOAVYcUAnWgA5Ut1UpQSd56EoQ8Sp2ZCiTcvay uYq956TgChYxuxLPJ/lDAkgiesgHpfkFy1TrPQXkl9gBAnqQ/LFjOWy81aLkbrAnKA6L p5fN+mIznGqnmcNhVt24XgyUBHovdHcnqiZwAkVPB/4xcihWr2ii///LqfWG7Cfulty3 3wBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ztDbOw6DhMgOgSgsUfM4L+NS4o98VZx9Fe9KbZgV6vo=; b=OonzJpZj4XWtYaUQARqj7OMgumeLfG4tjd/0wiuz/liuItlu6TRFQb4CcJ7vtI2IaU TGgC0Q4e1X+sh2J0oCMhNkUDTXxPyo6FpF6zk2v+nKWjpYFyY1lEN3dfCIzJk66Ig5wG JDK+WzumFjnx2XEv9QtGbRbnh9GyQb8BZ9JzPOvYEoHhP+oU92QSEDx/7oeJgUN8wJEy sQrL+aLP2F7zg/V1Y16sNgNr5H7wCVwJ6YKY7L3bb/F6/8V2od+YVD9s0we6lyohmNps trvhlThAwdYuxgML9Loo5tUn9ZYWnpA1i9kdfuGKRuND55ylxM5ZqOurK9uCyzSiVes9 l59Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tld5UFd6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z127si12699936qkb.253.2020.03.25.08.19.26 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 08:19:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tld5UFd6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38002 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7oT-0001h1-PV for patch@linaro.org; Wed, 25 Mar 2020 11:19:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41451) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7l2-0003XM-Jp for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7l1-0007z1-A9 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:52 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:43484) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7l1-0007yQ-3F for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:51 -0400 Received: by mail-wr1-x432.google.com with SMTP id b2so3548314wrj.10 for ; Wed, 25 Mar 2020 08:15:51 -0700 (PDT) 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=ztDbOw6DhMgOgSgsUfM4L+NS4o98VZx9Fe9KbZgV6vo=; b=tld5UFd6KSF4Sysx1MQ8dGFcKrGuhmtHnChqKVmTbpWphopy4WXXBkPnm5h3lHFqzx wc6Wr4vc93T31RKy/qs5oYz52ihfYcvIHuoiV2qujrBQzRIU0wmM5dVuuMtpR10zBRds 9Kr7DgfpgyNktm/gA/8IdnPjk1eVksIjbLA/aWgrMQBRHegaEI7szpvifVupVtzuAcLD 5IDihNZnVFTl4mF8aRvSfEP0SrZ58BmBJYEOvyQ70Q73yyTdppCr90+XsrvhaYez4Bag sWA1XKzM66nt87/8F3ykJRwUYCrdI5sxhe+GLknbYaoutakPimjWCm6qv8pf9r4eqBDk fKrA== 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=ztDbOw6DhMgOgSgsUfM4L+NS4o98VZx9Fe9KbZgV6vo=; b=RfwTa78JHzHaUk1REX9IiHPsCv/esYyPx4G4FN8dO3jRXB8EGR3g0Y62xj2BQJ2KXo 5lELYAEHMu16coYM7pk8fEMphntxPCJQdI2i7NkqmXJkM6Zf/PvDBs86HSqzC+jrpean oc7zlU3l49+jxHEbPhlmA9KSTYQ5L//wDdQ7jGxOWYPRIBPoIER73OjHzqsnGrv8/V9s tF0BYPuDsZ/PW+A74frP32ZNsSg5JoM2uaSJRJb0cN/z+rf5ZXhJMXhWp8SMnUV4pnCm 3cJ4h7nSpx6KuzBPm/r+3V8fe0f0f9qK8wxIvVoMmxv7oZI+GnQmadqDasWhNnaAtQ85 /vgw== X-Gm-Message-State: ANhLgQ0JEAt3k01yRkJfsJkaFnrnJQAjjI3Z4p7b+ipp/pUFsEyEnl/A po2LrbBvFjLlf0fNqUtzHyi41g== X-Received: by 2002:adf:c648:: with SMTP id u8mr4085356wrg.185.1585149350011; Wed, 25 Mar 2020 08:15:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n9sm6286154wru.50.2020.03.25.08.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 08:15:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A01671FF90; Wed, 25 Mar 2020 15:15:43 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 04/11] tests/vm: update NetBSD to 9.0 Date: Wed, 25 Mar 2020 15:15:36 +0000 Message-Id: <20200325151543.32478-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 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?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Kamil Rytarowski , Gerd Hoffmann , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann The installer supports GPT now, so the install workflow has changed a bit. Also: run without VGA device. This works around a bug in the seabios sercon code and makes the bootloader menu show up on the serial line, so we can drop the quirk for that. Signed-off-by: Gerd Hoffmann Signed-off-by: Alex Bennée Message-Id: <20200310083218.26355-5-kraxel@redhat.com> Message-Id: <20200323161514.23952-5-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/vm/netbsd b/tests/vm/netbsd index f3257bc245a..b10c9d429de 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -22,8 +22,8 @@ class NetBSDVM(basevm.BaseVM): name = "netbsd" arch = "x86_64" - link = "https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.1/images/NetBSD-8.1-amd64.iso" - csum = "718f275b7e0879599bdac95630c5e3f2184700032fdb6cdebf3bdd63687898c48ff3f08f57b89f4437a86cdd8ea07c01a39d432dbb37e1e4b008f4985f98da3f" + link = "https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.0/images/NetBSD-9.0-amd64.iso" + csum = "34da4882ee61bdbf69f241195a8933dc800949d30b43fc6988da853d57fc2b8cac50cf97a0d2adaf93250b4e329d189c1a8b83c33bd515226f37745d50c33369" size = "20G" pkgs = [ # tools @@ -86,42 +86,31 @@ class NetBSDVM(basevm.BaseVM): self.boot(img_tmp, extra_args = [ "-bios", "pc-bios/bios-256k.bin", "-machine", "graphics=off", - "-device", "VGA", "-cdrom", iso ]) self.console_init() - self.console_wait("Primary Bootstrap") - - # serial console boot menu output doesn't work for some - # reason, so we have to fly blind ... - for char in list("5consdev com0\n"): - time.sleep(0.2) - self.console_send(char) - self.console_consume() + self.console_wait_send("3. Drop to boot prompt", "3") + self.console_wait_send("> ", "consdev com0\n") self.console_wait_send("> ", "boot\n") self.console_wait_send("Terminal type", "xterm\n") self.console_wait_send("a: Installation messages", "a\n") - self.console_wait_send("b: US-English", "b\n") self.console_wait_send("a: Install NetBSD", "a\n") self.console_wait("Shall we continue?") self.console_wait_send("b: Yes", "b\n") self.console_wait_send("a: ld0", "a\n") + self.console_wait_send("a: Guid Partition Table", "a\n") self.console_wait_send("a: This is the correct", "a\n") - self.console_wait_send("b: Use the entire disk", "b\n") - self.console_wait("NetBSD bootcode") - self.console_wait_send("a: Yes", "a\n") - self.console_wait_send("b: Use existing part", "b\n") + self.console_wait_send("b: Use default part", "b\n") self.console_wait_send("x: Partition sizes ok", "x\n") - self.console_wait_send("for your NetBSD disk", "\n") self.console_wait("Shall we continue?") self.console_wait_send("b: Yes", "b\n") self.console_wait_send("b: Use serial port com0", "b\n") self.console_wait_send("f: Set serial baud rate", "f\n") self.console_wait_send("a: 9600", "a\n") - self.console_wait_send("x: Exit", "x\n") + self.console_wait_send("x: Continue", "x\n") self.console_wait_send("a: Full installation", "a\n") self.console_wait_send("a: CD-ROM", "a\n") From patchwork Wed Mar 25 15:15:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184814 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp737983ile; Wed, 25 Mar 2020 08:24:00 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsu51PpGjVzpYRvNLA4y4MOKcT8NdvmNPY3I7y8kJLMSt9v60we/HVO2EH6iahq/zDY4Xei X-Received: by 2002:a0c:fe01:: with SMTP id x1mr3591443qvr.243.1585149840096; Wed, 25 Mar 2020 08:24:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585149840; cv=none; d=google.com; s=arc-20160816; b=tOgFrgv3uL/vT1q9hgJ72YWqnYhsPgtALTJlXlirpaCFCgDwnwebOMecFXpGM5cgIM pn9CwTwNfWdZCH4l+z9SQxL0GnEAqKxGbXfkTuo9YYDgSexRX4qjl/edMMkxyJQS1MtD ZSJvrspFoq0Bmsbs152FkjY6FFYqvL1hzNH+vf1GJYJq6v9xXskkExRShYa+RwLUUN6I S3sswd03tBpNAm+af/7pPCHmke6ayqU2Hqht+IXtbA+VwDRlg1qsPKqq9tzpADsiq4t2 uRBmfHwOiC3q5kQ5V42CHr2GR21mMxlui6O5uzkcw0V48UR0dltwOimFRjAn3OrxShCM cQSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=l7mM2oj13ibfp0JE0ahAZG76SnCWxFa0MFbX0Uuu7f8=; b=em3V74A4E5qx2f7/Gknk5pYv4+Im1MfwSJDQj6hcNG/4ebKdFfZStJbaJFUPve59A4 MzQ8FC3L2uwRj4H2nD07w5JNyjwyUAMaQYiyxEW/7g8hG1Byw+WDZEBgtFD/ogmTaD4H XMZq1diaP1KZ+Zfpa2NmPzudupla1x1tMS24xcUBI/NOwXBaPsYp2K4TfbTc4mGsfy9m NAwmiKjcW9gn5+ognh9Iq2OxzsrJDAOQDGb+H5oO6gTAR6SRObo/Sn/RxoQ1xRkpo2tq rF4Cp29HMnl2g5eEvxowcYWVntzjpKpj73FlKA23yJ/IBj1hDuUAeEClpCjgjMm7MKJ4 R5NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hfYzGqV3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o13si6977855qkg.48.2020.03.25.08.24.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 08:24:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hfYzGqV3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7st-0008W5-LL for patch@linaro.org; Wed, 25 Mar 2020 11:23:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41531) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7l7-0003i0-V2 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7l6-00082c-TW for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:57 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:42808) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7l6-00081a-N8 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:56 -0400 Received: by mail-wr1-x432.google.com with SMTP id h15so3568257wrx.9 for ; Wed, 25 Mar 2020 08:15:55 -0700 (PDT) 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=l7mM2oj13ibfp0JE0ahAZG76SnCWxFa0MFbX0Uuu7f8=; b=hfYzGqV3p86O/5DPGWrz+TOrYdhbvvUcMQv4fL0QBq4nhsyh9CcbVGNJF3wYM2q+T2 OM1iUcGDvpRvBx7FWItk8MMBVRg5RCtzDCo8qRppXNStlYEzdF4J0XLvH1uc1JoYUVa+ CKYGBVci9Rd69K79Em/OEr/ocjqszJFF0WlIpAf0zAR7Ll6uxhPxjECb+mI5KF/ADO4m O+YoXfHgCgv4QXZFnOnoPK31qtHkS1ZCW9veQdGwKw4yopNFO77bF4AQE75kTwxVO76h xs+Md5qR+cetPAaErGT4V/Wpt0pnttsg5RI/LMNtGCvwMfhQdD0YBFAxFv27rlexZCZl kxYA== 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=l7mM2oj13ibfp0JE0ahAZG76SnCWxFa0MFbX0Uuu7f8=; b=JC1biSylvLuu40wuOccQlGIDulKYD53F3VzMquLzRKfxg2mlxJUjFXER+okK4HmeUn 1RFeBm2qIq/eTcAwjEk0o1SicbWBzKgyFZufNJoPt1OFAgGfq/9wPAIyTqgQzZDq7GzE WgKM376u0lygiEPJkdpwb3SBBIRHwxdvGSDEDsGmPbzsTZy6HyQgXc4YSfVyYro8k/RR CHsA1iqrWCLfliOMBucPyl0zHAAGBJ8kzVBF+2Edtv1MHbht6vYfjSyJ3Y6HQQdskQIP aaOb2RCzkzULTy+Vt2wCXyhG7rehtFfNQ1GjH+63C7GDPo21Sqzb24zmf2wvlYj676s0 +D/A== X-Gm-Message-State: ANhLgQ3XQtVxmRqJBt9SYjGzHCb/lAdjIpTSd873yWFWQoxgQ2pXOxXY Pp9pv14xym3Gp6q8sohwnChfbA== X-Received: by 2002:a5d:4489:: with SMTP id j9mr3859544wrq.161.1585149354722; Wed, 25 Mar 2020 08:15:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u131sm10078054wmg.41.2020.03.25.08.15.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 08:15:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B6A791FF91; Wed, 25 Mar 2020 15:15:43 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 05/11] tests/vm: fix basevm config Date: Wed, 25 Mar 2020 15:15:37 +0000 Message-Id: <20200325151543.32478-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 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_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When the patch was merged it was part of a longer series which had already merged the config changes. Semu-revert the config related changes for now so things will build. Fixes: b081986c85fd2 Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200323161514.23952-6-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index cffe7c4600e..756ccf7acae 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -358,23 +358,23 @@ class BaseVM(object): "local-hostname: {}-guest\n".format(name)]) mdata.close() udata = open(os.path.join(cidir, "user-data"), "w") - print("guest user:pw {}:{}".format(self._config['guest_user'], - self._config['guest_pass'])) + print("guest user:pw {}:{}".format(self.GUEST_USER, + self.GUEST_PASS)) udata.writelines(["#cloud-config\n", "chpasswd:\n", " list: |\n", - " root:%s\n" % self._config['root_pass'], - " %s:%s\n" % (self._config['guest_user'], - self._config['guest_pass']), + " root:%s\n" % self.ROOT_PASS, + " %s:%s\n" % (self.GUEST_USER, + self.GUEST_PASS), " expire: False\n", "users:\n", - " - name: %s\n" % self._config['guest_user'], + " - name: %s\n" % self.GUEST_USER, " sudo: ALL=(ALL) NOPASSWD:ALL\n", " ssh-authorized-keys:\n", - " - %s\n" % self._config['ssh_pub_key'], + " - %s\n" % SSH_PUB_KEY, " - name: root\n", " ssh-authorized-keys:\n", - " - %s\n" % self._config['ssh_pub_key'], + " - %s\n" % SSH_PUB_KEY, "locale: en_US.UTF-8\n"]) proxy = os.environ.get("http_proxy") if not proxy is None: From patchwork Wed Mar 25 15:15:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184815 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp740636ile; Wed, 25 Mar 2020 08:26:21 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvshzlvRZyGqxIwx7HuUwKuHDejzNfIVNPDfnETsz/eL51x01fOscL03ydsGuOnjDIwUMgK X-Received: by 2002:ae9:edd7:: with SMTP id c206mr3175350qkg.343.1585149981780; Wed, 25 Mar 2020 08:26:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585149981; cv=none; d=google.com; s=arc-20160816; b=NH7yTy8KkAeGSV0oH5otFvhIFgOTlgyeFiCX+J0oLtnrOZUbu3b28uMxO+M1JAwvew kdYGRUkhJZfHUbCSZKxzXCUg34SFEuDxYzjLSWdUmg6pV92FZOnQPkccWwhcS2V+3FqN 50DFM+7FPq7nnmyWsu3YVvDn4MRfqF2yxBW3PVSe/ZcutW8/SHJQE8ejFgXhuTR2gLgE tPQ0wi9ScCSaZZp8byCCCkMQzZDc1KEgGq7RZ3WxpDHNlhc62qn05EQkJ5nhZwj1OgoO DbHmmS4RwuYLBmmaMoE5s6Tau3FwK+Q8bQ2VmVTXw44GqY1LPaFuNnwZSsUJcOToTZ4j UHKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=1B9ZUTBnoU4gxY0Jsk9Kmh/Dj86gf5UMxsBDuamh5Qs=; b=t8ZwgosYHNTxSZliCbBReXycHANttH0aUAOxIAvcWgVa2CH38hmalWHFMDfGWPOExS V8msUewBvmWx0rSvXUtxhE8ue6Blus0lKZx6kCW10O7HkjcKFNDNRHvyon05RwngZbcz CR5RCuP8vsVYL0Jt8eNA0NKT/ym2/ezA7zEJv0hgmNbtXRFn7YJeESMAUhT+g1KYt8AM ieAKFND/GeP22V7zlvuoQn2elx5BbpS3muVFaW66yHtE7ssUAOKdN5wjJvgoWePrZX/x PfDnKeZS5a92iANVjeur/NVwM0XaGogQFp58SonajGtQ+0m7Y6MakJ8l87fJURnj9mV8 n8hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rO2jorlH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o44si11317955qvo.134.2020.03.25.08.26.21 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 08:26:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rO2jorlH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7vB-00039e-7G for patch@linaro.org; Wed, 25 Mar 2020 11:26:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41561) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7lA-0003mf-2O for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:16:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7l7-00082n-13 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:59 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:44697) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7l6-00082D-Qr for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:56 -0400 Received: by mail-wr1-x42a.google.com with SMTP id m17so3554562wrw.11 for ; Wed, 25 Mar 2020 08:15:56 -0700 (PDT) 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=1B9ZUTBnoU4gxY0Jsk9Kmh/Dj86gf5UMxsBDuamh5Qs=; b=rO2jorlHHy0o23+Ls3obwOWSYjXvemFHSuj+tEMu0Ey7w7vtbScF+6ryKH5wYV2GCG HNWvfVQLtR8f4642LvIPhadc40x1+lBfLgHp/4LHwVuWogME6V9urSTlo8obQ7NDy3TP M6AhQ8HIKytn0IowObVz5OUVMZUfY53qYSU2J/wV3L9lZIFeiFHqevLbtie81h2ToEfy YyDRqVAWNHt1uAD3SIzA80DjB/kq9wunvqpOLq7yEEY468uMQNAj1eT+WqLQVqCF05Au 335jSMU8P92KPpXAJUlQdtnl3lpV6JzYXNDZiv5y7vfe5g15+5DhN41BzyWCODTxyN6G Rbcg== 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=1B9ZUTBnoU4gxY0Jsk9Kmh/Dj86gf5UMxsBDuamh5Qs=; b=dTcd/6pSpsL4OKzRq3fQku4B9yyQ/Z6sqM7Y94j8Cz2X5Vo5tKuy9jEcKAMF5Zk4Yn NEe97nAu53zos4hHqMMamXnkAyB4GKBx8lASQv9JSLBhM5E9vecjXOIs3plWs6GLoYRv ngS5BelgPDygGBNXeY8kPwyK1uNek2U9lF0bVUesJU2icUm3WmpWl4iIyKTbkswQGsL4 5nNw6BU061fydGUdirruo8G2vxNDj+sfIdpxNXi5WOItcw0yVdoVWL3SLZplOZH/+qfV jCeHUGtyJNCa16/ITrWLRL7xjMK/yc7E/GlONbULeL5L5l4r2aqHwn74DyUIAAB8hl/4 tltQ== X-Gm-Message-State: ANhLgQ0uILK9ffIrqHUcjzuVc26uxfnJac8IpyeMt6aHCtPyhfnHlCcE QjnaDfCOm3ROfNF+2COhFlYd2A== X-Received: by 2002:adf:a54a:: with SMTP id j10mr4135046wrb.188.1585149355747; Wed, 25 Mar 2020 08:15:55 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t12sm19019151wrm.0.2020.03.25.08.15.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 08:15:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CA3D71FF92; Wed, 25 Mar 2020 15:15:43 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 06/11] configure: disable MTTCG for MIPS guests Date: Wed, 25 Mar 2020 15:15:38 +0000 Message-Id: <20200325151543.32478-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a 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: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , qemu-devel@nongnu.org, =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" While debugging check-acceptance failures I found an instability in the mips64el test case. Briefly the test case: retry.py -n 100 -c -- ./mips64el-softmmu/qemu-system-mips64el \ -display none -vga none -serial mon:stdio \ -machine malta -kernel ./vmlinux-4.7.0-rc1.I6400 \ -cpu I6400 -smp 8 -vga std \ -append "printk.time=0 clocksource=GIC console=tty0 console=ttyS0 panic=-1" \ --no-reboot Reports about a 9% failure rate: Results summary: 0: 91 times (91.00%), avg time 5.547 (0.45 varience/0.67 deviation) -6: 9 times (9.00%), avg time 3.394 (0.02 varience/0.13 deviation) Ran command 100 times, 91 passes When re-run with "--accel tcg,thread=single" the instability goes away. Results summary: 0: 100 times (100.00%), avg time 17.318 (249.76 varience/15.80 deviation) Ran command 100 times, 100 passes Which seems to indicate there is some aspect of the MIPS MTTCG fixes that has been missed. Ideally we would fix that but I'm afraid I don't have time to investigate and am not super familiar with the architecture anyway. In lieu of someone tracking down the failure lets disable it for now. Signed-off-by: Alex Bennée Acked-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Acked-by: Richard Henderson Reviewed-by: Aleksandar Markovic Cc: Aurelien Jarno Cc: Aleksandar Rikalo Message-Id: <20200323161514.23952-7-alex.bennee@linaro.org> -- 2.20.1 diff --git a/configure b/configure index da09c358957..6e274a993b9 100755 --- a/configure +++ b/configure @@ -7885,7 +7885,7 @@ case "$target_name" in TARGET_SYSTBL_ABI=n32 ;; mips64|mips64el) - mttcg="yes" + mttcg="no" TARGET_ARCH=mips64 TARGET_BASE_ARCH=mips echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak From patchwork Wed Mar 25 15:15:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184812 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp733600ile; Wed, 25 Mar 2020 08:19:45 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvLyetwvWuVKzR9pQmJEdeVDfKCVClWZmg+yvpVTTuFVS0kRxAHl5hYdsw06zu5p0mFl0JT X-Received: by 2002:aed:38ea:: with SMTP id k97mr3413096qte.327.1585149585568; Wed, 25 Mar 2020 08:19:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585149585; cv=none; d=google.com; s=arc-20160816; b=d2SfmNwhdawdsT1CtKxxC1/XJ0RV29DZaTxFvGX85uYtAKgaqZNbaWpQKa8NdldFnV 8tNM4NrIFR+8WIWy1D9yE/8b6KJoo6zaozTmHczzEAKv4RtBTr84uivLWnVP7F8XpfHc 9zYDPXekFyLYui0aPViEAfYRXUZ+hKDbq3zeONDsnOMQJqaEoRmXHUEMhzJvyWwdPlG/ 0Zm6zP5p0ZiGIbzOrBAgUSbP/AqZOrxfGizZpR2n9H21quDlfQhFNMWYvTZJ9h53f5xa P/1016AqysEUDkV8BVh1qHiUqCXeHjF0SialbfuKrGmMVg8Sl2ZEifNAMqa/nKH4CCbC 2jGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=fDYf/1zmgKNKjKhgfcohx9pQW+K3uRqOoa+dvB2+KwU=; b=W26aWDUMaRnlQG2aWVdea+sNsYXPJTWBNPNgUhzqXowcDI+fYYZRpYSfKMQnd/Jw/4 Rex2kSGRlUf+YAlgNouCDSYi9Z6Db3uivodCFCmNf3CrLPUCOOHHQOMmq/oYyhFBjgGI rnee3rxKS6gbmvP4QuNnOUii+H0hvGKABUEiVeN/g2qmuDNIS5ms/M0GOplBszbVLVID rFnw1JtlB1C0vhbEwAPZWCUvlBCU64rpNhAZCKTA7HeTteXBJNW3xZkdkruMU/1RkSga Paqy8xbMJBqoYEYhu9/uOpSWcqgtyyzEktam5Jb98Zb010TcJ14XXoT5rJjEzePJOfV6 pEXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ap3g89TW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s19si12990697qth.161.2020.03.25.08.19.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 08:19:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ap3g89TW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7on-0001xS-0B for patch@linaro.org; Wed, 25 Mar 2020 11:19:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41593) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7lD-0003tD-03 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:16:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7l8-00084S-0W for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:16:02 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:34182) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7l7-00082u-QQ for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:57 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 26so5175977wmk.1 for ; Wed, 25 Mar 2020 08:15:57 -0700 (PDT) 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=fDYf/1zmgKNKjKhgfcohx9pQW+K3uRqOoa+dvB2+KwU=; b=ap3g89TW5oitenk2RhM1bRY3+t+rXXQJ78jp01F0wjpcIrJSMgDTHlE01xr7rAMv+s 0xs/tgYhtosn4JdgSikpVAWwslr7DaENMfN6CSus5iuIhs7PIqYwXuIr3DSZeft65me4 u0uN28dxwn1cKZVawx2UTPqz/4FuGTq3jHDq7n61tcbO4y6vGWnCkDzWCUN+g33os+wN +aAWsU5DW56i9bMuJEc+UK0X8MuLm+3Smabypmi4Umu2SsTWE6Z5rcSbH/3JPJZijWZR GcnuC1wGK8aI2DI1TvFEiJtLSMylJyvkNTjWEBkdYgBdTy4yS2gnSPo8XiD+CHeaiHZS PfGA== 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=fDYf/1zmgKNKjKhgfcohx9pQW+K3uRqOoa+dvB2+KwU=; b=na52ryuIViZ4XxFs5W+ywOjGeU05UEOMssrZURT4gk7lrgvjyPFGR0Ah51Z3iZYARN 6CaFP6+kI+zYg1TD96vSlBdRhEEs+UPoyZIVuJOc7UKM1XrhCu3TKDivUz3XSLsXAENZ yoFBVQ8Wygmzy0HT4//nZxmLqnds0aigkXS1XdrILNPcc0qepOhlwUxCDyu4ezUYLxt+ OkJaR2s0OvEFP7Scw64FIkqEcFfLqpSccqCKCH4TFEQMmqV455LyC0KFLP8IVpdhCYUv zoATmtd7/HkPScw31I0lzxoXuWAz0dRXb89FVO2Z0CxtZ6OSKlywhNCKaPsSCqkhra0E uxwg== X-Gm-Message-State: ANhLgQ0Eo0zRVxqW4Q/80H4gF50ja8s8TA4lna+W+5ySSLLD9zqrgaeh xbSf3BqipvpV0JErFSbb4PHIzERj+HE= X-Received: by 2002:a1c:b657:: with SMTP id g84mr3910303wmf.107.1585149356801; Wed, 25 Mar 2020 08:15:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u16sm34744270wro.23.2020.03.25.08.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 08:15:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E03241FF93; Wed, 25 Mar 2020 15:15:43 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 07/11] tests/docker: Keep package list sorted Date: Wed, 25 Mar 2020 15:15:39 +0000 Message-Id: <20200325151543.32478-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32d 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?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Keep package list sorted, this eases rebase/cherry-pick. Fixes: 3a6784813 Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200322120104.21267-2-philmd@redhat.com> Message-Id: <20200323161514.23952-8-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker index cdd72de7ebf..9a2a2e515d7 100644 --- a/tests/docker/dockerfiles/centos7.docker +++ b/tests/docker/dockerfiles/centos7.docker @@ -2,6 +2,8 @@ FROM centos:7 RUN yum install -y epel-release centos-release-xen-48 RUN yum -y update + +# Please keep this list sorted alphabetically ENV PACKAGES \ bison \ bzip2 \ @@ -19,6 +21,7 @@ ENV PACKAGES \ libepoxy-devel \ libfdt-devel \ librdmacm-devel \ + libzstd-devel \ lzo-devel \ make \ mesa-libEGL-devel \ @@ -33,7 +36,6 @@ ENV PACKAGES \ tar \ vte-devel \ xen-devel \ - zlib-devel \ - libzstd-devel + zlib-devel RUN yum install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index a6522228c02..019eb12dcb1 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,4 +1,6 @@ FROM fedora:30 + +# Please keep this list sorted alphabetically ENV PACKAGES \ bc \ bison \ @@ -38,6 +40,7 @@ ENV PACKAGES \ libubsan \ libusbx-devel \ libxml2-devel \ + libzstd-devel \ llvm \ lzo-devel \ make \ @@ -92,8 +95,7 @@ ENV PACKAGES \ vte291-devel \ which \ xen-devel \ - zlib-devel \ - libzstd-devel + zlib-devel ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 RUN dnf install -y $PACKAGES From patchwork Wed Mar 25 15:15:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184807 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp729864ile; Wed, 25 Mar 2020 08:16:15 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtS4A+JKmwvQEB2Ma95YZSLeqSwGdinW5dUgWHcn4JJpvZ9+wGksFcKaubphi2ptdhIzeiy X-Received: by 2002:a37:b0d:: with SMTP id 13mr3502246qkl.9.1585149375513; Wed, 25 Mar 2020 08:16:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585149375; cv=none; d=google.com; s=arc-20160816; b=Ln2zIxNa5TCBSZoa68HvbomYiE2pw8229qQZ7KmfhbvWCC8tQmausLe6RMl4fUQxNK eeaF32Rge0KufBbdJkveKsUC+vS0Uhlx4cxj3a2Us+/si92N5ZanQtyMcZlIp2KvlsLB GwoYvNSGzKs8LXLahNgqa1AYO1L4UpJ04ouL9JCSpnk8zIoqxWPg+pbqEZSXc8aTaSqj 5ZjvB0vS1COTOTO0xM+9aXcXGpvHdEm/x56pcD3P5WXSfUXLkYyPZagghx1FBp8L6wh9 QHaCdzH8dsz5ElpCTfxf+NwHLcW8Wu4ctzYrPj1cifP55doPeshKaHo92J2kWjT9gFZa AW0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=hddMp6YbU7VIRh+p3dmSk6KMYfcJvHBxPkgSszrgB38=; b=QaudDy0dpPghnvG7vQZ0THEb2ckfj7Fn4DEINdeW+gS9Q3Xa0GL1P9xsDR9uQPcPaU mmhOcarF/Z5UoVe9ZL0YmCKrPJbBp/LIJfClW9wJBmyImtQbbbsi1XCjEvmAc9piSf0I r6jJOsodJcME0NUOD1suwnH7bxPAxDpnbwM7yBux9Bdde+rbIqRZe8otgKI8YaTm7Vdm VltRU2K9fi1R1eD7GR8Ei5YkVlqtZHzE9i2R+5AjCDE/i7HWQYlvvjqD8ohb816js4+B SVCZ5NmQJNFOYEY+WaBz2uiBMIONFDbHEnomqBb5R/xzRmU0DKya+zGetKnFqakuQPtb 3XMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ev5FjM5E; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z27si12825579qtj.146.2020.03.25.08.16.15 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 08:16:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ev5FjM5E; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7lO-0003vB-VX for patch@linaro.org; Wed, 25 Mar 2020 11:16:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41564) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7lA-0003n4-80 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:16:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7l9-000868-60 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:16:00 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:44702) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7l8-00084j-Vr for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:59 -0400 Received: by mail-wr1-x42f.google.com with SMTP id m17so3554703wrw.11 for ; Wed, 25 Mar 2020 08:15:58 -0700 (PDT) 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=hddMp6YbU7VIRh+p3dmSk6KMYfcJvHBxPkgSszrgB38=; b=ev5FjM5Ew7LWhxoP6rZJMO+8+DPDef97WiPSduRHUtbI0LOpr6ET5WCwr7GLAWp/Bz IMveDXwSTXIKtl4IzvmheHDWd5p5gUGwP5pXFxG2URuPFaGmYNoH+PRyptBeT3Z4sMJC z7++NuGZW00IxHvfOw1CmgTx9McjTnrp83lliKWtLRSoQSTxURZsSeClIX73TkwTBxnQ AVSLayWkbRSpz/QQOELDJ2pnJQ/B0v9q5uhmamcQTjN/4RKpOi5/AJ0cklDxYzU2pvms kDNnOKMiYlcEKfbs9dXNm5Q7BTnmrojThRxyjKQemMZtxcUevFH/LFINERDskDhO6kNV rr3g== 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=hddMp6YbU7VIRh+p3dmSk6KMYfcJvHBxPkgSszrgB38=; b=R0sCjGHEH1q5O0i+5t9bJb45c/1x1XFJDUUGTYAQGuY9UnRwI/xKyzfmERLdM3IIP6 V/wjzHN+fWVECynWP0WEBb0gmz3TUCfB6kaI+WD1zFwT4akn191PIDqB5rh54pUPPfO0 IHdlgfvKIku006IXcnVC9V5sA4wGTaD4LjN5RDTuTIetxJ8qi7KDwAE2FM/dsQ5IRlvH ikjzYm0bNNUQQtPy1HhOOJp5e3L+64EZaArE2FG3N60g9IVV2ddtXhENET7d1yvHe/aS +VK1Y8kJX9USP+dbV7WfTXeZdA/FjBUqet8t3xsWUs0gVq0fvl7qgc3bOg8lNRGPiAWQ fZcA== X-Gm-Message-State: ANhLgQ10Uc8wzvOi+eGPEfN80yfOKT8qme1AOGDmA8YVjbg7ZmrqX+PW 5dk2gnshxEJo9pB+MrbDD09Xjg== X-Received: by 2002:adf:f2c7:: with SMTP id d7mr3926101wrp.184.1585149357904; Wed, 25 Mar 2020 08:15:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l10sm2851392wrq.95.2020.03.25.08.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 08:15:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F40531FF96; Wed, 25 Mar 2020 15:15:43 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 08/11] tests/docker: Install gcrypt devel package in Debian image Date: Wed, 25 Mar 2020 15:15:40 +0000 Message-Id: <20200325151543.32478-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f 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?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé In commit 6f8bbb374be we enabled building with the gcrypt library on the the Debian 'x86 host', which was based on Debian Stretch. Later in commit 698a71edbed we upgraded the Debian base image to Buster. Apparently Debian Stretch was listing gcrypt as a QEMU dependency, but this is not the case anymore in Buster, so we need to install it manually (it it not listed by 'apt-get -s build-dep qemu' in the common debian10.docker anymore). This fixes: $ ../configure $QEMU_CONFIGURE_OPTS ERROR: User requested feature gcrypt configure was not able to find it. Install gcrypt devel >= 1.5.0 Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200322120104.21267-3-philmd@redhat.com> Message-Id: <20200323161514.23952-9-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index d4849f509f4..957f0bc2e79 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -16,6 +16,7 @@ RUN apt update && \ apt install -y --no-install-recommends \ libbz2-dev \ liblzo2-dev \ + libgcrypt20-dev \ librdmacm-dev \ libsasl2-dev \ libsnappy-dev \ From patchwork Wed Mar 25 15:15:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184809 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp732624ile; Wed, 25 Mar 2020 08:18:49 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtkZyHE2Q+micD5oaIB6Gv8P/JSBMQdXR8iIipyshlxLy6vzK28Muw25uSL73N6/Rpl8ord X-Received: by 2002:ac8:6918:: with SMTP id e24mr3384124qtr.141.1585149529449; Wed, 25 Mar 2020 08:18:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585149529; cv=none; d=google.com; s=arc-20160816; b=WLsOR5rkHWC1bGABnlrC6tzo6me11iKZguxB5x/X1V9hyYXI8ptmHf0fQAXyztqukQ 3YuvjqJdze/dPpJgGTmZIRZzZnbxObMRm/51N9NNHm6AoqlOxE9fZss93DW16ws5zIRk rQb4rdr5IssXKcCMepQDQECENPUdDO5dMO/MOCYDIISxIpUcbXWUmOu8VPYLQF0eAWDd qEpHjEwaz96ZmAOVMqzGl2lZK9B1k6tZz9bwxxUv4c6AGos7lFhYFXlyHZosaL9Xxmmc vPT5WZj16mBDL7FXd5syZIL3Uxip+oK49FJ0oSgjxft5O8YGAGMnjLO6AQNvmDAc7PsP VutA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=JPoDm/Y8ADNX7hlRvL6Q3jMgQOp/FBsw/kHWKcLczW8=; b=wmrFq7wAtK9BbHwS32nsfiQvBsLffNQI3MWjrkMxp8DS3IPJ4jrlr7uIJ8a/Dfc+Kn CUuq6g//gxH5P0Pty1u8t8XakerU9S32LBJh3s6+F5E3UZTou7OzZnNc+mulpY2GJxlH Q1mLU4+eWN5fuw9aZIr63OPISc4EroS9Tg8eKR5vSsynLLZ8PhRZLgTNRSHT+ScecEI+ BdNB4j32UOsyzJSiyUOCwHqg634aXtdFgaOnYcToM7dq3z40Qb3hWNisOAn+7DBK4lkW VQ04pzw1CmuVYKJNuhHbevXx2aUmvOtMFpMmqcjy+Kq64el2VVI2B8/K4h9OojUsrPwL opUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bQnYu88Q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z67si12425114qkb.64.2020.03.25.08.18.49 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 08:18:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bQnYu88Q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7ns-0000K3-UO for patch@linaro.org; Wed, 25 Mar 2020 11:18:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41580) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7lB-0003p6-82 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:16:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7lA-00087H-9A for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:16:01 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:46372) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7lA-00086Z-2w for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:16:00 -0400 Received: by mail-wr1-x434.google.com with SMTP id j17so3522626wru.13 for ; Wed, 25 Mar 2020 08:16:00 -0700 (PDT) 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=JPoDm/Y8ADNX7hlRvL6Q3jMgQOp/FBsw/kHWKcLczW8=; b=bQnYu88QMuoL/4Kq/aCY+0vm7r3Yhb4cQ2oMoJ2Q5qzotE2CObYcldqe3d5M+H8xMn xe4RCeG5hkVpeVxKeu6BakdF6eonrzjZQSg8ygSmYfb0arvIrqWiA8yki/BQUIciI8UC IFnuTgdwXAPdKphxBEopQZsExLjr2BSbxG0u8RXt9qFdYRWbp9+8GX6L4S/oCdC5lJ5g 73md/sXcYDhSCzAy/KDLZbXU6EzA3h1/xPk82vVZ3OLygmHBWLCFitoMgf2Srr6rDasV PqOQ+wz+4v+6GqRI9twHB3fKwI3YTTHOWfoclcXN90f4nttc/Ytz+SS0taC4POTeAi6Z gq7A== 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=JPoDm/Y8ADNX7hlRvL6Q3jMgQOp/FBsw/kHWKcLczW8=; b=pzxFpXzn8E3LZBiPGL2/M1J+Q5J/cr+APx3bC1pODhIxJGeu6sdWCJGF/RT2j7gn/F /KOEwFgqQQi99RLDmHV84gXQ79o6QeNVBw54hz96nyjKH0In4GXqJ+Gy8SPpSxFptzgN mZQ6oiFdp4Q7ZuLASRQEu4q1+CD8nrp9kdSs2jJ6uYTuJN0M+wxPUCxoAFQIVjjCOTNa jPsRsFCDyZv3SVZJEJ4JdlKJ7bbyYyVP6rVeNv3yHUrc+fGKMNIZGYBmcT32naKS8uVj Rh51SC23BvYGjYqhfdTLHDtbM4lxPWn2Fu6Z4/Nsnr6W0r/uGaKf9hL4bblTcXkhpds4 qTSg== X-Gm-Message-State: ANhLgQ283kFo1cepV3lkSo0fk3R90vdhGDVFx9dnEIOUDvINugyFl4Je 5D1JTYJRlfmyA6k48vf1mxrAzA== X-Received: by 2002:a5d:6ca7:: with SMTP id a7mr4282628wra.157.1585149359149; Wed, 25 Mar 2020 08:15:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y187sm9898179wmd.0.2020.03.25.08.15.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 08:15:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 132201FF98; Wed, 25 Mar 2020 15:15:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 09/11] tests/docker: Use Python3 PyYAML in the Fedora image Date: Wed, 25 Mar 2020 15:15:41 +0000 Message-Id: <20200325151543.32478-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 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?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The Python2 PyYAML is now pointless, switch to the Python3 version. Fixes: bcbf27947 (docker: move tests from python2 to python3) Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200322120104.21267-4-philmd@redhat.com> Message-Id: <20200323161514.23952-10-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 019eb12dcb1..174979c7af4 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -79,8 +79,8 @@ ENV PACKAGES \ perl-Test-Harness \ pixman-devel \ python3 \ + python3-PyYAML \ python3-sphinx \ - PyYAML \ rdma-core-devel \ SDL2-devel \ snappy-devel \ From patchwork Wed Mar 25 15:15:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184816 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp742225ile; Wed, 25 Mar 2020 08:27:50 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtIOU+mPUsDmZa0Nzm198cSsa3mBVX9riZxirvqcmT2qIJDIUlafxup2DMBxjoVA/4b1vao X-Received: by 2002:a05:620a:1025:: with SMTP id a5mr3317681qkk.365.1585150070143; Wed, 25 Mar 2020 08:27:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585150070; cv=none; d=google.com; s=arc-20160816; b=jkBLXdFrL8nC1KCqCpO5lo2JvWl0eNNkGHtxSVR3lDXQu4nnXc+pcI9eUf1OMF1NKQ DBJ70P4EgDUCM72Rn2haaqqmWfzDVrrqrPwIIzXDzspoZAbtH8FWXTe13cHp80qMGLje MGTqiqbCJn08QLV5SwswXfm48K1ZO2k0/d1UuZp4I2yuUo7+rI7CNfl73N0cze+ivjX1 v4aXKwvha8rJYgRazAWAmkl984y9behmsI1pEDRGGhb98CVFMXUqGh/9z489mxkRQOgh J9B8pEaCkvNrymwKMD1Yz8K/HbO99LJbGiCh1rQJy/GVVqNP9sRqMXvXuu+bRnBVnObh 8D5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=5layH9MhNA52soaJZfTnDM8L+LTws1H3akJM1O6X96g=; b=VyBbUNkMRDNntVXC63OgqIzQ7Xt1dFPhQgB8UwdksSrKBRydD9NyL33lCd6xchZM4c B0PUBbwB/gmLKVvPGeSVI2aDgYOikcqtSureFrRlihknG3552QtP2yIGYFSwT3PiHKDI p/KL/MJOiGRf5R0OY3HaIp9HYhXacFVGGnCd9eBrffSvddktbVE1n9xD/7dkOqRLKbq9 yVw9XseJ1kiNeKakTmBi5nRMaAFn+QFziUEysRvNmi103DU8dRB0yFe8MXYZsQXWNfxx YIcO7IGBRWo0mLMhGygug3GHzJcWXhtmaMVAyoCIxgNFnWr+TAcCHUwFl4QrC5Ji45nd 118g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZRVSDPpx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z188si576881qkd.216.2020.03.25.08.27.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 08:27:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZRVSDPpx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7wb-0005pg-LG for patch@linaro.org; Wed, 25 Mar 2020 11:27:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41592) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7lC-0003tB-U6 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:16:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7lB-00088V-W1 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:16:02 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:35472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7lB-00087y-Pu for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:16:01 -0400 Received: by mail-wm1-x331.google.com with SMTP id m3so3158712wmi.0 for ; Wed, 25 Mar 2020 08:16:01 -0700 (PDT) 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=5layH9MhNA52soaJZfTnDM8L+LTws1H3akJM1O6X96g=; b=ZRVSDPpx+T7iLlCmRC4wKzGj/5iUc6p4Js6A3w+MQaBQmzd8SPe8hlwyEH8Vx/tiuR u0bzeuPC6EaO1Jm0pbQDY6yViICQcWa7s2lVUTYYmNB7EvHgsQx/2arrpgEHmU8RGnKL Ggh7gYwceGb+F6rjbeK8jZOuI0TPtwx/AjWdptWrDFQQPsue3oNZN2BsCjCuFNThCHjb LHraMlkJpvGZpsHR2C3nxS5i90P45zGA3JxJD2vFKOu4L2XJYCZjBXklx+Hcu+gKBLnh uQRqerwlKr4WNfyIHJaruF1Jq/Qhbs4/8Gr92cWvj30UCYQkVdyNBWLNynAuDaheNUrH 1izA== 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=5layH9MhNA52soaJZfTnDM8L+LTws1H3akJM1O6X96g=; b=TXl7FmdeZQyHcRxcdeyEA4xbkocuoiJfiKMGINA4AXIBXvOT8D1nRJ1y/oYjLq3psb 7mRdhMaDs9zkoVcrQ/0FXvcjYK9yDdlX6ewxIVm3YUOAa7pyFAy2IwXtkjwhK+1ZZSuc SLXHhCrim13HzGvqyFjp5xq3HjGdPTtni0vPURXy+fFtj4aOD2D7f2O1gq06ats1wjR9 lkWoburFW9J3SAod18kGTGawoO8PZP2SQhG4aBt838/UqHS/E7k/CugBVL4HWN3AW1rm ZPMlSZwuZwAvjmipjcAR7mD6BsxLA7Ce5tMHVWgoEISOZb+ySObVLoDEAsr+t0j2vuwt HJ6w== X-Gm-Message-State: ANhLgQ2lfnYtQQfh4DHA+1pjOmzanUJYvW/6kOYJG15xNkdIS+27PbDv dp6aSF/fp7FGjUrDh3tp5uMAvg== X-Received: by 2002:a1c:4c1a:: with SMTP id z26mr3925718wmf.11.1585149360628; Wed, 25 Mar 2020 08:16:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s127sm8920219wmf.28.2020.03.25.08.15.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 08:15:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 26D481FF99; Wed, 25 Mar 2020 15:15:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 10/11] tests/docker: Add libepoxy and libudev packages to the Fedora image Date: Wed, 25 Mar 2020 15:15:42 +0000 Message-Id: <20200325151543.32478-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 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?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Install optional dependencies of QEMU to get better coverage. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200322120104.21267-5-philmd@redhat.com> Message-Id: <20200323161514.23952-11-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 174979c7af4..4bd2c953af8 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -29,6 +29,7 @@ ENV PACKAGES \ libblockdev-mpath-devel \ libcap-ng-devel \ libcurl-devel \ + libepoxy-devel \ libfdt-devel \ libiscsi-devel \ libjpeg-devel \ @@ -38,6 +39,7 @@ ENV PACKAGES \ libseccomp-devel \ libssh-devel \ libubsan \ + libudev-devel \ libusbx-devel \ libxml2-devel \ libzstd-devel \ From patchwork Wed Mar 25 15:15:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184817 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp743848ile; Wed, 25 Mar 2020 08:29:25 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtR6T+eYkoODBot5+lrH9a3HVc9AHJbdHg8qyAj+WWG4Y7imx4FCLeBREY9ReEAJ77Bhu2K X-Received: by 2002:a0c:f905:: with SMTP id v5mr3504514qvn.174.1585150165344; Wed, 25 Mar 2020 08:29:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585150165; cv=none; d=google.com; s=arc-20160816; b=q8FXu10a6PxcK9eJS5srKPpeQuZveg03z+xUeCaMkoHplL62McPGDzWA9L3myIF5vm i7T47YQOL43XOxZc1wLLhKmy4qRExj2etz49IEz5kVvGIAQYNbmtu3chJEYJiFBoivW1 RFpeKlR/i7Iob7wqLgIwoTw8Ex3dcHHbji0GINIqfEAR7S6s24vMgRDd+qPCJ7Y2WQXo 8R7bEXN/e0Wx/LfyDMlgsvLaHEoe9+4lnnK81Hvc+D+UyCJqyMPcNErki7+xAALN8gTY fNByPJkHTFiW5QS0+azH6A69SfekJ9JalgH+u1wUAOquWqsutPkG/fOBWWadFF57Y0uz +Gdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=pz4+hj7n/yl99ow8yOnM+Gbx/Hl9NI3JBuBBYB7hHVY=; b=ZYqluCuadLmm1Cj4xQf3Z2zcrIA8nrgOrEV+VrBzRZRbN8KHQF6fEF739Uakzy70nQ 024f9GGaIOgb7Las0wUflNrQylxETEiIu6sqhrNwlE0qBfRqS46Jnj6wc/PNy3aILw6G W8dokMLduzON1BQRCscAiqKJAcvlDmz/OCfHJyEXipE5bJXBGcv+dZkPa+TcKaSkNsP7 dk/+/SJLhbO4KNtVnywyzpYMEo0wyvgd3XirARIXIipDaKivebX/EOF57Dk/fSN9GzCG dXVwzVudrEPgNqJgY1YZmAz0IwpZIxXsqe+MelZKLlfIQXKfokV1PST/2lhj+Us3bAi2 snzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LfPaQx8g; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q20si8754982qtn.318.2020.03.25.08.29.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 08:29:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LfPaQx8g; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7y8-0007jj-SN for patch@linaro.org; Wed, 25 Mar 2020 11:29:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42741) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7s2-0007cC-9w for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:23:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7s0-0004sh-Os for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:23:05 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:33278) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7s0-0004s0-Hs for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:23:04 -0400 Received: by mail-wr1-x433.google.com with SMTP id a25so3690886wrd.0 for ; Wed, 25 Mar 2020 08:23:04 -0700 (PDT) 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=pz4+hj7n/yl99ow8yOnM+Gbx/Hl9NI3JBuBBYB7hHVY=; b=LfPaQx8gRlZk1/KyUhutKckcHZ5Ibj95ZtbVVUULPwPM/aTqRSBI+tPY4pvpyRxPv+ RB8c5rJs04h3fFF0t+br9to61Elqi2cwOSAAI7Xtq1Ki7LaAlAGZ4zaKv+eXK9xcQowO a1z3PgK35CVpfYkSOiSWUsnzd4z3aZlxVjq77oT/B0WCcSDTXDtNogtDyeZDKufA93Uj lyn+HjDom1SPviJryRUyAsu63gdHifTVDWXaH8daa5zXif8t9yNb0U4aa0Uc+MBShm+m eO8a+lOzUD9jTuroOMnefnctzhrq/QXyXKZRgotO46XopSdlkIBQqNE9uOpawKG/+oGa qjYw== 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=pz4+hj7n/yl99ow8yOnM+Gbx/Hl9NI3JBuBBYB7hHVY=; b=CuDwQyT6afhIlubeiZZxEREistywW4brkRp46EJPH8pFiaDPq4Ggf5x8exwsyxkIAC x73X4lc6vkygXbULfsqrTVKKXX70vyLUjZOH/9YthY1F0GH9jnogntavV0QiTqQg2KvP go8qUBN8O9794kKQz8QfeIAwPwtX1NGA+d86KLIcq9CRLY4S8IN7McVCOYy4LtHYhhgo TSrQ5lWc8e/MqbqmLiXtK/PuZPCGrOjlQDFUVJKa9Tkf4upN0DZ23isnsP1/CJBGTz5Y 2T9yAWaCXhUAhZ/VoOMwIJ5g30vb42c6Y/byEf1qf8libeMK36u0j/tTIs363Ant9L8+ axFQ== X-Gm-Message-State: ANhLgQ3n23+MRALqBlhM8dyyAngDcT29UmXeisSLNXo4ZULr5RTKQLBD enpJPCoYdNzzJi9FtNG+o4usPw== X-Received: by 2002:adf:9321:: with SMTP id 30mr3886756wro.330.1585149783283; Wed, 25 Mar 2020 08:23:03 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s15sm33776554wrt.16.2020.03.25.08.23.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 08:23:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3AD271FF9A; Wed, 25 Mar 2020 15:15:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 11/11] .travis.yml: Add a KVM-only s390x job Date: Wed, 25 Mar 2020 15:15:43 +0000 Message-Id: <20200325151543.32478-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 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_Mathieu-Daud=C3=A9?= , Cornelia Huck , Richard Henderson , qemu-devel@nongnu.org, "open list:S390 general arch..." , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Add a job to build QEMU on s390x with TCG disabled, so this configuration won't bitrot over time. This job is quick, running check-unit: Ran for 5 min 30 sec https://travis-ci.org/github/philmd/qemu/jobs/665456423 Acked-by: Cornelia Huck Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200322154015.25358-1-philmd@redhat.com> Message-Id: <20200323161514.23952-12-alex.bennee@linaro.org> -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 5672d129ec6..e0c72210b7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -525,6 +525,48 @@ jobs: $(exit $BUILD_RC); fi + - name: "[s390x] GCC check (KVM)" + arch: s390x + dist: bionic + addons: + apt_packages: + - libaio-dev + - libattr1-dev + - libbrlapi-dev + - libcap-ng-dev + - libgcrypt20-dev + - libgnutls28-dev + - libgtk-3-dev + - libiscsi-dev + - liblttng-ust-dev + - libncurses5-dev + - libnfs-dev + - libnss3-dev + - libpixman-1-dev + - libpng-dev + - librados-dev + - libsdl2-dev + - libseccomp-dev + - liburcu-dev + - libusb-1.0-0-dev + - libvdeplug-dev + - libvte-2.91-dev + # Tests dependencies + - genisoimage + env: + - TEST_CMD="make check-unit" + - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools" + script: + - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF ) + - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? + - | + if [ "$BUILD_RC" -eq 0 ] ; then + mv pc-bios/s390-ccw/*.img pc-bios/ ; + ${TEST_CMD} ; + else + $(exit $BUILD_RC); + fi + # Release builds # The make-release script expect a QEMU version, so our tag must start with a 'v'. # This is the case when release candidate tags are created.