From nobody Fri May 3 19:04:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552388801463384.90952278295833; Tue, 12 Mar 2019 04:06:41 -0700 (PDT) Received: from localhost ([127.0.0.1]:49880 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3fEx-0002Ed-9j for importer@patchew.org; Tue, 12 Mar 2019 07:06:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3f4e-0002Xk-62 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3f4c-0003az-Ni for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:56 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:54687) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3f4a-0003YX-Jx for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:52 -0400 Received: by mail-wm1-x341.google.com with SMTP id f3so2128962wmj.4 for ; Tue, 12 Mar 2019 03:55:50 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w14sm14293548wrr.18.2019.03.12.03.55.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 03:55:47 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 985EE1FF89; Tue, 12 Mar 2019 10:55:47 +0000 (UTC) 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=JChXdfWELr9fgYHxM6rVjpoCB7MX+rUfE6XqM9PnHuQ=; b=xJ8u6w5zvUajKk1Nz2P8UNJmJMulbrw9RaK88l0X+Wqh/74WtE7rFb5aZH5pmGfO3s NvgRL4PbQYnxeeqBjtfjn3zZVZTGIRfNz76/SNSK25JPzpkO1l8vDjmrMceIEHiC4WFE YRGWzt47OPCJ7LFxWJnH9wLwdKQJiwjNtLRwfe3G0rrImnTY8bQLX2g1KOMe82b54wwy gNUGVJID2RhoUZ66N8XBSzMzMkwBjtgB4Gwa5DWZ0I7rG6R7hXPtv2Y31cN660nJLHPL EdrTRDu2cLrMOBydRwFt6y/cMcOAaLqTt0LX8jCqHnZR9GF0kJejrfVkR5t/GMHuNcP+ Fc8g== 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=JChXdfWELr9fgYHxM6rVjpoCB7MX+rUfE6XqM9PnHuQ=; b=pQetU+bLqw9dEelYPOjTpxXrwjHBztHN+Ihy9c50qSUQMuIntX2Vvqi1GZK89/klRc 79Zqq6gVRzHORMAhCSd5qSWm236+0ZRDUJvePoes28+v700EJ6gYBc31USS6XDQYuG4g zLRCsJKHM3Xj5axQRvDXv7ZiHQiKWew3eHiVi/x8pLMEgubSHWCdrSDSrsLFbR8ldwI3 bq+U7J3RDUhvfcJACrxGxKbZuhY0ryU0Q9Dgl1MzqSvNpiXJ1Yk98CvhF8DeJTbBDwow zCeE5KLGOyRnMeKiB2V+dRbuQ6PldNQ3lVTzQZeX/0pS1PDqLOrfxuOuF5Qqmgn7yVzP S/ow== X-Gm-Message-State: APjAAAWGGe5LKZixC7WbZBrG1VYBFjt2HpsVHk8jBToXL8XqNraTst7T 52X6JwYkF1XzwwSqAuhPbHNR6wav3vY= X-Google-Smtp-Source: APXvYqyRjgDnp0qmDBM+gyAiICAMMkxKKiF9NT3+O84EFufunBa2kKB3CR1SXxMAnJMK/ErxuSnC/g== X-Received: by 2002:a1c:4e09:: with SMTP id g9mr1834252wmh.56.1552388149203; Tue, 12 Mar 2019 03:55:49 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 10:55:41 +0000 Message-Id: <20190312105547.4755-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312105547.4755-1-alex.bennee@linaro.org> References: <20190312105547.4755-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v2 1/7] spapr: Simulate CAS for qtest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, David Gibson , Greg Kurz , Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Greg Kurz The RTAS event hotplug code for machine types 2.8 and newer depends on the CAS negotiated ov5 in order to work properly. However, there's no CAS when running under qtest. There has been a tentative to trick the code by faking the OV5_HP_EVT bit, but it turned out to break other assumptions in the code and the change got reverted. Go for a more general approach and simulate a CAS when running under qtest. For simplicity, this pseudo CAS simple simulates the case where the guest supports the same features as the machine. It is done at reset time, just before we reset the DRCs, which could potentially exercise the unplug code. This allows to test unplug on spapr with both older and newer machine types. Suggested-by: Michael Roth Signed-off-by: Greg Kurz Message-Id: <155146875704.147873.10563808578795890265.stgit@bahia.lan> Tested-by: Michael Roth Reviewed-by: Michael Roth Signed-off-by: David Gibson --- hw/ppc/spapr.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 9e01226e18..f7d527464c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -29,6 +29,7 @@ #include "qapi/visitor.h" #include "sysemu/sysemu.h" #include "sysemu/numa.h" +#include "sysemu/qtest.h" #include "hw/hw.h" #include "qemu/log.h" #include "hw/fw-path-provider.h" @@ -1711,6 +1712,16 @@ static void spapr_machine_reset(void) */ spapr_irq_reset(spapr, &error_fatal); =20 + /* + * There is no CAS under qtest. Simulate one to please the code that + * depends on spapr->ov5_cas. This is especially needed to test device + * unplug, so we do that before resetting the DRCs. + */ + if (qtest_enabled()) { + spapr_ovec_cleanup(spapr->ov5_cas); + spapr->ov5_cas =3D spapr_ovec_clone(spapr->ov5); + } + /* DRC reset may cause a device to be unplugged. This will cause troub= les * if this device is used by another device (eg, a running vhost backe= nd * will crash QEMU if the DIMM holding the vring goes away). To avoid = such --=20 2.20.1 From nobody Fri May 3 19:04:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552388821071410.97297960649144; Tue, 12 Mar 2019 04:07:01 -0700 (PDT) Received: from localhost ([127.0.0.1]:49885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3fFK-0002XE-1e for importer@patchew.org; Tue, 12 Mar 2019 07:06:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3f4g-0002Zo-5P for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3f4c-0003b4-OK for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:58 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:39628) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3f4a-0003ZP-La for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:52 -0400 Received: by mail-wr1-x433.google.com with SMTP id p8so2154411wrq.6 for ; Tue, 12 Mar 2019 03:55:51 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f6sm9736978wrt.87.2019.03.12.03.55.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 03:55:48 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A4BA11FF8A; Tue, 12 Mar 2019 10:55:47 +0000 (UTC) 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=b80fiscz/M9DJJL5HBOmynP5XjnojpfOGehcC+KRDj8=; b=Beh/0g49tDgQpZZTS0a2zScz3r0qH8WwbNGThBAVILIiC1hydql5/+OBaonkKZmA6A YqUK6qrBm40w3iHRSFYtIUgaSzEEh8idv2YkBWupUoNC/Y0H/NJk3VZctFoQJuPpx1fp 7HCHhZcATUIM+DWDmriH5+deQo95DctM/Leh5i0og5NYi1g1BVBYNyZSk+/VMweEu9q3 EibbgmQxuEXdb2o1Jsrg3v1pRc59Fcp/PFRGSzKN22eH1xoK2677iXD2R8blQWVP/C1g cUHn3IYjC5bAKcqgeNsM1sZ3q2R4d6eBo26dcnXa6JV1STUVcAko8egcGlWV0nOLoEwR f40Q== 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=b80fiscz/M9DJJL5HBOmynP5XjnojpfOGehcC+KRDj8=; b=jsX5Yw7FMdrWcGWjiLykQeztEzPwMG19L6TMVpyUgAH854pN4ka60BvfuSHZwJnNAF lxZczbcnketkl9HMnB8rN0kC+KaItaOzQAbEfySIRKuda4kqI8D3ZhwLvyj3d3ZXXzcm eeRcQNn+5sbFxG6Wja3sLAuVJAzXAJoJ5LLyZp9VAG5Iht6ahpgIf2tR8P+0StT4e0Zn FP0uHhRrujsmmLJW7SwOpe2TkZ0ecj6kd/A5ec/s5oMuk/vjHt8RkXQ6tRHdEeyJjidx 4y29GoY1OwJO5HuntmJ4kZ7cSMRQrQbCabhxoZYzaTOEg2WhpLwZFIDqXXpRkB8J/fbY cOiA== X-Gm-Message-State: APjAAAU8Pr76z+03t++meYsfT0BvKdaxTLG3OVwwqVOi4ChM4WAUWmqL l3HIFu175CP458V1GrGKXnMU6w== X-Google-Smtp-Source: APXvYqzf6VKKmLOh4++6ulr+JqWbPvBGNxbmuuAZiYMVJJm0mZa6C+cEaW3QZ/NIsjbWfBzvbftgQQ== X-Received: by 2002:adf:f70c:: with SMTP id r12mr2389158wrp.54.1552388149885; Tue, 12 Mar 2019 03:55:49 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 10:55:42 +0000 Message-Id: <20190312105547.4755-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312105547.4755-1-alex.bennee@linaro.org> References: <20190312105547.4755-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 Subject: [Qemu-devel] [PATCH v2 2/7] Revert "spapr: support memory unplug for qtest" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Thomas Huth , David Gibson , Greg Kurz , Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Greg Kurz Commit b8165118f52c broke CPU hotplug tests for old machine types: $ QTEST_QEMU_BINARY=3Dppc64-softmmu/qemu-system-ppc64 ./tests/cpu-plug-test= -m=3Dslow /ppc64/cpu-plug/pseries-3.1/device-add/2x3x1&maxcpus=3D6: OK /ppc64/cpu-plug/pseries-2.12-sxxm/device-add/2x3x1&maxcpus=3D6: OK /ppc64/cpu-plug/pseries-3.0/device-add/2x3x1&maxcpus=3D6: OK /ppc64/cpu-plug/pseries-2.10/device-add/2x3x1&maxcpus=3D6: OK /ppc64/cpu-plug/pseries-2.11/device-add/2x3x1&maxcpus=3D6: OK /ppc64/cpu-plug/pseries-2.12/device-add/2x3x1&maxcpus=3D6: OK /ppc64/cpu-plug/pseries-2.9/device-add/2x3x1&maxcpus=3D6: OK /ppc64/cpu-plug/pseries-2.7/device-add/2x3x1&maxcpus=3D6: ** ERROR:/home/thuth/devel/qemu/hw/ppc/spapr_events.c:313:rtas_event_log_to_so= urce: assertion failed: (source->enabled) Broken pipe /home/thuth/devel/qemu/tests/libqtest.c:143: kill_qemu() detected QEMU deat= h from signal 6 (Aborted) (core dumped) Aborted (core dumped) The approach of faking the availability of OV5_HP_EVT causes the code to assume the hotplug event source is enabled, which is wrong for older machines. This reverts commit b8165118f52ce5ee88565d3cec83d30374efdc96. A subsequent patch will address the problem of CAS under qtest from a different angle. Reported-by: Thomas Huth Signed-off-by: Greg Kurz Message-Id: <155146875097.147873.1732264036668112686.stgit@bahia.lan> Tested-by: Michael Roth Reviewed-by: Michael Roth Signed-off-by: David Gibson --- hw/ppc/spapr_ovec.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hw/ppc/spapr_ovec.c b/hw/ppc/spapr_ovec.c index 12510b236a..318bf33de4 100644 --- a/hw/ppc/spapr_ovec.c +++ b/hw/ppc/spapr_ovec.c @@ -16,7 +16,6 @@ #include "qemu/bitmap.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" -#include "sysemu/qtest.h" #include "trace.h" #include =20 @@ -132,11 +131,6 @@ bool spapr_ovec_test(sPAPROptionVector *ov, long bitnr) g_assert(ov); g_assert(bitnr < OV_MAXBITS); =20 - /* support memory unplug for qtest */ - if (qtest_enabled() && bitnr =3D=3D OV5_HP_EVT) { - return true; - } - return test_bit(bitnr, ov->bitmap) ? true : false; } =20 --=20 2.20.1 From nobody Fri May 3 19:04:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552389336547520.3461292560717; Tue, 12 Mar 2019 04:15:36 -0700 (PDT) Received: from localhost ([127.0.0.1]:50061 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3fNY-000052-HT for importer@patchew.org; Tue, 12 Mar 2019 07:15:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3f4e-0002YE-NB for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3f4c-0003bB-Os for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:56 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:34299) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3f4a-0003Zz-O6 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:53 -0400 Received: by mail-wm1-x330.google.com with SMTP id o10so1836857wmc.1 for ; Tue, 12 Mar 2019 03:55:52 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v67sm1851794wmb.9.2019.03.12.03.55.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 03:55:49 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B130E1FF8B; Tue, 12 Mar 2019 10:55:47 +0000 (UTC) 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=rV1loA8go9CjfbHRorHa4JpqMJ3MeNwLT8AOLMesaWg=; b=hnV9pPnKZ8DSKZYH9P00kE46o5nMhvvjsqVun2y8RUCHo5bDlxUyo9GwiJ/KPwgwgB KyZXJuocczCiZ4tIEMaJwHq/byHRJQutn0QTwL1Mq9sn4bLhcNuTBue7xau6Cxt9aora BNS8Iexnm4O5J1z7LMUZuga4riwPzYqYK4ezijdkqWS8g+RVmjHn3m7ItXFH9wbYnzIX wD1HnG0ccCQzKiuK+q0ScN409SVXvgX6bpdrokp+xkXE5be1pERHkTV/y/k4Gj1hKWrr nWery1tTWk5VmmJyMSJ2bkvM3Z92mhCwLnoJh/6zP5RUaGfLReEEDxyBDMoUaVik2F1U 3uNQ== 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=rV1loA8go9CjfbHRorHa4JpqMJ3MeNwLT8AOLMesaWg=; b=s9dc9gYsohU3L6QAK+jHo4AAzhJyz5N4xS4pgl14xSt2d5z8wMbXZ+uhoQqK9jdT/R hR2GxYsm0idWeX1KvUOAOFFvDWuu0DmyOfA+BYcIVxzE2VNi2RZg0VyOXGfxT54HUj3K rtD8o8CHNZqnF7lzhUTu6YOEp7XmKmHYL3jugTWgkdRG/E8SsfvaqoJ3OdAO3Zz7VK7a HqZzPxikAy1Nvckar18X1+yk9lDbUhctqW/3+QCS3YTztF1anPKWA7jjZuP9wQbuIpAv UZsZbXnUsipxSwaT/MeJFCYnpEiWobahO0r+Y4Ghmz7RxF7fykVEpxXMQ3zVBfx13E/n pnRw== X-Gm-Message-State: APjAAAV8xLrY2CveMFb4Sc6JEQjwF8yfNquHpM5WEJCBxL45XDjmM5P0 BNmfH2edJJtK6iq74vnydLMf+Q== X-Google-Smtp-Source: APXvYqyUmjG2URiIjtvg9ODKZ/2jxn+qzCculCbmgF9O7gwwIvMGufPP1FfutWNiwBkvQZIHiUNJ+w== X-Received: by 2002:a1c:e2c2:: with SMTP id z185mr1868976wmg.84.1552388150947; Tue, 12 Mar 2019 03:55:50 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 10:55:43 +0000 Message-Id: <20190312105547.4755-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312105547.4755-1-alex.bennee@linaro.org> References: <20190312105547.4755-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 Subject: [Qemu-devel] [PATCH v2 3/7] travis: Bump Xcode 10 image to 10.2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Travis enforce the use of the git protocol v2 on their images, but the 'xcode10' image doesn't handle this correctly, resulting in the brew packages installation failing: $ git config protocol.version 2 $ rvm $brew_ruby do brew bundle --verbose --global /usr/local/bin/brew tap homebrew/bundle =3D=3D> Tapping homebrew/bundle Cloning into '/usr/local/Homebrew/Library/Taps/homebrew/homebrew-bundle'.= .. fatal: unknown value for config 'protocol.version': 2 Error: Failure while executing; `git clone https://github.com/Homebrew/ho= mebrew-bundle /usr/local/Homebrew/Library/Taps/homebrew/homebrew-bundle --d= epth=3D1` exited with 128. Error: Failure while executing; `/usr/local/bin/brew tap homebrew/bundle`= exited with 1. The newer 'xcode10.2' beta [*] image doesn't have this limitation. This image comes with the following brew packages pre-installed, which extend the current code coverage: - libffi - libpng - libtasn1 - gnutls - jpeg - nettle [*] https://blog.travis-ci.com/2019-02-12-xcode-10-2-beta-2-is-now-available Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190220193541.24419-1-philmd@redhat.com> [AJB: re-enabled MacOS build first] Signed-off-by: Alex Benn=C3=A9e --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index e942175dd3..ecaea97650 100644 --- a/.travis.yml +++ b/.travis.yml @@ -185,6 +185,13 @@ matrix: compiler: clang =20 =20 + - env: + - CONFIG=3D"--target-list=3Di386-softmmu,ppc-softmmu,ppc64-softmmu= ,m68k-softmmu,x86_64-softmmu" + os: osx + osx_image: xcode10.2 + compiler: clang + + # Python builds - env: - CONFIG=3D"--target-list=3Dx86_64-softmmu" --=20 2.20.1 From nobody Fri May 3 19:04:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552388656665563.0104491226523; Tue, 12 Mar 2019 04:04:16 -0700 (PDT) Received: from localhost ([127.0.0.1]:49820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3fCe-0000L1-KM for importer@patchew.org; Tue, 12 Mar 2019 07:04:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3f4e-0002Xj-5W for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3f4c-0003bA-OQ for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:56 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:50572) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3f4a-0003Zq-Ng for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:53 -0400 Received: by mail-wm1-x329.google.com with SMTP id x7so2142420wmj.0 for ; Tue, 12 Mar 2019 03:55:51 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g3sm1473154wmk.32.2019.03.12.03.55.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 03:55:49 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BC5B61FF8C; Tue, 12 Mar 2019 10:55:47 +0000 (UTC) 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=seVgys+eOHRRQvTA7e5sJDtodwiBb3EyYlr3LFKBtAo=; b=Lxk/T9dzUeIQtFiYCEYc74u4eiow7UMA9mHZQdVx5xmLWFX3zmjhL/0wCBQDJ+EHbG 7ujjBC5HLAaiTQJ+z871glpv1aQOgqbgJno852HJy1xajF91vcTYfRQe5Bg6Wftn61Om Uylu+iX+MUTrovVqGOJMzda5+SPjVg5+3BHDgAn8gW7nlj4TyDH6Uq4NTQE/eb2gBlwZ sKF0JK+te8a7eGHex/p8Z7HLgqS5kh+rlqb4TzI8tI4etbLQshyOkyK8csmNTC5OR3aA InsFkMbS+GzSsd1ARkoAOEBXjufasiK/WkfVnj/8s/yoe4Rahs09lnGHHwLxAkqGu54C S4Fg== 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=seVgys+eOHRRQvTA7e5sJDtodwiBb3EyYlr3LFKBtAo=; b=Zp1YQlcwSu2zNy6otGoaqzk/SgbdFjHe7HTqXlGvBaECRtfVihjh4lIdjIPLV0mchA 2NB2rFMwK0+cjQ2VuCHcTJioCPBkibADDD+glP8gi9pUSR6eURNJlVSmNxsqg4Zp65HR A72ZXydb9x0CBoF+1T4IHnS6NSOFKjNgRA9FZsh9K9r6MnvFe8umMoPD6Qa9gNS0PVXl 0ufhGlDIj6tjsMfRAWcujcLtOncuvB70Ug0WDlb2H0s1ZwQSY0dee5PrmRsi1MebuIT3 NxEa3otDIJMkaCZqJ6EVIqA5Cfp6rFM4sxsn5o+RpoqFdGzi4qK9+xpoD0nnko2ypoSQ 3DdQ== X-Gm-Message-State: APjAAAUNOEy/3AH2rti8CltNVKWaO+Ii6r8gH1NLx7DzywAElOvfO4gY OkPzQP5StKCVErp5e56wgoHp3T7/5e0= X-Google-Smtp-Source: APXvYqyfAdqQkb+k4XqocwsiPsctWdvKlAV1tZPebOTLOuJpOuwC0wzduQn8Oe8hrXSGC0LfM0GHsA== X-Received: by 2002:a1c:e2c2:: with SMTP id z185mr1868952wmg.84.1552388150481; Tue, 12 Mar 2019 03:55:50 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 10:55:44 +0000 Message-Id: <20190312105547.4755-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312105547.4755-1-alex.bennee@linaro.org> References: <20190312105547.4755-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::329 Subject: [Qemu-devel] [PATCH v2 4/7] .travis.yml: combine docs and tools build with out-of-tree X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We will be moving all builds out of tree eventually but for now we need to for building the docs as sphinx requires an out-of-tree build. Signed-off-by: Alex Benn=C3=A9e --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ecaea97650..c46b0c28df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -114,8 +114,9 @@ matrix: - TEST_CMD=3D"make check-unit -j3 V=3D1" =20 =20 - # Check we can build docs and tools + # Check we can build docs and tools (out of tree) - env: + - BUILD_DIR=3D"out-of-tree/build/dir" SRC_DIR=3D"../../.." - BASE_CONFIG=3D"--enable-tools --enable-docs" - CONFIG=3D"--target-list=3Dx86_64-softmmu,aarch64-linux-user" addons: @@ -125,11 +126,6 @@ matrix: - texinfo - perl =20 - # Test out-of-tree builds - - env: - - CONFIG=3D"--enable-debug --enable-debug-tcg" - - BUILD_DIR=3D"out-of-tree/build/dir" SRC_DIR=3D"../../.." - =20 # Test with Clang for compile portability (Travis uses clang-5.0) - env: --=20 2.20.1 From nobody Fri May 3 19:04:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552388943185888.5971264788466; Tue, 12 Mar 2019 04:09:03 -0700 (PDT) Received: from localhost ([127.0.0.1]:49905 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3fHG-0003xl-UU for importer@patchew.org; Tue, 12 Mar 2019 07:08:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3f4e-0002YA-Jl for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3f4d-0003bZ-26 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:56 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43411) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3f4c-0003aB-Nn for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:54 -0400 Received: by mail-wr1-x443.google.com with SMTP id d17so2134581wre.10 for ; Tue, 12 Mar 2019 03:55:52 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b12sm1319375wrm.33.2019.03.12.03.55.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 03:55:49 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C828A1FF8D; Tue, 12 Mar 2019 10:55:47 +0000 (UTC) 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=iwdzR7AIVPhpLkyr2+6hBbVY76s+Cd+MU17bPbiz6xs=; b=Q0iNDNxWD0259Ct8TqceWxIPnQ++t3sXDioaQXeMXfuldgMT29W4j0dQcHR2AwdZqw RT0kSyyAXl9C11bd4cWCCmJva07w4wVXsnPergYieHAsne6UCeF4NZ2z6RKogzu+x2G+ OpRTZ+cuXI0AEqeNiU6bEGrYV7K485TZHSSNQ3B1rluLAeMhKnG8ZvNTf44adxF7u+gw U42lIHfbbSprpPZP4FJi04P/00yn8EykMJze1J/+SqEKe6/bqnxna+omeFkXS6bc3WGa R0uxFz0G/MavsxNkJ1yAysnRwEoTgSU07FL41+dhNpW3X/pUZLfuBOaS4V9egSaj6cZz EB3g== 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=iwdzR7AIVPhpLkyr2+6hBbVY76s+Cd+MU17bPbiz6xs=; b=ujgDbbVxmSawOwSTdbRGK3LL5FDE9H/DO3w5P9CBg17krV/0Oo1jG7DBWlinZLhG96 8Wqunxutj0CHvg6JbYaqMBMsp7vUBo3Ea3utjcNzFWz3nexyD2Fyb4atqxSGGixgZLPK KI4j9Go7ZKQ8TzXUL++CTsESPfVhrzhLDQq5SP60qhWi3USZO9C3FjXNHPHOacdmPRrI 1d5xEGp4cpPBGsSP8YcvOs7CLq3VXZYfgCZnf9YuPCnxcyCEr8boaouMnefUah9PUGzp /g2KqpLs1PAp99Ic6fzgF0BuxTKfe4O/HqjeblcFrfcgTmxxPCHU/adsoYfRIc+MYwxm 4CQg== X-Gm-Message-State: APjAAAXbrbFK+EgsSuKlm2pesY8rL+O4uzK4ouo5NBLLNVvuaRdjwjy9 AWQJp8x4NBf1bTC2R7ceOX/8u+jBvd4= X-Google-Smtp-Source: APXvYqxZTYPWnE4ld2kMDd87vqKFA0gqP1SD/eb5aZJBjE+rbqcJZXSK1CU5TBv9TU1UWE900uVcOQ== X-Received: by 2002:a5d:4d4e:: with SMTP id a14mr13560491wru.324.1552388151832; Tue, 12 Mar 2019 03:55:51 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 10:55:45 +0000 Message-Id: <20190312105547.4755-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312105547.4755-1-alex.bennee@linaro.org> References: <20190312105547.4755-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v2 5/7] .travis.yml: reduce the module builds to major architectures X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The --enable-modules build is consistently tripping the time limit so reduce our target list to the "major" architectures. Signed-off-by: Alex Benn=C3=A9e --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c46b0c28df..d5c9bbf1b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -98,8 +98,9 @@ matrix: - CONFIG=3D"--disable-linux-aio --disable-cap-ng --disable-attr --= disable-brlapi --disable-libusb --disable-user --disable-replication" =20 =20 + # Module builds are mostly of interest to major distros - env: - - CONFIG=3D"--enable-modules --disable-linux-user" + - CONFIG=3D"--enable-modules --target-list=3Daarch64-softmmu,arm-s= oftmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softm= mu,s390x-softmmu,x86_64-softmmu" =20 =20 # Alternate coroutines implementations are only really of interest to = KVM users --=20 2.20.1 From nobody Fri May 3 19:04:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552389263034498.1888409661308; Tue, 12 Mar 2019 04:14:23 -0700 (PDT) Received: from localhost ([127.0.0.1]:50024 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3fMO-0007je-Vc for importer@patchew.org; Tue, 12 Mar 2019 07:14:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3f4e-0002Y0-FK for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3f4d-0003bS-0c for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:56 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39858) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3f4c-0003aK-Mz for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:54 -0400 Received: by mail-wr1-x442.google.com with SMTP id p8so2154557wrq.6 for ; Tue, 12 Mar 2019 03:55:53 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x11sm14197400wrt.27.2019.03.12.03.55.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 03:55:49 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D42541FF8E; Tue, 12 Mar 2019 10:55:47 +0000 (UTC) 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=dihZ+CmVOMozjCd8zGpdPdNm4X92J4twpgphu34dlcY=; b=ILybMYCgMCjzdjrTJNLN7XD85VXoGw/Oxo6oY0+PsF8l2bC54xIQjQBUXYwYq1+yf0 4zhYouSiag95o5B3Vdbwpv+WPB5l4kyxfV233YiMBnowWgAr0yxz+viXz5W5+spadH9P 7dJ5kUAsSGftbzjB+zP0e0dIymXCAaI2Iw6+jq59QHwstkgrPLSrE0jBUWfEYfth603V rs4LnWwi3wDpCsppB0D2/HDJxVhg5AM1pLzvD9/LQbNEktAJca7CjpfnNVUjDZfn+3xw PxOV6Hei8ThVmlEdVU5VGSjkCk96RCr+EHrvPEw4J/448ftXrBChgsZmhZq+a+LMppub SycA== 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=dihZ+CmVOMozjCd8zGpdPdNm4X92J4twpgphu34dlcY=; b=n31mern1cQ9LCuLPpYb0WdJLePYHy/0+ox1WvmBbMAl2jb8lXdJn8pna0EHr/dR7OS 4iTS0xJa16lCixj77KNEc0EL0p8+Dgg5H6yiS14bjR+pLx50tmxGel1/6/QafjEEYjmh XDf9OSvYfU+FY54mpvyYJjw2XgCVYHUaOqEJH+kpnIpD5jl2KLixw9ME4eC5kJTM6VMO B+o7x8r/TXsfEunxYiRInXWl8VmK0MiK6E74EFA2y47/ESHmvOTk7y7s5PHdjNaZ0EBb dSav+fTUKBQaXdnnyxsqBSfFpRyxP3GBMuPFZNvDc69EotXVvF2pjRJ2c8lYD+riyGeh FX5w== X-Gm-Message-State: APjAAAUcqc5vljphekddJE5dEKQIBfpPRZBDtIdaeaaynEnnmpmMRKnd ACw7i9PClIBxQmCSc1ijQFFtJHiHIQY= X-Google-Smtp-Source: APXvYqwyw1tMnSb8xVwBQAux3QKaNMadq2a48h5rF5bUETlIGKOyAVdSWoCXc5t3uBZ0WshqH4jg/A== X-Received: by 2002:a5d:4e8b:: with SMTP id e11mr5239002wru.110.1552388152280; Tue, 12 Mar 2019 03:55:52 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 10:55:46 +0000 Message-Id: <20190312105547.4755-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312105547.4755-1-alex.bennee@linaro.org> References: <20190312105547.4755-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v2 6/7] Makefile: explicitly pass $(SRC_PATH) to gcovr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) In an out-of-tree build gcovr can get quite confused about what is going on otherwise. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6ccb8639b0..7202ac76dc 100644 --- a/Makefile +++ b/Makefile @@ -964,7 +964,7 @@ $(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl %/coverage-report.html: @mkdir -p $* $(call quiet-command,\ - gcovr -p --html --html-details -o $@, \ + gcovr -r $(SRC_PATH) -p --html --html-details -o $@, \ "GEN", "coverage-report.html") =20 .PHONY: coverage-report --=20 2.20.1 From nobody Fri May 3 19:04:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552388363059997.2907489181382; Tue, 12 Mar 2019 03:59:23 -0700 (PDT) Received: from localhost ([127.0.0.1]:49710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3f7p-0004n8-K1 for importer@patchew.org; Tue, 12 Mar 2019 06:59:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3f4e-0002Y6-JV for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3f4d-0003be-2q for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:56 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:44282) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3f4c-0003aZ-Oe for qemu-devel@nongnu.org; Tue, 12 Mar 2019 06:55:54 -0400 Received: by mail-wr1-x441.google.com with SMTP id w2so2130783wrt.11 for ; Tue, 12 Mar 2019 03:55:54 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l5sm2520983wmi.24.2019.03.12.03.55.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 03:55:51 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DFB771FF8F; Tue, 12 Mar 2019 10:55:47 +0000 (UTC) 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=fdXeOr0/7xFkPx+xVw5vbjNrHSXul+BPZA7kkKOw0O0=; b=yWht7fPEebLLCnyQaM3TxIPGzE8mRdBjqfNrEoMOVlcbh45hyER2w1y2TnnaidkAlF tbjk4q2I/lbvEOtoFqIwTP6ZEsPswXMg5P1N2fTzEKy5tYFqNEtIVAGowrfbnw41+RRy fjOH+ZuE8kheXkE1QhrC4zDcKvukFhPH1b5WGHJrvsxaeWUItKie4eoFj9I5EX7X0qPl AXktkwUG2/2EdNuO9/GczlxqX/0Q60SeEagDhxYSwkvEU/crA0HN1p+vVejg5grzyetj pGoDDgUql/D8Mhxs0Iaj+QYKYcE20K0BD5e7ADiRUv/v83ZQfliYanmAdRNFjN+xG6Ts fMQw== 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=fdXeOr0/7xFkPx+xVw5vbjNrHSXul+BPZA7kkKOw0O0=; b=GA4ura198uiLGjJ/o9S5y+ME5uXXQ8OxWp9bLrot2NPEm/MQX9Y3pfjGt2MHCnkDEr Bn0p5wjREptGf0sJGELQLYJV7HDicEaxagZDdV8Z/E8y+pUkcPMVF4u03/NzssDAu0c+ nvfOVhaHHo/HzIYc0P5cv8NdQX928pk0xX6EO4gbZOg+XG9Dx66OkwSsWFSZk7OWiMYr RAR9xiJ1lT2A/eqqGe/vdQG0OZsy3PG2LIDvEPzyXgg4494u2IM/sr8PJOUqml/0a6P/ kUqwg7TJMK/PDVdUctJechoG+oQGqAGq9S8BC/vEt7evFaaWsIrtLp4anc+iUOF/b1YT aIbw== X-Gm-Message-State: APjAAAX6Lmfzw+pZ/tYAeC2m1R3Pir+hg37aZ3fNuvAhgELm/tEV2VKj JozUQhQWOsfRy8rh2FosOmrINw== X-Google-Smtp-Source: APXvYqzB/s66gQtTmClMuYlkmv7jLGiO7tPwa9PS9VJ4RquI7cZmzuXkxGIpok4nOqI8+YV4fpRX1A== X-Received: by 2002:a5d:6209:: with SMTP id y9mr25156041wru.140.1552388153167; Tue, 12 Mar 2019 03:55:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 10:55:47 +0000 Message-Id: <20190312105547.4755-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312105547.4755-1-alex.bennee@linaro.org> References: <20190312105547.4755-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v2 7/7] Makefile: explicitly pass $(BUILD_DIR) to gcovr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Best to be explicit about where to find things. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7202ac76dc..248fe9db7b 100644 --- a/Makefile +++ b/Makefile @@ -964,7 +964,8 @@ $(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl %/coverage-report.html: @mkdir -p $* $(call quiet-command,\ - gcovr -r $(SRC_PATH) -p --html --html-details -o $@, \ + gcovr -r $(SRC_PATH) --object-directory $(BUILD_PATH) \ + -p --html --html-details -o $@, \ "GEN", "coverage-report.html") =20 .PHONY: coverage-report --=20 2.20.1