From patchwork Fri Mar 27 18:13:09 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: 185010 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1609888ilr; Fri, 27 Mar 2020 11:15:06 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuJMvAbFb4/1m+pcHANuXGjtDh5QWPnAcNwVVb56eeaiI221/UcZ9/eYGarKqyH2O3ADxi0 X-Received: by 2002:a37:715:: with SMTP id 21mr599869qkh.435.1585332906573; Fri, 27 Mar 2020 11:15:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585332906; cv=none; d=google.com; s=arc-20160816; b=LJWpUz5omz2ADXUs/AlFCVP20WigZ1anqKmQpUeWtcTe5iT4KIi6roYapb6f+19t7n NVhCxukqkZSdYWBEcxV+/w+YeK1uGSVlVrGOfIwb7D/YyGS3keIOYWWJ7reoiWdFGXB1 7qKpncb37xZKsJ/Rm/rxT6NXt3NBwItxD4654dFyELG/oXoD7Ve3nTKZkkNXnA+sb0Re HRMGQjF3zZmU8/AuL6X9ECa6f/QmZohWE19SRvxsel+UZ+/1zksgL5Ko3PtYxzEbNs/5 tNuKZUx/7+We7YMhq1gWx0HdK8gV+ikKGQQs4fASAoxJVKwVbTwvbEmabwOFdNJJmg91 PMdQ== 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=mknqnLXNdO3bv9jIJ1lrUIcyeKoH8TMNeDvGSd6HYu8=; b=I2Px1pEMVno6l9gooNOm6cVVzokyXqUo11RIsqPm65ETGkvAOxvYjOVWjNB1r9wvCM iNMrbUF9ldedHFkeH/J4iDlpEp8yd+QMuPBFwYiuU4YjavDUeB8n0H7wcJZMMB2M1zsh wdh/2vh07pFL0XKex+lwmjxox3r3ho42mn43AswANFkU81G29RcqMQiSYgxkeOlqYY/O tIY5YSwV0V1aPDliTNKXFcpodkIRxCCzBibve7lASd9tTY2smTiC/LVDETPfTeMs98+D NS5GJLeakdDFUJEXLFWs0rVh9PPQ+KIZa+4KwCAwf87mbLcdPwhM1UfUvO/aYloOzE/q vwHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TcPB++bP; 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 184si3914779qkd.364.2020.03.27.11.15.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:15:06 -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=TcPB++bP; 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]:45300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtVa-000520-0G for patch@linaro.org; Fri, 27 Mar 2020 14:15:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40439) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtTy-0001ip-9c for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtTx-0000ds-0v for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:26 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:44030) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtTw-0000Yr-Lt for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:24 -0400 Received: by mail-wr1-x433.google.com with SMTP id m11so6663190wrx.10 for ; Fri, 27 Mar 2020 11:13:24 -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=mknqnLXNdO3bv9jIJ1lrUIcyeKoH8TMNeDvGSd6HYu8=; b=TcPB++bPPZIvNvMS0exK3Uls0hzzw7XKDGUkqXGuYcIu0WifnP88RKYRT8dYyIVjd8 jhKqOD5Uj5LRTy2cwLfni+dzvTfaKk2zcLa1n/GN8j3ZkPzL8CRdmaPCPnbI+UKBsHrx YeyimjLRdtGcXUcy6iMlXk35OXJqAOyha/4quV2hzOnNRG1nuYmAUHfFVYnhTYTt1+UT Mnu4x+UVlr03hxxuhW4PL0s7IOMdFZ6zw346UlSsN4PdEJPpx7eFhkWUynArYOGR7DkB b3Go3GMsNu3zNUboYwvKRSmsfizbQREYmxL4rZH/5bJCLBfZ/imPjT6nSvO7VyY0Wha8 DoJA== 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=mknqnLXNdO3bv9jIJ1lrUIcyeKoH8TMNeDvGSd6HYu8=; b=s9b8Q8V1fJB8WbHPTh6MlctvZX/jCZiRDBEsdot7gMRO5ED4MKmw0u6BzIEMmwHKLw O0BvI3kwda98fo2DTJ3bMfRDL1L4THekvqWtg6+XCSZTHSO7PBuK5PTQjJyI3nhUfVJy rE94dAUA/WsVxgHQM5IrjXLyIvo6+zgiIJLJF5Lwxi5vuI11p0783ajTVpdxCIsaF1JV ZhLdsNKt2FibQFD3KkDxt7TnzgVQ2gbdthxcYDM6OHVyDQrxISIOfLOMighOi5ddjJe1 GlL/4zK+53hZhO2Keio25WtqmPZ0lRjOsvRZ6N58j1Co3w9Ysbn154+1Pir1D9NDtnDB r9eg== X-Gm-Message-State: ANhLgQ25kjmZxAikEBM00CqC+2EznntdRiTecLRgOCAGTDwYuFCg/sil NBfvvSzCxE6oeSncAQBrbQF4Kw== X-Received: by 2002:adf:9d8a:: with SMTP id p10mr663293wre.190.1585332802957; Fri, 27 Mar 2020 11:13:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z203sm9214902wmg.12.2020.03.27.11.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5B4011FF87; Fri, 27 Mar 2020 18:13:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 01/12] qemu/atomic.h: add #ifdef guards for stdatomic.h Date: Fri, 27 Mar 2020 18:13:09 +0000 Message-Id: <20200327181320.23329-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Deep inside the FreeBSD netmap headers we end up including stdatomic.h which clashes with qemu's atomic functions which are modelled along the C11 standard. To avoid a massive rename lets just ifdef around the problem. Signed-off-by: Alex Bennée Message-Id: <20200326170121.13045-1-alex.bennee@linaro.org> Reviewed-by: Richard Henderson -- 2.20.1 diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h index f9cd24c8994..ff72db51154 100644 --- a/include/qemu/atomic.h +++ b/include/qemu/atomic.h @@ -208,11 +208,14 @@ /* Provide shorter names for GCC atomic builtins, return old value */ #define atomic_fetch_inc(ptr) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST) #define atomic_fetch_dec(ptr) __atomic_fetch_sub(ptr, 1, __ATOMIC_SEQ_CST) + +#ifndef atomic_fetch_add #define atomic_fetch_add(ptr, n) __atomic_fetch_add(ptr, n, __ATOMIC_SEQ_CST) #define atomic_fetch_sub(ptr, n) __atomic_fetch_sub(ptr, n, __ATOMIC_SEQ_CST) #define atomic_fetch_and(ptr, n) __atomic_fetch_and(ptr, n, __ATOMIC_SEQ_CST) #define atomic_fetch_or(ptr, n) __atomic_fetch_or(ptr, n, __ATOMIC_SEQ_CST) #define atomic_fetch_xor(ptr, n) __atomic_fetch_xor(ptr, n, __ATOMIC_SEQ_CST) +#endif #define atomic_inc_fetch(ptr) __atomic_add_fetch(ptr, 1, __ATOMIC_SEQ_CST) #define atomic_dec_fetch(ptr) __atomic_sub_fetch(ptr, 1, __ATOMIC_SEQ_CST) @@ -392,11 +395,14 @@ /* Provide shorter names for GCC atomic builtins. */ #define atomic_fetch_inc(ptr) __sync_fetch_and_add(ptr, 1) #define atomic_fetch_dec(ptr) __sync_fetch_and_add(ptr, -1) + +#ifndef atomic_fetch_add #define atomic_fetch_add(ptr, n) __sync_fetch_and_add(ptr, n) #define atomic_fetch_sub(ptr, n) __sync_fetch_and_sub(ptr, n) #define atomic_fetch_and(ptr, n) __sync_fetch_and_and(ptr, n) #define atomic_fetch_or(ptr, n) __sync_fetch_and_or(ptr, n) #define atomic_fetch_xor(ptr, n) __sync_fetch_and_xor(ptr, n) +#endif #define atomic_inc_fetch(ptr) __sync_add_and_fetch(ptr, 1) #define atomic_dec_fetch(ptr) __sync_add_and_fetch(ptr, -1) From patchwork Fri Mar 27 18:13:10 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: 185012 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1610350ilr; Fri, 27 Mar 2020 11:15:37 -0700 (PDT) X-Google-Smtp-Source: ADFU+vs2N3E5lTCy+bkHAIPy7njbTgCC03nBRiJv3534UB+ii4uPcIJDqTIGsQHGByz5HB95JvIT X-Received: by 2002:ac8:1633:: with SMTP id p48mr506356qtj.305.1585332937283; Fri, 27 Mar 2020 11:15:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585332937; cv=none; d=google.com; s=arc-20160816; b=0WU2vS6Rddsby2ALGwAiMGCC9t3y9PANCHM74kfG1RbgK0QhhrYadNnHjSrOafS3Fc sNACpT+4UfO7GPua7E1T/5ympGzt0rvNakqT6z9FcH0xMf+tDgzFbcP5JMh7YDMzw1wS 0VsdA7Ci7jBNvYmrxy5PQ6+pnwekVNWCEB/UljzELNTYaHVD2VKu15R4t+1kS1mzA4pF EbE6ctwh2zHPSlKyb6MkNz74TEuG4DpIwwwWPRS6UAsIxjnpEz8PcV5pXfQ8enUtfo9V tKRZQIISLKP+nVetyoim4YbN3IAwXe7VWC6Rj5xJ3H9KoF2Eip1eMq5OYyyULT+wUjnF i3KQ== 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=vTq10xlRSAgJKBJFPGfnLBySYA5kl8ZaRkBkzhylz8JtiO8QkcpLPsUD8GuG6xCC0E JOJ1hEueGfyByxamK7vX6iNyQH/nBVj2EvQM6lpXqHG9kNTChfNBkJWt4W5LZ8mqHB+L m03M7u36dVP2gi+OiDo3RKQ+s24O+GLewSDx5UTIxFSldXRBRUYRgVsYFi8ivu3f2OEe QDPynLvxRbiDdxxvupgvFPe+Jf6QYbXVz52TaUDQfTlEevpNFpZJ0i3qBt/DcA51ZDPq sjTPTSOp5BWyzvFvrBa1jbn8A391QzTwFni+vUBNy9FLF+Nn4pX4y56VZfdUN2oUMRYZ 1YcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JXWLUWWD; 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 m6si1286352qvf.209.2020.03.27.11.15.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:15: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=JXWLUWWD; 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]:45314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtW4-0005Dz-Mj for patch@linaro.org; Fri, 27 Mar 2020 14:15:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40472) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtU0-0001ll-Lx for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtTz-0000ib-Ov for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:28 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:50681) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtTz-0000h9-JF for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:27 -0400 Received: by mail-wm1-x332.google.com with SMTP id d198so12436020wmd.0 for ; Fri, 27 Mar 2020 11:13:27 -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=JXWLUWWDRFiD3ptFdy/HuWqTIY4aC8tmTMIbODVAEFnJCWV20yIYn3/gRJ22Y4NRt2 vOnm0ewqvTnptRuf/mx3hug//Bd1XhIqPmU4YVrK1q9KMsN+5aX6BBhN5b7zaA9s4UjX bICQ1/Bjp2InROzJHfB5+G2+yKmMjtYCBV6VAjaZfryisunxgN4CowxK8n4cvkN3jbrA dsxByfeBaTwatrWwRHBsUjCCRepCkYu4T95dO4USLt1D2OYSpUA2GaH0kNqDrOiKTZhi TfEtrsTNqqC8h5c8XHwZwl2fAgV50YoJ3krE2XITEteFq9hGczaeyQBrLsMR6Kd62ccN h/wA== 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=cszCjVe67sopQ7D/Tvx2LXlpZk9JQPl/bMYpboXSSUiWOCyowiJ4fLgLV88eUqXFgA r7rloYJuWej5jPtho+iT7tXZ1e9Az8/FuE+VWJL/k6NL7M9uElQP8w/8EQn1mCVq0hF6 gTGu3Ga+hmrqciPFDMUtSRrPWJr3Qda6378GmKqn9QW9uaELWEn0tjPjs3SeUUcp9xoh baYgvk7vranUthMNfpJx1XHCJAT2DphL66D6bM1AhNTq4mJx7+il6elTXHvfA0whb5B8 +uuSZnpM8nvy8UFPqFETR748/Z5x4P36XHNOOcn45BMsyOSqSUOAebYxNyfUU8mjld/r 4pNw== X-Gm-Message-State: ANhLgQ1sfTgMd4LAQnxOQgW3pSXxd7pxasigO19e+aF5M4CaN5Kl1Go+ VhVknTbDbix3uHMxt1PcUw//s0dwyrg= X-Received: by 2002:a1c:5641:: with SMTP id k62mr6953630wmb.82.1585332806566; Fri, 27 Mar 2020 11:13:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l4sm7998434wru.1.2020.03.27.11.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 709911FF8C; Fri, 27 Mar 2020 18:13:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 02/12] tests/vm: write raw console log Date: Fri, 27 Mar 2020 18:13:10 +0000 Message-Id: <20200327181320.23329-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-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::332 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 Fri Mar 27 18:13:11 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: 185011 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1609926ilr; Fri, 27 Mar 2020 11:15:08 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt6PpPpK2O/E57GSRmtlkngNVhZg25g3bkJK/Hy2x00PeewOzyVNVMTO0Squux0i70NYrXB X-Received: by 2002:ac8:3072:: with SMTP id g47mr535802qte.278.1585332908770; Fri, 27 Mar 2020 11:15:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585332908; cv=none; d=google.com; s=arc-20160816; b=zKSC2CcsjrmhUuKoCPmirDSME9zu0Qej0WnAL9znNJi3y0j/NZowRnQtXirTc98ezg Rg+yUbMwq7sfDW8AkUFkP9SYKYZpCuQxWGZHIlFXZiBRburIYdsXbsCh7cLexmHFWyFb cBCyJA1mL1HUeIgsgFs6rE1rUKmDbdBCXXUNR+01x9XOwKaTZ8vqxAT1TAK07FNF2weS tEssEIn36Guy3PQcouJdwWTV6TYN63kcIL2heqtyXozsOPlz1/I0ebdiyAQgnBOFH2na bg3hia4cbtfuRbvWqI5n5gksCwm442V4CoZx3pQGX62xBaba8XLUXikKXY0ce19oPo0Z NqVg== 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=vu0QXTjCCeVB7EsLanXSYMst3qAMDCwdOcRh2b4sXJIXGZd1thzwFvhueeRHNYX8vj HqKRbO38Q5wX+7LQQ4bnSTDN+s1me7A5+uDyPLzlyE8+9W1fe8+l+LDmbEQSc7xcAHcg WDBszxRIkzNOB+fiuwJQ5dt7dJ+hfhRO9dKWbE2mm4hrGvPaLoKsqfciRjLps2Z5IQiQ sZ7t5gwLcX/stO0sz53cMbg1nMNrGjZpe7lrtHIb6K4COyA3XeKgntIzR8n3gnCX6BuC fzZr6ritKV9dL56ZXVjqNggtE0mmSg0Oi/VL239E7AuqvIHqoyZ2adgm8R8HZpY2/DTw Ia4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Z9I6ODyF; 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 b6si3710797qvo.110.2020.03.27.11.15.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:15:08 -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=Z9I6ODyF; 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]:45310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtVc-00057W-8B for patch@linaro.org; Fri, 27 Mar 2020 14:15:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40459) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtTz-0001kg-MS for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtTy-0000gk-Gw for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:27 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:44022) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtTy-0000fp-AU for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:26 -0400 Received: by mail-wr1-x42a.google.com with SMTP id m11so6663353wrx.10 for ; Fri, 27 Mar 2020 11:13:26 -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=Z9I6ODyFcuBBChjXasaT5mQtLEPar3QkRaY4PedHhvyIVj6ezyCUsX3oxY8Z2dpeGj 3QLWECtZE4CTNhUSJUBqtsxM8R/G12+RSwRL9u8EewsucON4rwDkL4PRLD1wUOQSFJwd 0b43TpXF6dFMfs7D+gaR2LsfD8r6EV3IYLJCuxFVh97sX1AGTj33np3hAuusRKhgFPfP Wy8vpWf3HfxLvzjgVchD/tXf78NHRDlklhKUYwV1WoMCvZ2CUf9BQN4ozQm2Ui8engNS dfkiBU8Mh1UT0gUUQibi+qRylLNbhLdEbmU1PPgULRX7NRD2Fo27GtU5nGkw002K8UAh 0ukQ== 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=Md6jZnD/QA3IGVcRRVovzRdlKcY8d8HxrFE2ArErpCh7Owzl8AJuPvj/BfQkGh9gqT mldnYSCAa3tnR/2rPdKwkanOCfFKKLAFxQOPhfJvD+UOaJc8GsrK0facKic7DsQHLLeF frbEsoFwVZSkEm9MPVakk1I9Oxx41/yt6teWzFEUUMT/IZvqLv2RaBQWNB7FKnFSSRWB O3VVNtjJPuwhDdKZJ51nLdNYchQWLmPbyDkROQgoQW8iaZjt7JPPniyA5TYiducWsAT+ NO7EHy81E9/IWfBjDMHUg9pvWOdaIWNHX0vy9EwHxInd6rJdv7xtPMEJ9A35NEgnDU4T 648Q== X-Gm-Message-State: ANhLgQ3NMjeLnoaInf5StfnO3PkjKZTvH8H4ERTT4Yn0Kfhr2XV2gytD GOHrVaLkxDipe6vI/piYLF9G+Q== X-Received: by 2002:adf:8182:: with SMTP id 2mr646042wra.37.1585332805271; Fri, 27 Mar 2020 11:13:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n124sm8489975wma.11.2020.03.27.11.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8DA981FF8F; Fri, 27 Mar 2020 18:13:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 03/12] tests/vm: move vga setup Date: Fri, 27 Mar 2020 18:13:11 +0000 Message-Id: <20200327181320.23329-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-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: 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 Fri Mar 27 18:13:12 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: 185015 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1612594ilr; Fri, 27 Mar 2020 11:18:05 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtDgGmNUyXDzIzOAT1y11nGdwd+RdIs0RzAL3gdrUya2/VPEUrOqmIg4lhLto8JndwJvNfV X-Received: by 2002:a37:8101:: with SMTP id c1mr636911qkd.236.1585333084912; Fri, 27 Mar 2020 11:18:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585333084; cv=none; d=google.com; s=arc-20160816; b=DDRA/kXHbAXdjAb3alH2OIV2E+/aWBTbwnpzU1npOjjoFPpnN+Ky3CXFiGS1wJXqqC HMtFV+YxXXAVZo96XXcAaRVRQPHCGR6RtXVpNoOwVljpaE99rBjikQt5koHpYyrhcMP9 JJx7+cA9wu+oUvL8qgpEocvKi5hGdnB3h+ze4FsmcOunBJMdEl01fGfQhzo9bQd/iZSn TNjck2iOEfpR4t6uOtUSQGAAmJ13DJPrfdItXw9kHpsU2zQ67rWKdJSfs3bmK6Xsuc68 3ZesgOUu8LtoOkmLWFAGOZjYmRMtM3mOxAoRVZACc8K8gmzMSXN8kVNRPBJ0giYocnkO E5aA== 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=O0Q6UbE+Qa4lyl/ME4ABxB/G3gajCsLLzhamMGjKdHjjDSnN3crHMgbi2ZEmyH0BcE chYtwnvBBOk9oPqlmuDPdowk9B2kjGhouEdAMOximpmjVnNjjAXXrb2hEvh0NFc/spS0 NNbfDRotZesmSoy/fyktYYf3d/E3uAlxVeWEoDEWFGaBCC/5Zd6SEd93JWJ7cWxFYMag Ed3tfq1kec3lyNL+L/10UYTG2nMGEIp5Ac1ed6/KVpHiGSj/5YYUxHD7cn15g2X+Ll3C 8JvTpEs5wiDnHsan2ryE92rh5AOKtk/3q9r0zFalsnEvYONgJHeF+3PK8F3+w4cEly37 itsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WsF0c58M; 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 76si3809070qkj.200.2020.03.27.11.18.04 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:18:04 -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=WsF0c58M; 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]:45372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtYS-0000IA-ET for patch@linaro.org; Fri, 27 Mar 2020 14:18:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40486) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtU2-0001oX-2Q for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtU0-0000ji-Vm for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:29 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:35133) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtU0-0000ip-Pw for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:28 -0400 Received: by mail-wr1-x434.google.com with SMTP id d5so12606097wrn.2 for ; Fri, 27 Mar 2020 11:13:28 -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=WsF0c58MkcHb9XoDr0jA/5/kGC60lc7fehFaPkLVtrE1lLp/Sl99Aj8b0e2Cft+TIA R085JqFWM21awGJxIG869OoGVlpX2ptp49NEgY2axWY6wBjfFaQCbAMs+aHr23m9AgHf momcbsfLJKqBOidlUwo+sPF80b4cWIZkOg3SBZ/UYVgzilpVr5vzhMLQL+8SFrq3XSIW 9AxKDhZ4shkcIdTW8O/lt4QOfjBa0mh6g/yyou99gAIUN0fEmFJltofaruBc4svIRzYg kHpCHNPZJmnESIb393mnU2bk4nEN37FMGSypzkeYU5nkLQqKaWSUirRjys/r3yHTDEhC 88mA== 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=EN0lE5RD44Ge4hPiOMyV1DY5QakvAGcv7DAXq9OHhT26+b42vHCrIZpDLZ/RcsOKg6 xDd+mumFgwkNmKFR7FRCYcn4jFJJydSfyV3Ck/KhC1MW1V+jQ1N7jUriRGwKkh3nhJGQ H6VG0a199T5qxP0oOFe6nzOhHxFepK8KcWhzA/nXYCH3oqMDuUykvy0mDsr+Qvsbzcgj 6yEDXtDCMepXjthOmd57FV8MkupvIXr/eNu8oe5MBhxqb97XUfgUETZkSmsj5erp4GvU J+MaafBvKl8YRLGjS+Ib2/WC+aah53ehpEmXjlN+vT9OB34END+ZqlNO0xmwJcFUJKyT 0jUw== X-Gm-Message-State: ANhLgQ3oIZHyJ4uSbE9GFbhBqw2ZYV74mkqdNuuoxhlqxBCoYaqxeVum VNrpBHmAJ7nhRZHoPi5f20USJQ== X-Received: by 2002:a5d:4489:: with SMTP id j9mr648774wrq.161.1585332807754; Fri, 27 Mar 2020 11:13:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i21sm9468489wmb.23.2020.03.27.11.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A224E1FF90; Fri, 27 Mar 2020 18:13:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 04/12] tests/vm: update FreeBSD to 12.1 Date: Fri, 27 Mar 2020 18:13:12 +0000 Message-Id: <20200327181320.23329-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-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?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 Fri Mar 27 18:13:13 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: 185018 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1614318ilr; Fri, 27 Mar 2020 11:19:55 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsu5F66j+2xg8HIGywaIi+JGTkAI/eYAufgda6a0nZbUWmqfvNmjwR7oa4zUeaBBYYFZ3Zx X-Received: by 2002:ac8:67d2:: with SMTP id r18mr571667qtp.178.1585333195054; Fri, 27 Mar 2020 11:19:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585333195; cv=none; d=google.com; s=arc-20160816; b=T7v7+/Mv8rNmjWjBL5VVFp1ummtL9dgfLZtYbwGieog9+/lBxo1JzCAnOpItG53TiQ AJkVhQX1cnVKBOadBoQ3U932eb2MSB0QSBQxXVowryGO2KVfcvTUt55gJ2EDbLfky++V LvAEWUWYCdNpaUNZs4+z4CctWksjCb7zPZ+1Ly69oSH7qCYuNbxnbSyDQv3BjyhnLMLC 8QIJNLgaN4zNMRgqpo4e2lzXaV4zmeuL9FATA9cEtpm2SS+vS0mvYeiJalm+5SFPI4cT LOieXoQnRXPz6P0PoJllzrJAPQCrCXwWKR6FK7suuap3MyDajgfsUGgEUg0OpLayw393 4BEg== 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=I7TkMNvZnR+nVuzlRLZsVj/aAMvYHd4IEZZsmhgWi7VXgBoMKOAS7Xjg3BokXd45bw JMPt55sfCf9ydXJSJtqtTyPB8wrGJzPQ+oFMs6CDziMvFjUGdyILnWUldE/25hV5OpPD hP+xFP7GkZLxZdrGpJmMaurbiZdvlFeIfUMXaVtW2secVBtbSGfax8wCeOa3iw7JwICh eR3r1CriGoKNYs40glAgnzoOQiwUBMOWE6rQ7hN44hVQidiE1cQCZIKthbkBZjpJT8Dd uiApfK1Z2DjMp8OVVnlmc0U1c17Q1ONpK4q4V2i29xRqdy0nGs23dGtoMGGYwO1qmplU 506g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=f2MGy5GV; 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 d17si3921739qvf.17.2020.03.27.11.19.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:19:55 -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=f2MGy5GV; 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]:45418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtaE-0003eg-IS for patch@linaro.org; Fri, 27 Mar 2020 14:19:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40502) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtU4-0001ty-6I for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtU2-0000mW-QV for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:32 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:38913) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtU2-0000lZ-Jb for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:30 -0400 Received: by mail-wr1-x431.google.com with SMTP id p10so12550669wrt.6 for ; Fri, 27 Mar 2020 11:13:30 -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=f2MGy5GVTqIceuk4wEfuc6zFJp5u8yDcAlqgY6yuVj5ZEU2I+V8PVrc1YRdL4CEih8 nMxtuqCMwH8xrDhn7uTk5qIp8zAVjPzQDzaeiQX5fnzNOn4Q8VzwZFzXgAKW9hmhawQ8 BP38sPOOdu7vdqyLDz7bGWAAzcZFdQ851dZTbJjF5ed+NOoeeANpRbuEtcd3eWSXbh8V Qd7fzc/28pQsWj4HewEKt0ZlVktGCHwVn2DAEj1xOpiKIgtoypeIXmxZ3yWEGqT0EGbd RAE2qiceJski2YSI1AdErdjUinnt4JOiP1N4uMK7/uyDMdRK9eJ6rn7urjktf+hElRmZ cOJQ== 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=A2PVi41pLJI13gunSjUR7X6lm+XOLNwTzlkjwCAO9LX+OKaPxN7KXD2CyiQPOrQ6Vv UGubjEcEmW3y+YnLZMFYxn0Y+X4Gzxpu8ps0qDGTP2iY4KwcWIRjE/Y99HKcvp9Ds371 URzh6CDe8up32KGd3MJg9QVhR9Bs+NgEiFu5Y6ZFaC/mDqyr9nPwk30rYsE10dC8fF7W IaylBZqLPZad40YLNzAQRw4IsleY7kYKwseCjs5hUETqUbY/L35m7QeLWXsdK61QcZb3 hw4gkxsiRdX/Q/9uN9+5wQv+sYJtb9G85f8u7l/Un5fC/mlzbmXobQdUkWx3GizuhZ9r Rziw== X-Gm-Message-State: ANhLgQ0VQzCbzf0sRHAps0lR65XtKP9KgOjPiCiTNXfYYV+M7WiMFp4g ejeQL1vZ+RwE02yAhub+ZB2eXg== X-Received: by 2002:a5d:630b:: with SMTP id i11mr674978wru.94.1585332809528; Fri, 27 Mar 2020 11:13:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i5sm9401178wrr.12.2020.03.27.11.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:27 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B9B641FF91; Fri, 27 Mar 2020 18:13:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 05/12] tests/vm: update NetBSD to 9.0 Date: Fri, 27 Mar 2020 18:13:13 +0000 Message-Id: <20200327181320.23329-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-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::431 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 Fri Mar 27 18:13:14 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: 185014 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1611912ilr; Fri, 27 Mar 2020 11:17:16 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvKSfmyq9thwT1vABXVS96HB2n593snruj3bgq9q9iaOdAyxsN32IDo71QCCsVpsT66AoWo X-Received: by 2002:a0c:d601:: with SMTP id c1mr547005qvj.164.1585333036164; Fri, 27 Mar 2020 11:17:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585333036; cv=none; d=google.com; s=arc-20160816; b=eyV0wVAc+xlPU5qdA8Twit/2dLDQrAVWQJA/9QIQ9fEzlbN9vU169iaxkw3upGJi16 QHSZ239ofaDHPcKdsqbNcdCKKEbB5nGCwyd20oHT7kyGXdEqPWRGJr7liA9IpBwfavAo 5ux95VP8x7j6cZ6RVG3ByvlCMCDabF4H+p8Y1Ls0hsm/F5BGfy3491uRyDNOqqcYepHs dX0WcCoeGyjnocalizyooVjkS+tUBEStOc11xQsRDwvIFFWCunNE0WHea3+OPu7fpH69 uVM/0gYpvBFdL5A/MjcHxNHOpwD5QJg2kC60p02qV0YG4VLvgYpz7jcq/XJe3en4//hQ gg9g== 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=c5pns3n5psRsAuFiFC0HDTuxD0A2N657GKZDHMz73tEmEJ7PXUQEtHn3Wz0/9dKYlv 2vqTx2amIebLo9hu+7VB1SgasqaHV/0cmR0U8VoURcHGdE+q/Hp7hZa76la8QsQ0dSyJ iAAFH/yz/TwjPub0NoySLwhHFX/+yOMGcc11RrvIPczV/eqGw8+YaRG+cUJdlH7S0Cro dASSp/8xqM78n/QqnLNkriHMwW26qBZ8qDUqJzy8ORTHjl+GfTrBogSAKO72UAFnA7bi uiLMXZ5FJ1Qw6cw9ec4+bQBM5IMFkbrSKP0NIrMeAs/S3XKNu+XYgFt0TTE72vuK/mOw C9Rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=U6cSY60O; 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 i12si3923210qkk.217.2020.03.27.11.17.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:17:16 -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=U6cSY60O; 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]:45356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtXf-0007vw-HG for patch@linaro.org; Fri, 27 Mar 2020 14:17:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40513) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtU5-0001wh-3m for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtU3-0000nP-QR for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:32 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:53886) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtU3-0000mk-KR for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:31 -0400 Received: by mail-wm1-x330.google.com with SMTP id b12so12404407wmj.3 for ; Fri, 27 Mar 2020 11:13:31 -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=U6cSY60OvvSW+ZuiJYUQU7R9lac4nTOUAZZmelcA/r2coyS1rQ8G3XOUlFXI2twgOC RQ4IgVtl5G6ZAV2XH5sLFohSBHIQrS/sX+mNs1mS1SO0uXgHmQcI4aRr+m//b58HhOAD ZXwHD85x8NEdyULRQnPY2kIb8XmazrZ8QMHbZ+3x3j72XRCa5do6BxgybHEcnMj5LIXV JJz72Lu1/0Mf5551sfkB/cQrzv6D5SNs71Wx7nA3TCBVy4riqrs/ez4a4+hyvOvkWTmB NRQKfpd7txNFxd9e5n9eZj/kukz4+I4wJLgpJS8xs65734oosGWEEwG/ViX3CjpUeQ+L 52xA== 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=NmYDr4LPgcdzTsbRaylZZfdrFmaXxgJguJheld0mr+qb3CmOye5FdybCvL7gVOfUvu q1u0ei2/1NcjFMVF8wDKaJMHy1+jLWKzyCvSaquwEdPAYynM/iPvL/jyFbDba7QTBrwr seC+bAoBcSu3db1o4VR1yxTprsjHxNzlAiozrLgsz8r3XzMnktjLRh6hg7GkGEjdkhvh Bok1/bfl4KOaF2ZQN7yNqJ66WB5kOpvcssvmuT9dJgnounhVIBAu+37zw/tCyOu8TAgA PVvwvqLDJCxM+Hd9Pb6ofILgMKsdhsEJMga/I/QiKFm5B/HeAbizY16hUaoNPcO6j+e3 nqhg== X-Gm-Message-State: ANhLgQ25Vb5CgaJUE47QMhxg7konMvF4pJ/b7oocYVX0FPJb8PTUJHrs saf3MmgPwiZ5iEwz6WiIQ+ESoA== X-Received: by 2002:a7b:cf09:: with SMTP id l9mr970618wmg.11.1585332810461; Fri, 27 Mar 2020 11:13:30 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 5sm6018729wrs.20.2020.03.27.11.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:27 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D046E1FF92; Fri, 27 Mar 2020 18:13:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 06/12] tests/vm: fix basevm config Date: Fri, 27 Mar 2020 18:13:14 +0000 Message-Id: <20200327181320.23329-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-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::330 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 Fri Mar 27 18:13:15 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: 185017 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1613937ilr; Fri, 27 Mar 2020 11:19:31 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuGtLGKM5ytqDMRVaCh2WcusdJRP0vG90EtHP5RBbH3WRRasQaZlpCPeD7wU7BnajXB7Dzb X-Received: by 2002:a37:9f42:: with SMTP id i63mr669468qke.192.1585333171583; Fri, 27 Mar 2020 11:19:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585333171; cv=none; d=google.com; s=arc-20160816; b=QvpB83Evzv59SIUDKRQ2qhy4jnGLGl72RdWrxjzh2WFN52v0MazqSjmydRFD+pciai LPCqYuYRlE2gH8RamDtR4Hmj9euhZ5DWlh8ZobKNRxLQ7+0oBMhTNMf3USa1Hh2qmo6f pOMhvrLeL59FeM2JnFy1My1tnm2he2zXXVFKFPeMEh7RtPVdbBBqWd3YJlUEocD+k9QE NyXLyzPW8J8AOOeClVCH5RiERUiYCwpoPqZ+sMPur1hlUWVgSqT1yQu2nWIpDZOFn9It dI4DlfT3m4g6dHdIbIfLykRp+QbfgXfR+a5THBaurP0RhuKuBDSaFRT5HYyCgDHwWHty rtPQ== 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=+VoMivlcvCf+pGhQz2DwJ+dxCP3nmc4/WScJnu17j8E=; b=gx16KTi50NgENNdRgPYnGCMnuyl/NvKH75+OkgVEeEaBYBISz62JDeP7P2YfkGLzrd xsWKUDppEdndD1HeT+GWTh2J6uB5fBqRj9omde8/N/bS+ppqnEgEa4ovGMcry/5WOwHm 12MBLQr9CO0gtL/3X3T7Yup0VU1Xf1kEJEDYSRnz/ReF+MgvGHl0Z3zFpetgXWe7gg4X ZKXhEwKaxhwOjanHvD94Dm0CLnwByaA6eSzYakSF9c8bwV41fxKiyQl6tjYyyw7FEswf MlLE5OXMBSNyt/2TYJ5t+HqLDnhwE3NInkojv35i0ZKHojFWNqPdkYveDmsIfI4x7qig F9VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RNsp3J2l; 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 d11si3972069qki.28.2020.03.27.11.19.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:19:31 -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=RNsp3J2l; 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]:45408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtZr-0002wE-2w for patch@linaro.org; Fri, 27 Mar 2020 14:19:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40526) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtU6-0001yA-Qp for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtU5-0000qX-2v for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:34 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:34239) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtU4-0000oZ-Pa for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:32 -0400 Received: by mail-wr1-x431.google.com with SMTP id 65so12596047wrl.1 for ; Fri, 27 Mar 2020 11:13:32 -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=+VoMivlcvCf+pGhQz2DwJ+dxCP3nmc4/WScJnu17j8E=; b=RNsp3J2lkNED/AQ/aRyUPH6eV6U6poLNNtSC0RC/YYs0d4NAhEUJdsFJ+qKWi26zgo 3LvKLYi9PiD2zQPVAnowAg7JyqGwbqYRnOKUQtIWyekJPVFmyoSeOgzAzLleATVx9MLT 023FdLj5Jzt4xgeH5eweSO0x3KEjWGzSQN6RohH+RSRONAJ3crfEGqxwdP71pyiiC1Je 1+FxQG1qj0YH2T9aMTKnzEiU9bczrqqS7iQLLc5p1cmZsP5ys2RYRv3GygIeK6Ik+MlR I7ZkCe4C8ulE1pBGlu/5yAlU4zT4H45n6nT/OWQOTS8bei0VL8TQQPk01JPpxD1gATDO zEqQ== 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=+VoMivlcvCf+pGhQz2DwJ+dxCP3nmc4/WScJnu17j8E=; b=cXWgAsId/+b8wY87hApNg5d2PFAA3nc0yQD2YXmmzRd8P7El5Cocc1Eqkl4EnIt7ua fu2OXeXh9LufNSbUu9WsVwe6PoFJBp+J+ULuaSJxHneuqbbx00SYQRo9pzFsY3IHhDyh TzR9zTZ0X3HvPZWCkMQzcbFaBDc3MEy62I3LpJgfhGrPiUlMIpehQLgL8KTENzA2E7Yw +sicthKhOY35U3xOPWGJ8G2iyuQ0LyhQRJsnkWNilBmm9I4cxNeDjmtkREB7YtjM6OvO MXTEkoGYl6yJPvrvlfC2OWH3mvmsUDnXJ34Ya+wBba1mlSwgdZXQj/vq8tU9DwOKFyVR 0Zng== X-Gm-Message-State: ANhLgQ1wbQ9iPenxKQrGZIETgD7vVYf2vJ0O/4IqfnKbcqn1zOzIvGch Ve3gIFGOobfrOpV9kNt7wM53jA== X-Received: by 2002:adf:ec02:: with SMTP id x2mr646562wrn.365.1585332811715; Fri, 27 Mar 2020 11:13:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v11sm9479752wrm.43.2020.03.27.11.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:28 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E499F1FF93; Fri, 27 Mar 2020 18:13:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 07/12] configure: disable MTTCG for MIPS guests Date: Fri, 27 Mar 2020 18:13:15 +0000 Message-Id: <20200327181320.23329-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-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::431 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 89fe881dd46..e225a1e3ffe 100755 --- a/configure +++ b/configure @@ -7887,7 +7887,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 Fri Mar 27 18:13:16 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: 185013 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1610384ilr; Fri, 27 Mar 2020 11:15:39 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuis4NqllUs5daskOV+/Bv7FcwycBWL78GQZJodWcV3NoXjR+RAmb4/sSVUKgdIIuVmzQdT X-Received: by 2002:ae9:efce:: with SMTP id d197mr596288qkg.211.1585332939709; Fri, 27 Mar 2020 11:15:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585332939; cv=none; d=google.com; s=arc-20160816; b=tEzJmFX9udcbtEUx04kjypjfZFwhFn1wZQO2fjjbHrrc2K5q1iaHSZEzmZnGTZjLPB UpSqX05k3AQUOZADGSKRGFZzvFCRPWgLjSHmqEMhx+ODUpVSmYqkdyqkMnVvwKylglfA Bqwox5cn4A0L+zGRFqa1nUNXwomlZpscKx8KosTmWkyCZjE96UKd0Kvq8xSzMUL+FEnG +4/njVikIP6nm5gE2clFYpJFxX95DPqIPDfAnEtSZxFA0TMkqbltUHERswA2n3B26vE8 svQom0DqwCNGeh0P5Gkz2ETIKTIy4Fp3n5iDJ0xsZTFgvPmdOJECC7kGNClQZOS+r+5t m2Eg== 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=to077w3si4EpMxr1LQLkzHeZLF5upwhFg9YdlZjfBewYd2oqxR3rqieqtpM5IQIe1G 2gYXVQBlATPw7+shdqhCd5rlIPhqkIbNpmmmsIKOIZrRu/5Q7h1o/YnCugAwvUURVvIo EtTrBMglZ6LjPNu1ERGklhY1Q156KXwRcx3jdYXSmwplaUm7FJZouQLv8q49A5f0/H0h Zw0ovcFe8Nb6n/run1CtEcwNZ7gTh4SpilOOupU263p7oyvu7h7M3BXDbA/X204bkTd/ RdbWVrngKRJ1UhxW+tSBQ66sSKdu2QmDCFmCUY+EOUIGvZh0TRIpruDSeeUCKtqqdJxs L5Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Jg3uVjPQ; 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 v17si3711564qtk.303.2020.03.27.11.15.39 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:15:39 -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=Jg3uVjPQ; 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]:45322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtW7-0005Jf-4a for patch@linaro.org; Fri, 27 Mar 2020 14:15:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40554) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtUB-00021B-B3 for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtU8-0000w3-W9 for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:38 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:40097) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtU8-0000uK-QE for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:36 -0400 Received: by mail-wr1-x434.google.com with SMTP id u10so12542776wro.7 for ; Fri, 27 Mar 2020 11:13:35 -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=Jg3uVjPQioMHN9QODuTGcSLff1gZdlGv2bXwosnMObIDMnE2K6TvKV0ndwYd9eXA+2 iyySRgoxIeeRxuOFCRQSjZ4uouCyp/5gKF2KN3obQjj+99xT3wBUvbvxxTvQGQxHkZfs gzPkSTyfCMkpTbsOZqGMft+9ZaLlPJJg135gUusAzzVHPN9Drqw1IVg73stmG3ETrWiK fZtkAh78fPbnjWujptvLe1wlR+qNCfyH9a058edHDnkhnKdaLj6JCUdEvtdmXMmLZE1e OPwyMuSwQZHpvZBm+3mtSgs1OYPojyZudFelpk1vT7Jx9gayUZQwh0XM78gdi0dAJlIm JeMg== 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=YdQFO7mIa8KxSc/KX/GPesr2Z3zvt47d303Bbak19r0HLaZITbnsxuSPUDuwhUQ9Nd smBssxfxGy4cw8fN8E12WFkRqmmpNTSlNKoMXfCA04AedXoBQ5a++9Temew/z3RYmIbN mfK+FM7CTLJP+WpxSRjhSux49GxOC73F874bqxIyh7oeRrwoTmF7o3PfsKMCdBQHvBYI paDY43d6nivkB99D7H3J7WISUTQQnjx9QfYaJss1NdOwUo9DNMbqZ1xk5h1x0IDKuYIm tUToXrrW7ZS2SSrl8hELiN/KcIFP5M6VcqbwF5VmMYdz29LXXT2Yl4WzMAt7c3TbqcRi /ggg== X-Gm-Message-State: ANhLgQ3bsaAmKj385hG7xAXsl0VUQcpoHTZFi2xgl3slq/LyRaA9HDsc k3YeUxKJBCOoF5Q4KJS7VnvfeA== X-Received: by 2002:a5d:4984:: with SMTP id r4mr677442wrq.121.1585332815028; Fri, 27 Mar 2020 11:13:35 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w7sm9257528wrr.60.2020.03.27.11.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:28 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 061041FF96; Fri, 27 Mar 2020 18:13:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 08/12] tests/docker: Keep package list sorted Date: Fri, 27 Mar 2020 18:13:16 +0000 Message-Id: <20200327181320.23329-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-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é 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 Fri Mar 27 18:13:17 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: 185020 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1615575ilr; Fri, 27 Mar 2020 11:21:22 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuJAYFo0N3UbrqZ/9xoGnoGE7oSBMdpmXv2dfkonfuT5mRoiFGLiPInZkj+b/h0paA57Tfa X-Received: by 2002:ac8:2a0e:: with SMTP id k14mr586289qtk.232.1585333282139; Fri, 27 Mar 2020 11:21:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585333282; cv=none; d=google.com; s=arc-20160816; b=HWE6rWUhy7T/qOrm9mdZ1RvSu9CLPyRxuN7wP2HL0FzJgp6PC88kuJ0yAnD5Lt/rtc rFO3Undu2xo8GrYI9yZOxza9eVTlrV7bFo4VhqXWMPpL8KlAjs1+kZNGmOFG9WReJC0S xP6DqEyTsol004fOTjIv/GfIV8LmSP+YpSrHKn2rWDjmFnS89C4tDF4IqqprzgBoPZVl Ll8yBP3VrWyCBWS3LCtgSlizh5Y0Fow1AcfvJ0KQrPHEBPxKcvqHAsWoQJ8ApI943Jei DqZrIOjmTrImdM9elPz5MGKhjqrroGTR88jFFAa766htFXW4UuZUQ4oOu33jCZs9RP0U SLwg== 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=H6cCfwiPXHkftMkCBzs7HvK+m0Nok+EK9EnXPyvH1/wn4tXxEQo9m8RksJ0LCIJYcE fjXPIctetrdgjBdlw+XO6ujvW0IrxtMqQC4E1pTIzIBtQBnjG2b0agmQdKH38KAtZKu2 X9uWe6lPIFMmRI2waTnLuVLUYXGydZaUrxkrJ4En2iyAvlw7GshCLWpPT00jHjVgJWP8 tW5KlDisJxbrszJ2iYglEki5Xk/ckkmd4LE9YdvGDRX5okB5Jn2lVmuDTcKVF+67vSJF U4hgkPJhidh7Nl9hOBV+1JiKWPqahRjzIQffVNwYdCi/sj1HwW1behNDGu5m6yxKKt5o xNlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FBnVPvBw; 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 u13si3774953qte.124.2020.03.27.11.21.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:21:22 -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=FBnVPvBw; 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]:45472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtbd-0006mI-MI for patch@linaro.org; Fri, 27 Mar 2020 14:21:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40540) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtU8-0001zS-Lr for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtU7-0000tl-1N for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:36 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:44267) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtU6-0000s5-QE for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:34 -0400 Received: by mail-wr1-x434.google.com with SMTP id m17so12500499wrw.11 for ; Fri, 27 Mar 2020 11:13:34 -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=FBnVPvBws3bMpxRDx9HPW1/Gf91d7kKq+oTMdezJYqJ8B/C1A5QxDjUq2hlOgQDT2X HI0QtCVA70y8UWH8Hk1A096qfYsDtJdHJ5o8HuFX0uEn4zF9mKGVcYZ2cGUx3nLZ1Qi3 eVvRt9dwxKFAEQ0jPrqDQTWvpEvg2UV+PFpdt4eSeUiEsQ0IXh7uYSoLjJqCYtCK78F9 +JHATAakpaAwj3e1fH1jVW/eWUYJqY9FcKOKHqjVYgaRSFG2tULyFOReKCW5oxJzHF5o 8xmapk9WUmImKN1DF4A5LEl8tyxI8P5hlX4vRrkY62sEmeflnluKB8iLC1NP/iwT22kE l0Ag== 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=n9tqIGmTlUrj/HZDITYcV7tv7aM3ZoVtK6NIgQH9RC6/eOfgc5ZrPSYFzb9lqHCgAb wVH4mG6MpqZHuLDlWV/oiBBf5FR4GgzNfCDeI2Rfip1ZCzbFfrhAXUG1KbcCTZ+kXCBS zydw0kCJwnnMVf/hgRBgsNWlUHS3f9WASSJEbuspaWejDLnqklIX1T0Ny8gHP74zRo7V Siybo1TBGJKVqo+UqSIN0jzanxUAtSmJjFsNAIuoNYy+LvMvLwKq3EubLwvgMqoAPnhd 1mymHmu3A0vHXsqwGVdoK7QJ9aZp+FVmniSiXesVIs9bmFPvC1Ewk/YB7e51zv6r/a1H kBdQ== X-Gm-Message-State: ANhLgQ3aORCA/BNyugTemJTAoxCN1aZ1kyMd7i+n9JHJtK/sA5E0dmAT Nn90g2TtpwmNt8knSeX9kVO+kQ== X-Received: by 2002:adf:d088:: with SMTP id y8mr711729wrh.36.1585332813597; Fri, 27 Mar 2020 11:13:33 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r15sm9843603wra.19.2020.03.27.11.13.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:28 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1B6561FF98; Fri, 27 Mar 2020 18:13:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 09/12] tests/docker: Install gcrypt devel package in Debian image Date: Fri, 27 Mar 2020 18:13:17 +0000 Message-Id: <20200327181320.23329-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-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é 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 Fri Mar 27 18:13:18 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: 185016 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1612912ilr; Fri, 27 Mar 2020 11:18:23 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvtkrGV/7hviYJHdgHXrAU0h0Tz0pdkhVWqD5Es+CqVuuJURebigJIEtaQoWnxwcY+YMa11 X-Received: by 2002:a37:9e56:: with SMTP id h83mr618749qke.389.1585333103155; Fri, 27 Mar 2020 11:18:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585333103; cv=none; d=google.com; s=arc-20160816; b=PSVfnbg6FIoww40aMNoMIBU5JMxskKu0gX8JTiEzdpX+TsC0O6ZLx/iKd1jTeTva0/ rAIrr5SGrDM57h9t3b1C6LPzDS2H0BJDa50XldMPtc8Aeh1BK7PEalotyYcLHvNI+Lqi afki2shetAL/Mei4HAqh38gyZbdqXHLud0K/P13xpQS3LwLVaXtane4UKzIzbE0ZDXGq ftOf+WJtieIC0CMwKSVB1BlxCiGybN/8+aF1zp++uKhpxmmDpZav2+AhEDjPM92PiqWr dg7zV6nTtdxROynRlWq6gy8P0nMXQIopJP78fTFE/F+wDky/lqD0sV3x6EXHpU4pO2x+ fR3w== 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=B9W7KBP9/yqkJnnjQ5krXcqp0CjuPuO/OQ+GtvaTek6SEPBUHyMtLYcrhYSYIExxfa C/2qXu06C8ZAC/5sEWxzblhHpus6dRKyV9pmCheE650d/9rfNTWYmDO1Aqs3GPummfmL KHQiTmGzi4nUxXiTcflRjuMm0eY9OyxkWcz89ENoeAiqH/vHgCA/f2CCVbushhA2qv7s BNHE6i+lHAAVHnrWVj5wahhyqlApvfxI4FKVu0fXL/vCbzjXAe4R9mZAXDuBFdciBGF/ vnlZ1Q/O5cM7L13BMi2jAMKJ8VyhiT8Z9k/kj3VV5GE1PVk8cbR6a6nS3M93airu0zc4 r7OA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=c6SQkvBt; 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 a75si3625163qkb.141.2020.03.27.11.18.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:18:23 -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=c6SQkvBt; 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]:45384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtYk-0000VU-IY for patch@linaro.org; Fri, 27 Mar 2020 14:18:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40577) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtUC-00023c-FN for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtUA-0000xX-Aq for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:40 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:44260) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtU9-0000w9-OW for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:38 -0400 Received: by mail-wr1-x42c.google.com with SMTP id m17so12500827wrw.11 for ; Fri, 27 Mar 2020 11:13:37 -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=c6SQkvBty3OZUOlG8Cidcv5qNarFOL34e2lAY3NjE2BgJZlGaWw+XMPsMw2u05Dx2p xqUEQdy7B6x6PXO2nMbl0qhpb6o7UHrZmJzKSHmCPlsXMZu/zYZ2cybIQAZYn79PekHo 0Na3S0sRmbh3ZNSPoZjd1cglqyq03MnZ6nPKbeMFBDg2acYEwG30dp9zoM04npaVjAXk jo6VQWqBG+LtjjTRovWzcDzhnUSRKyXvfoqjq4meg+zxMBBLmi09zUfEIwfP7H0H6F17 kaX+Vrm7NA0A8cXCYx8wJQ/07hQazOYtFpqbe2YWUw3hK3vDBVdE/e+fDny8NVn/94XQ hYaA== 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=pthDkZnsVk1dt3bCP2HzId62IFJb3pLDIHB/B+8lHcn4tUHjmT+rBbgM8ErO5P9RS+ lMoVqPAKoQXrbQKgiFMnlExb7MF7kZcYBN58a6mjo3FuKEAWuTf8aQpCaXOUbm8Rmop6 76seaoD8ZCPoh+GSXVtCCTibhsJ34YaXwAZ0VWezoei7BrGEOiFvsjjVbY22s9rhj3c2 rcyJJwB6sQDW0tJBlfFzuVEPvaSmCssOQ1x7KDZKQ2HBryNM53S0BhbIPyC1eRZR2u2d 9S3w4qxCO8awDG7tG91ph/UWOacf8pruIJximVB0GWxk3HCx9ES7+I0oMvRkys5ctG5n FC5w== X-Gm-Message-State: ANhLgQ01iHyaIsphs/LoE2VyTdTixMW6dakjd2vOa2aypnRGux3LSCOu cRoORIQTsfBc/XzHlPKof2qYqw== X-Received: by 2002:adf:f8cd:: with SMTP id f13mr648054wrq.119.1585332816732; Fri, 27 Mar 2020 11:13:36 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t21sm8864495wmt.43.2020.03.27.11.13.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:28 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2FCF01FF99; Fri, 27 Mar 2020 18:13:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 10/12] tests/docker: Use Python3 PyYAML in the Fedora image Date: Fri, 27 Mar 2020 18:13:18 +0000 Message-Id: <20200327181320.23329-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-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?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 Fri Mar 27 18:13:19 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: 185019 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1614346ilr; Fri, 27 Mar 2020 11:19:57 -0700 (PDT) X-Google-Smtp-Source: ADFU+vs7E9JzrlHU2vv8JlF4CXex+nPo3o0zhui8yncUMnWpSogGJbwn9ExKKQUAABecKqttpuQO X-Received: by 2002:a37:a84b:: with SMTP id r72mr663846qke.414.1585333197376; Fri, 27 Mar 2020 11:19:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585333197; cv=none; d=google.com; s=arc-20160816; b=a31LB6XcUT9GSbpNHzOm0xyTE/gSgp1HpgfXW+WWdZi4lJPoPUdS/o2r2U3qCVdy/P 35nYQ3Y88UDp0ts1t4Pg3wwVjRGmAGG5kTuZzJrH1y1COP+lYc5M5bG41C9XlKJmLrEg gEUACDs05sUW5m8i/hMF0XsIsO1lyeN37m3hsbWh1M3afUzOT6sUQ293IBKi/5Nbr3fB eg9XcqCzhTMuq3ZXi5YyxBcEDyoOlHscxfJJkLRa23PNVo/MDeVsAiyJNgiU21HrZNo7 ON1sMEcjC6xgQ3vPrHFQe5CSqFgIUJjYCffg83iRTFc5vEuKhwZWW14rt+gVUS/lHJlB o7SQ== 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=Rn4BlhiOmEPYiduoPPbARDvkSApueDtsJ+D59OB+ClSWOMwZuZy16lXv6BHrIcbpmZ C5/6l+0vQsz37XMslHDLbHzHo2zgj0KT5mMsy7BVhhyujQyH3A33azO1fyeLrnHvbsLU DA4CB47WQcjsWb8T6nfPAkPXQv5dijIyzBS65/wcN4XZzjYOoTAuOsakknwLDXRRrxnc VmoU/LzcJd/zLCGJgZrFDWRQbG/E/A2JSNLFBZFWGnQYY+vIRcDc+8ScoYh+rMRKIIgN AtQGZYmXAEOcZJe/Y993nvGt27OfFBsLf7IbDsH9h4K8YUDczjFJIWFfYV4qr3XAOOF2 WUiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yMIBHLg2; 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 13si3841021qke.86.2020.03.27.11.19.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:19:57 -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=yMIBHLg2; 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]:45422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtaG-0003nO-TF for patch@linaro.org; Fri, 27 Mar 2020 14:19:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40603) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtUE-00026S-2E for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtUD-00012F-4V for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:42 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:38831) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtUC-0000xg-U5 for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:41 -0400 Received: by mail-wr1-x433.google.com with SMTP id s1so12550891wrv.5 for ; Fri, 27 Mar 2020 11:13:40 -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=yMIBHLg2xpgD1kZnJHr1cRZ01hZ8KfBxFZ6a3G9s3ua2HUFDBQFbiU0ibSpf4V18KS pqoUA/68RDU65Uw8VAhqSBd4PXR8rsj/VW9yWBafUOULLmnfp1e0plJRkLtlzYSargX+ 4kG4IVReJdYKrKyIE+z8ioGVgSccUVBG8BHfu4cmfc1aza5zGrdTy0tp0tTSri2iD9vj Ro+JcBNivW6f9mNE7ohPxD+sEFUs4Frde2NFZ4qrpY06OfTpjjCQVaRZe8STi27wvy7k ACVoa61Og2+UPxYmD9gyYirywyCirvqoV4KdZPDVxTolRbhWz+oUztfxZCPI7HcBOeh4 GNjQ== 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=L5ZRld+Dm7cEYq/Y4vnHGUuHjnliUbbSaURJqxt2mbg0CEMQxetuEZ0TFiASwABWpb NGNHjlSWZzuxdMz+sPSNEsWdRXqmnSGYSDfAvr0acWQsEdWfQUGK/+axPb7fynkEmOA/ sTyQsFl74bST2YR/5RscDK60VBYcG2K2ZuXuCTr05LhiJFLXNLzhv81ZGZr5zgmQ+19q b9ubg3o1Nlg0v1J8p+lj5z/Q6XpDRbJ2Mve4pavWWU9OqDJGqugAE/xbskBEv+LScsDk wtvKCRg6ssJBGnHARwcmE3nYLrLMNAjYjseWeZJ5KVBvvTPITDnRZOXZ1AN4ZoenoWD2 smSw== X-Gm-Message-State: ANhLgQ0rZb8+jIyzQR0rHy5+WjHRSeHeY46qL9D9T5U6jAsej3DNvjr3 gmeGKCicO2FNESLMI8+ckLi87A== X-Received: by 2002:a5d:604a:: with SMTP id j10mr693398wrt.126.1585332817951; Fri, 27 Mar 2020 11:13:37 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g127sm9202508wmf.10.2020.03.27.11.13.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:28 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 44D021FF9A; Fri, 27 Mar 2020 18:13:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 11/12] tests/docker: Add libepoxy and libudev packages to the Fedora image Date: Fri, 27 Mar 2020 18:13:19 +0000 Message-Id: <20200327181320.23329-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-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?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 Fri Mar 27 18:13:20 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: 185021 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1615787ilr; Fri, 27 Mar 2020 11:21:36 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtWSltEG0oYQ/ZkMZqZE60G08Nuixvtxz1Ec2WvBXb2NcqpW0CW4LUouvsLoMSvZxvIRe4I X-Received: by 2002:a37:27cd:: with SMTP id n196mr706716qkn.144.1585333296742; Fri, 27 Mar 2020 11:21:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585333296; cv=none; d=google.com; s=arc-20160816; b=cVvwYSbiFUARGuALNOGBrO0/5t/fLFVRs+bt8sGaptQsgOliif/gI9xyN1MbQtYGK+ TnBAe8Nwha4W6D3HgXc003eE8vbEtN0NkphmKCNM0XKFX+SbyBgmmwdjfZGFxPZ6G+XT qXDHuKuPkCWZU7+qCr+Ii5lPrf/Ugwm8CyPTf6Emy2YgvfdMQyvpcBhaI1oL5wSVlbLL Jrgzm5yABEaxpeonby5A27HclBIEg1jCZvzDcXzekMU2LnEmmouTGoMO6wtTl8I4mEaS 42860JCbGbw2DliddRWLoXzNdtp8svSTwVxXHlY1+pJWLbf8avZ+6S6CunRRKqyvCUpH gegg== 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=j12QPvtc8iqeNVS4eYMDF4z2YP9PI0uqAm8dWhP3BehyrlzibSFJipY2AEsjZ2/Hq1 j738d/vP/XqeYn3KRzYA/0ARgpQ33OqSVwNCU22rRWxltqKeiNXZWIPw4dDy/wzUv75c fPpVORthIpeeHApnINajMHl2196CmnkLLt1Iq4wnYfx2gFgnxpGpHKjiF1xYsXOWQOf9 Z+/zTj98QQGVFBx0eEk7PNduuZBMLx736h/+fnvmGeoMmcSeKqJ2WSx4PSGrCe1PHiYs leLQ/TpKQqCAUJa5BAk1xxhgzh092PsGomllFTwj3sj0ZT7io/kKdLxprX8FDtWzAYU0 yArg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="vgi/Ghxx"; 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 b19si3785947qtp.274.2020.03.27.11.21.36 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:21:36 -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="vgi/Ghxx"; 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]:45484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtbs-0006zR-8p for patch@linaro.org; Fri, 27 Mar 2020 14:21:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40596) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtUD-000260-LL for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtUC-000104-EQ for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:41 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:39595) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtUB-0000yC-WF for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:40 -0400 Received: by mail-wm1-x32e.google.com with SMTP id e9so1477673wme.4 for ; Fri, 27 Mar 2020 11:13:39 -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=vgi/GhxxGhhqht1b3r3vnllgAroWumGRu8wiJTJ1h04Wc3eXBd+VdLa4oAc0SP/067 tQU6PAGk40XkUj+hdbO5cRagP8bPB3ZZtF5rUZgLB/aZEjZH36FqCOcW1G3DK0vIhNR/ q0z9bxEg0wGnyJkWMlOSH8EuN7ZkhFYAzAhWqUNR9GJLJUgMZZ+ToqszI8ZIOICNhRlY lNfMl9Wzg1HB81RHIcGbvtIy83jRsbJ2Tg9x5hKs9hsqFWfAv6weQzaKtfmIkFPuMpvM +qjsxqDZryc4jN9oo9sDInYDzfnc38uJMBE0EBBczgyPYc66kTXuTrLBJh5ZoV64aWLj 2glA== 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=UrG/JBlKE44vHqpEavUB6d4q1E7Ep3EiFwZ5xWbqpYUc8IJHQ65q/vyhA6OXPRkL6Z Uge7CYk1mW8U5cr0vINRTBvgrDNzg7KOt+Jp4JPz6mUwYsUdtV/NgtJn7KTESRmVe1PZ qjUVjOW2yKo31THHDVlCNbGXOs6lVAC+jFteSexiJnzWXu5jhYj/vNRy/lpseoMc/GOc 2EjB97jMtymc73CI/f1VOPHU5/hfj/eIhoYyIWTMRjTX1rT4tujp8OY0yBLnwaIEfsYz eW6vAfhjg9fddtj62nDb//eyE2y2rPyOGGODz/NgROWAH1HEAS9r+SL+GCg4JZNAXbtJ n9JQ== X-Gm-Message-State: ANhLgQ0OX6bq4QMAYm2o6C3NB6YSY1MGWoeI7/4KTxCKdT/niV/RJMOD WWFXNbfZHG5sxFYPbvmNubun7Q== X-Received: by 2002:a1c:197:: with SMTP id 145mr2495wmb.42.1585332818945; Fri, 27 Mar 2020 11:13:38 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a71sm8654257wmd.22.2020.03.27.11.13.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:28 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5B7C31FF9B; Fri, 27 Mar 2020 18:13:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 12/12] .travis.yml: Add a KVM-only s390x job Date: Fri, 27 Mar 2020 18:13:20 +0000 Message-Id: <20200327181320.23329-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-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::32e 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.