From patchwork Mon Jan 24 20:15:47 2022 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: 534516 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3140624imr; Mon, 24 Jan 2022 12:21:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJwSnEIiO1W2hIIxYnN+/W2J13B1eGBHRKigThf0yYUiSplXOUZ/6pcLeJQB+1lJRB51qPUH X-Received: by 2002:a25:ba01:: with SMTP id t1mr25181680ybg.474.1643055668447; Mon, 24 Jan 2022 12:21:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643055668; cv=none; d=google.com; s=arc-20160816; b=M/evPEggkf5djszAZNX0H+mAzE7YSLi7dKuVu9KiwzXKd4uZPiRy8htDDapmAL/0KB 0+K9Xstn3LimURPKZDo0AYeUaBz4SD8tgoP4t5xdoDg2BlG62dTg3WoXzbHj1/n+q0Bp 8ZRnhTjGSfqIN6hA9Nus+u/PSZIvj4S/MD5zvzduGpNHzY2GJ0Pvzk160BB5cgbJpl7f P2pK1IS/GNgBoW7r2sKZiT6NMElpQv55TTshyuRam/i6spFUY/UnrTnUbsh86PrzhqHX lLd6vWk+vbYSrBOYpySSpYpN12S14BfJLiYBsXyjwSQ12YKm0BlkFd9c5OpeSswnDKpz NfPg== 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=2JKLnYKPM+EQcQ5BAumwl8ZRfWG1GUNMSMDRrhS3n0Y=; b=RgJrCT98fdOqupIpQFR9qW6cYmEAa3x7qH119+vy8xh8Ht09zj9KhI9wJ3figmiNA8 0tAGwtSLRGFvHd9doJWf6zI4r2UFr4XX1fW5zwa7OOQMfuec06bAtPI9FN6mmMBAlMu/ gx6uUuVaWAebHpG448QKQ4Zee5aZXGPI36vLNIbKUyhckmR9NTrgPFt6Z9APt8ewaePi 7AVK6/CeI5aLQOnuz6KH/SqqzmSVwCYHc0Mm0SeCB5fcvbAqVBDbo1TomcyCR3Lt0/IO lYkxg282/BnIk5iEQijmUgZZsniC7MebvUsoLII7hD9QL3ObnkGU7eVTUXj9Apjgww1Z 1Xcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CfwSh7ts; 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 u13si15121127ybm.51.2022.01.24.12.21.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:21:08 -0800 (PST) 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=CfwSh7ts; 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]:49428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC5pr-0000oL-Gw for patch@linaro.org; Mon, 24 Jan 2022 15:21:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lA-0006ZS-5m for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:21 -0500 Received: from [2a00:1450:4864:20::52e] (port=40701 helo=mail-ed1-x52e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5l7-000386-5v for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:15 -0500 Received: by mail-ed1-x52e.google.com with SMTP id a18so58492468edj.7 for ; Mon, 24 Jan 2022 12:16:12 -0800 (PST) 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=2JKLnYKPM+EQcQ5BAumwl8ZRfWG1GUNMSMDRrhS3n0Y=; b=CfwSh7tsecuebpy3FVrlZglL5FeFYi3HTXT2Hqzh75pEIuv6EHQ+Vw4zVdGfVkWWd8 PQQDh7EudT8cbWIFzUuKFwRw3aEIT+PwuCvLHTlvQIyCL3UBE+uXQ3ooVgXJoFo04xZS bLEPMsqiMB/k8nW4+yKgVQOSTVKFC3Bs85PEZ0J3NDmZiWFBR6YSlrHAzVR5n/hdaZyu 6VG7fZRpcfZXWfZZKXnBCzMA13IEeiNZ+2Pb9rUgpImx20T0d5Mw5967R1azxk2Z+dm1 XK+qNRbBGrbVip+xh0iJPgus4rtyyijv+ftAIrme2ZohjTDR/hdsUNvpATqelwxYa2SA IMOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2JKLnYKPM+EQcQ5BAumwl8ZRfWG1GUNMSMDRrhS3n0Y=; b=sHCPgaNbfEWhtse2IpEMZZ/ef8ZHQGGZ+4XAxJ+psZTV/Cg0yBYEoUbSHwmhGcnRYu SlThiS9Wthq79X00GiwqOMFfqahwMAAndhHBDih1F/PSP6lEZ/F2SS9hPNaUCA3zV3LP cnTGS7RC9P7gESCw6NvrzCGBFY1eOdWjK2xaPiULqsOIvyOf1eAapVywcgwyjiAY8f+j fbINwVrCmozWhelSiXyz+WDCvb+Dhp9icr8/rfPAYTf89rmscDlBXBlrrfwQPKNQ9YzC U7sWiApsgsyOarOTU/MjMG/Q0a1ZnBP8cskmJqDMN4TcnarSZjMaJwk75TM2gZFe2BAI FWVw== X-Gm-Message-State: AOAM533Uqfxp75FOvAh6iih4uYg8VxFhhRO/Ue0tFPE72987DZhO92pI ySas7CJGQx4lsPuAlMEvgC5PXg== X-Received: by 2002:aa7:d3c2:: with SMTP id o2mr17699363edr.207.1643055370306; Mon, 24 Jan 2022 12:16:10 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id gg14sm5297191ejb.159.2022.01.24.12.16.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:09 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7ECAE1FFB8; Mon, 24 Jan 2022 20:16:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 01/22] tests/Makefile.include: clean-up old code Date: Mon, 24 Jan 2022 20:15:47 +0000 Message-Id: <20220124201608.604599-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52e.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aaron@os.amperecomputing.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is no longer needed since 5516623020 ("meson: convert migration directory to Meson") Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/Makefile.include | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 3aba622400..47cc7bc40c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -34,10 +34,6 @@ endif ifneq ($(wildcard config-host.mak),) export SRC_PATH -# Get the list of all supported sysemu targets -SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \ - $(wildcard $(SRC_PATH)/configs/*-softmmu.mak))) - SPEED = quick # Build up our target list from the filtered list of ninja targets From patchwork Mon Jan 24 20:15:48 2022 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: 534518 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3143216imr; Mon, 24 Jan 2022 12:25:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJwbGyzZiVBome74Zx21JPxsyqljvOl4LtKG71cP0CU6Rtm8a2X0OHOKIPQoyLk/HYY7135q X-Received: by 2002:a05:6638:3824:: with SMTP id i36mr7899711jav.258.1643055946646; Mon, 24 Jan 2022 12:25:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643055946; cv=none; d=google.com; s=arc-20160816; b=I+FrYl2wh4hFDSYOfdI6on14/As3QQmv1iVzGPbKXWyUQn6ycU9GUKLJfCU0xTBXVd FtgTD6xEuB9P8xn4NM8x7aHOO3+BVTCb3zmEJbMc+qiBAPbGNXM7QOFUdrNx9BxQm1LB uLYsiIZ6gNi4WvIvMctwhEhFjn7ecObV3EBf+P1+iDKilp7yUSGAX1STomrtenGvV1+U WxaoghEnJyA1SuNpae7/goNxUgjw862BzMJZqDLMfgx8OYVcsX9h+8Hn21AkdAeFFGGe 3hq8IHq1KGfbyWu512jmX4RqwQArgzLeiaTbGoAaQDc/RDpHr9zIpP02KenLmsP3Y9km zIXQ== 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=B+PFdg49CjIqjo/3MH2m0xFVDRDgDWrE13p/nEuIP+Q=; b=pf0B/Tidb54LoFluPyopbfCtdn0pi5fzJ5IwA7xccSMPIHOw96GXEeJAFvSgAjBt0U mxSMGvv516dOSV3oeMfcDo+65ffIsGU0uETpXIeFvJ94W8CuccTGfVlS2sT1TtPJu0rp OEdg4FYoXWtTVQG2n8PhI+HXDM6WV30t/j1ZGVasKXHsBBP8fZX/PypF22mrTTrvvO8k qljLr7UbJ7bPfvr78wjCweH98Z9TNBb/SLgqZghjdtB+Pc8qqxejCtty60hra/f6HgBp vivpNCALw5KQo6bN3CqPLxSt11c9CAbtst7r72BJ0ZAd55rnmu/MU1gbyiktvKM3G5OL NnKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=g173QchY; 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 q10si12074064ilu.29.2022.01.24.12.25.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:25:46 -0800 (PST) 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=g173QchY; 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]:58288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC5uM-000705-4B for patch@linaro.org; Mon, 24 Jan 2022 15:25:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5l9-0006Z6-1f for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:18 -0500 Received: from [2a00:1450:4864:20::62e] (port=44951 helo=mail-ej1-x62e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5l7-00038b-A0 for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:14 -0500 Received: by mail-ej1-x62e.google.com with SMTP id ka4so24628653ejc.11 for ; Mon, 24 Jan 2022 12:16:12 -0800 (PST) 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=B+PFdg49CjIqjo/3MH2m0xFVDRDgDWrE13p/nEuIP+Q=; b=g173QchYTjNVtaTut5anqOUPlLFZEMJJKXi5kS/JYUrnqr0x1lMOn7+HZ5QFJrgRpE 3LMQueNtR8FSx2/fUqpFAesNNKuWYxIeI7ptnCdSS1dP5ca0mfYuRccWMbLISmiDiXiY Lc5MfH3VV0paUigq1Oruv2tQsGnA5LDzqyLSDiNoBEyA8CTpVtV6i3qbEBSzz3O3ka6M T61pMUZng6rAtdLPrgEl4S8d/eAGpYgaefYl4SY0s0y5Hx3fMFeOdsk0PO+tBF8aPNcR 6l9WcogvAbk3whFw2LLIEvEHC39KPqUkuhbcydwHnPnhKCkXgrPJPBYoeGHghRFdAATA QgGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B+PFdg49CjIqjo/3MH2m0xFVDRDgDWrE13p/nEuIP+Q=; b=PHShJ6SoN2CauOeDqQgwBh/O3YtpzymrQr9rezwN/z/WVHX0j5pALsAZK3xG0tLSF/ CzvqnSFaDb1YdymW+U92MHCRQDFMaKl+4D/L4LqB7ozQE9gtKVLc9tMLUzEJS6AIbCa2 XXUt6p0DYJEFhoTkuIHZt2RrIjf9iFxdogV6Vq1UVgJ4TNRrWowB6+hUJkLf0z6jkoL8 H8UOyh/VeaIQDU3pTxu32FIr73rn30Bd60lhCGaz8RPyr5nMx2rWRAUI7gUUhSEqIOaj dzYW0BfSQTk8qoFC4EkJ9lmVSrZy1NoTEn8vUHX+Myg1evskizw7hLzM+C/I1hces/m+ cJLw== X-Gm-Message-State: AOAM5324VJsCKz589jrsQCVqEoR9Yz70ftOUWkydCxVfzgh7dk40YYsS SWXU44+NkP6MboU0RyOiP6hDmg== X-Received: by 2002:a17:907:9722:: with SMTP id jg34mr5046853ejc.757.1643055371288; Mon, 24 Jan 2022 12:16:11 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p29sm7155958edi.11.2022.01.24.12.16.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:09 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 964001FFBA; Mon, 24 Jan 2022 20:16:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 02/22] tests/qtest: enable more vhost-user tests by default Date: Mon, 24 Jan 2022 20:15:48 +0000 Message-Id: <20220124201608.604599-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62e.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , aaron@os.amperecomputing.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, Paolo Bonzini , kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" If this starts causing failures again we should probably fix that. Signed-off-by: Alex Bennée Tested-by: Thomas Huth --- tests/qtest/vhost-user-test.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c index 3d6337fb5c..2a4568cd7d 100644 --- a/tests/qtest/vhost-user-test.c +++ b/tests/qtest/vhost-user-test.c @@ -995,20 +995,17 @@ static void register_vhost_user_test(void) "virtio-net", test_migrate, &opts); - /* keeps failing on build-system since Aug 15 2017 */ - if (getenv("QTEST_VHOST_USER_FIXME")) { - opts.before = vhost_user_test_setup_reconnect; - qos_add_test("vhost-user/reconnect", "virtio-net", - test_reconnect, &opts); + opts.before = vhost_user_test_setup_reconnect; + qos_add_test("vhost-user/reconnect", "virtio-net", + test_reconnect, &opts); - opts.before = vhost_user_test_setup_connect_fail; - qos_add_test("vhost-user/connect-fail", "virtio-net", - test_vhost_user_started, &opts); + opts.before = vhost_user_test_setup_connect_fail; + qos_add_test("vhost-user/connect-fail", "virtio-net", + test_vhost_user_started, &opts); - opts.before = vhost_user_test_setup_flags_mismatch; - qos_add_test("vhost-user/flags-mismatch", "virtio-net", - test_vhost_user_started, &opts); - } + opts.before = vhost_user_test_setup_flags_mismatch; + qos_add_test("vhost-user/flags-mismatch", "virtio-net", + test_vhost_user_started, &opts); opts.before = vhost_user_test_setup_multiqueue; opts.edge.extra_device_opts = "mq=on"; From patchwork Mon Jan 24 20:15:49 2022 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: 534527 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3151022imr; Mon, 24 Jan 2022 12:37:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJxX4MFlMDhIv6DkoB66b4EMolddCRTCLXFSrBV+tpxI0KJHX4FnV3Rey9dN7eKko3r+pI37 X-Received: by 2002:ab0:25d7:: with SMTP id y23mr6258929uan.116.1643056678221; Mon, 24 Jan 2022 12:37:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056678; cv=none; d=google.com; s=arc-20160816; b=iKRs+MEaI1Qj/8qVRoIVR0T++v16gL9L0hyzAIYqU2pXRf8HLWzW9pl2/Vq9/dZUxN LOND81qKiJpThC1uygOJrCXPOq368IhE3+70YfaF5orcYOOUCx2qstFuvE7h2H6K5bJn 0zgvIGMamATZ5s+BXnHHL1xrYAhFKX2sHBxJbkf7DQ5EdLAm+gZmdEUUcnJv1AbhFsSR Plz7N4sq4uFRPdh3SFs+0W6IVyvIUualT6LVvHEJ7vrxnfJ9R5092PvJupWoolnHT5N1 PNflDIYnpLKoZkJvgH3JaXu6W+8yDROiOdm+GTteOL41bi7hczCDQO3FKsmpz2cWX2bX Bq5Q== 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=c3bRSi+/BjoZC9gfGoDbtSBXc4bxJ4NSTI3qm7LnSUw=; b=xMUEboJicL9ojx9uP9Z1K+NSTekMYZG1BJqdUfv+ExKkuO3hFrock0Ra/Yau42IHjl gBwmKmNtfDibNCZ7nZaY9du8cNxJ2Jo+E5b0VOMpnsDBKXfREUb13EwMYjfUIUNk9cit JLYlXRNNKlkfYn3LnVFULM4KITrLDwuSqCyPUJkFRNklEITDndS0XxV0qIgYi9wYNvWS LCF7u8QjS1SuALoWWpe3T8FgGaEHWx5350M2m1NpDQdNT3AUOSpPFjuBO8oDSgnwAbQU uGrP0pOmuvwk0Lq3p/Ns9Atakh/b2rraGnDxd0EYkeigumZVGc/p6ZlXM0oZE7UGsNBl jqdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="B/A7R9OI"; 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 x8si1446679uaq.262.2022.01.24.12.37.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:37:58 -0800 (PST) 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="B/A7R9OI"; 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]:33836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC669-0003AM-MF for patch@linaro.org; Mon, 24 Jan 2022 15:37:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lC-0006ZZ-CO for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:21 -0500 Received: from [2a00:1450:4864:20::630] (port=42796 helo=mail-ej1-x630.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5lA-0003C7-T9 for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:18 -0500 Received: by mail-ej1-x630.google.com with SMTP id m4so24687896ejb.9 for ; Mon, 24 Jan 2022 12:16:16 -0800 (PST) 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=c3bRSi+/BjoZC9gfGoDbtSBXc4bxJ4NSTI3qm7LnSUw=; b=B/A7R9OI2OWSC97pKkhX7R7CRK5Z6p5OcXVZBG8+8bOaUa5qyPym32sczarjW2tcyK S7t4KeOZsU6dJAYOdv6nKlLUYrD/D5+sws7OfR1BpeApB1Yxi9ea10W4j0wB0Ew1EycT XW1UPgVh5OoDOt5kYMOYJdzZk+iWvoAok0TjvKLIiK79IdRP/sQ+bj3wfRLRyeeb2/UF b7/lxCVX45AjaF17bNxUqTyi9CVQMAhx2eQXybpU8gewDG+jQMXZEB8hNCUtAJj28icV 4BaI8S3M+xdGIljVpxchA2h+EXGvtFr9tKhgHqjVGD314X7kOJeUr4vIVt1Jabmv/Vyd mJ1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c3bRSi+/BjoZC9gfGoDbtSBXc4bxJ4NSTI3qm7LnSUw=; b=H7a0ZTvqECcKSubcWYMAhJ47XcT/6GHvQOo9f5OQi53Bk4pfW9cG2Jaet88pzasSls mH9cY5/Z8N8jIaO7t5IA8ewdNANRqxcTAnhz7w5Q/qglPJDp0cSVZpkuJu6S8F5qf42w QHvfuwReJBA8L9fXQM9mVYTdEBkPM+G0yFI5174gsC8qsRVybJUD+fuFQyeGvnPEWEWt cwPvY+/8yFCRny7u7/wWlYjyxavyNyunRBsVm0rqhPhFf+nsvMV17yNe8ZE+vhYvQGXS uROHqqF7YFLUKfdKwcGcmphNbKXtVJvkaX7VbQwQiPLVdqyI5mqoBKRvvc1jpD/XNNGI cI+Q== X-Gm-Message-State: AOAM532357fJeic4z4qO/Bfhrdn8Tm4JNWwybCeeCFjo4lgl88qEboKV IV9JEd8uWIsqDvWSJzMoyAXZpw== X-Received: by 2002:a17:906:a091:: with SMTP id q17mr13631031ejy.669.1643055375651; Mon, 24 Jan 2022 12:16:15 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s7sm5285484ejo.53.2022.01.24.12.16.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A4AB01FFBB; Mon, 24 Jan 2022 20:16:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 03/22] Makefile: also remove .gcno files when cleaning Date: Mon, 24 Jan 2022 20:15:49 +0000 Message-Id: <20220124201608.604599-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::630 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x630.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aaron@os.amperecomputing.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Left over .gcno files from old builds can really confuse gcov and the user expects a clean slate after "make clean". Make clean mean clean. Signed-off-by: Alex Bennée --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index db9a788601..65e0d2dd4e 100644 --- a/Makefile +++ b/Makefile @@ -206,7 +206,8 @@ recurse-clean: $(addsuffix /clean, $(ROM_DIRS)) clean: recurse-clean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean || : -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) clean-ctlist || : - find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \ + find . \( -name '*.so' -o -name '*.dll' -o \ + -name '*.[oda]' -o -name '*.gcno' \) -type f \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \ -exec rm {} + From patchwork Mon Jan 24 20:15:50 2022 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: 534525 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3149194imr; Mon, 24 Jan 2022 12:35:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJx0bhewene29+krdmQcGUFzpeLFiF2GGpHlllykRnpDXrvWWkaIudfHIhUmRi3XaAgaL6um X-Received: by 2002:a67:6285:: with SMTP id w127mr2457304vsb.33.1643056500137; Mon, 24 Jan 2022 12:35:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056500; cv=none; d=google.com; s=arc-20160816; b=LmyUa6y1/ON8bepqBWLqP3mvP8nPQv9C5CSe8AzQK6t3lLY3oFwvTiY9ct+HtCUQPQ iNNSaaWXMb3rqSEMezSdqNw5cuZmHkqw9NT2gMpuVzqnpNzaMUmM6FtIOBDGXi84OLUj VWPZ0Tni4F8lummQGYENH02PPqkCB+NZE48fIIpIU/DwirfWcTUrdmRTKHlEAObh/xf5 P1w5UmQ/JVR00v9/fo9jAQ1huZ6TNUeh9TkWbpURJ5hnEfu76eef2y4MSzZ9N4C9t7M3 FD9FQntUN901N3mHcIXVarFdLJ8ktekQ/TRZAUXWk+4AutkriwB5fw+ZdDbpTYSO9WOk Hdpg== 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=I/xPZzl3lG2SLk3MNBHiq/8rUf4c4cSH6c408EKlwY8=; b=BBCfUY8po2J6S5Yd//2oK5LVwt3dTmP4rbGwe4F4laxaRli16GK5uQUASc1LuR3XoV MnnBlqot6ngIFrZE63EvP1bQgWTdKXShdaOwoY0ObvwjuiWABJFHYqRWsuJbkPDrlC3T UtP8137DzGEC5MCbdDcg9/bnyre8Mm/3rQ0DHUU1bLdwGZxoWUfogjsj7bytopOpwvt3 b1CWY0JbdTF3wUm/cYy2yLEYNIOQTzSkTEMzwzpAHXNYQ0HOfOuTj7xw+y3oRVjKF6ak Ctm6XdJJwY6O9SoRyHNN1unFZsMHeVTPuEThkpWAbym8us7WPZwu733fmqjomebIPWiA /VRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NJ2OD4uN; 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 z14si1843967vse.493.2022.01.24.12.35.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:35:00 -0800 (PST) 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=NJ2OD4uN; 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]:55448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC63H-00077M-Lc for patch@linaro.org; Mon, 24 Jan 2022 15:34:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lF-0006aE-E0 for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:25 -0500 Received: from [2a00:1450:4864:20::636] (port=42802 helo=mail-ej1-x636.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5lC-0003D7-DT for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:19 -0500 Received: by mail-ej1-x636.google.com with SMTP id m4so24688073ejb.9 for ; Mon, 24 Jan 2022 12:16:18 -0800 (PST) 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=I/xPZzl3lG2SLk3MNBHiq/8rUf4c4cSH6c408EKlwY8=; b=NJ2OD4uNJxrnsOwuridk/CJhhGtOmiDyDIOK5CrQIXNNzFHqi5gPqXhWvTsRxgSVPq 5MNJSXRHgAT6jU1XbKHJr/HMfErWrf6+v0xCrXXeoPOGhRimWeMIHvOzbf+RVYjP5E5R dRlQlkra3CPmyUc7ZHgLoPxb61kMh+cKS61C9JpEkbyCwl8YrROuvKVNhadoLkhe8qMt F6IIzf/pIHtovbBVVOa4wKbPDkiuQY6oPiaKqRnv6IDzGs4AwBquVNxGiJq+fyYpjbOQ SdMcP1SVfNW+gOBYqLLkXNwVDdho/OOzeT6nQG/bWVi7EelZ3nKBYm/d5FXyFClMQ7sw S5TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I/xPZzl3lG2SLk3MNBHiq/8rUf4c4cSH6c408EKlwY8=; b=oYJHE/PLOBuZq2kafvGlmjVWaOLbzV8VGZaqyzMLSPivCtmUBi5wzIYkPgWtjQADMk 4Rwdsj0nTbx6C7Os52kHWx/WfK5WJkCyYYQMN1l6ZVsCIVE6arj0q9jaoUgwcyNUGeHL vw/U1mweyi6FcGFfcAmd2NtjIkRGR0mBXlGaAjkjE8LxRdgK2JBTQUrzyPuXrE9bo/Zi arz+UpFBf+EXFmLXcFgPv9+9rSxG2Ql2mEs5vw8oYa1phGWwrNhNf+k6oGDCcxuLkhkU ynPdCcXiNTRga0hjFTiYkpwLyUtJ+kfHBfXosp7IPLB1ueJIurw9f5r2I2nWetygX1Gv N/nA== X-Gm-Message-State: AOAM53350J1RBbN42+dsJ5yjAgKIfPfRUvbsSIZkj2aue4AtHYXyWR5V KfUHHl1Z/PPtitZJKkcTAtf1gg== X-Received: by 2002:a17:907:9804:: with SMTP id ji4mr3298008ejc.409.1643055377128; Mon, 24 Jan 2022 12:16:17 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id lc27sm5410458ejc.142.2022.01.24.12.16.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C36981FFBC; Mon, 24 Jan 2022 20:16:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 04/22] .gitignore: add .gcov pattern Date: Mon, 24 Jan 2022 20:15:50 +0000 Message-Id: <20220124201608.604599-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::636 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x636.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aaron@os.amperecomputing.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The gcovr tool is very messy and can leave a lot of crap in the source tree even when using build directories. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index eb2553026c..9726a778b3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ GTAGS *.depend_raw *.swp *.patch +*.gcov From patchwork Mon Jan 24 20:15:51 2022 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: 534519 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3143861imr; Mon, 24 Jan 2022 12:26:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJzzpTqm2RpxBfyfW1UnPyNAxo5kywkpObckRLfNJAwobI9c1n8xL0tASjT+DXl3UwYMMgm5 X-Received: by 2002:a25:7e46:: with SMTP id z67mr24472393ybc.595.1643056018335; Mon, 24 Jan 2022 12:26:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056018; cv=none; d=google.com; s=arc-20160816; b=0rHmxywbp9ka4nE0O38Dcrprm8R/NTMtQyLK+FdE5VlwOEhcgZ9wNpb87TvUh63pJu P54Y6Ui7OhzQyvvsuKFu2KXah2An3/yG/Hj284RXYI/lg4Mq7NQ+BsN0mqF7FfeE+Ah8 N+au2A5ginr0yWU9FX9Ygu2XOp0M1PyOy748GcPFqO3aqjoObVxiCME+XoSER2YdR+bF JAgXJGPYYfeR/upY86lqN430faohVJiv+GMsyzljHz9x2f8fCOR4nD6kX3uYx8jmlM6l xL+c/4vOmV8sOHIarXA05f6oHRgxXAoCGymOmzZINj4+JOEXDpIYBBvX28pHIrW3fWZG N/YA== 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=K7aKO1RVrESioDmXfc/uQzaqAxN2cIWA1gbroKbEYuQ=; b=l+4w1E6AQ6clthkw6TnMev7i3tABYBYz1e5kgyeWjD3g1E49Yh2FUhD5unF0BgWr5p qV+3WrmiVq24ecjCJZsi3C8JdUKjLZCAE5Uzto2+wo7IpWNALw/xzDfP06fiEDt3W7FG xqwCBWfgDhxBE5MxwWKwYPjCZP5+2QQ9Snhntl/Hk0AXJ9fOeHL5jYZma6LNlxC3BMz0 ag+16ih6n3Bfx3D420wNUlqAPR7YVL9dSxoaj4A5FO6ecGo/LYviLmzQasRdxNeqehj2 kn9wyOS6RT0izHv+c6sxR1fqqEnpOH783wIhrzWA9zpXV4l0mLfBUtIOOWOmpXXdbvke V2sA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Z5Bet9Dq; 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 190si14374469ybn.346.2022.01.24.12.26.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:26:58 -0800 (PST) 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=Z5Bet9Dq; 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]:34162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC5vV-0001OW-P6 for patch@linaro.org; Mon, 24 Jan 2022 15:26:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lH-0006aO-Ah for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:26 -0500 Received: from [2a00:1450:4864:20::635] (port=40601 helo=mail-ej1-x635.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5lF-0003E1-5I for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:22 -0500 Received: by mail-ej1-x635.google.com with SMTP id p15so24641362ejc.7 for ; Mon, 24 Jan 2022 12:16:19 -0800 (PST) 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=K7aKO1RVrESioDmXfc/uQzaqAxN2cIWA1gbroKbEYuQ=; b=Z5Bet9DqysPKxyhgeUq9KXdNuFd2UCg282eMOy6Nqw7hqXNCEfkk/BNC8QGyr6HH9b Lh8HQTr5KNXlVzBRInKI5GygIml+ZQn98SQS8fSwI3GAUAXZonkEwWEqP8xTI9wKYSD5 4pRYvT0aVoqFrGrB7LYB+PwVRX//IFYvu1hV2ulSsrcdKLyKkPG5yKdP27z6pyDQgJG8 HJshybk7WUmH4aUqP/P2kBMUQ7b3xshLHd9YLhSb07LdW/Z/NJXCBvHVRuREHvVAZaYn 1tzBrbUyqrLQ4MlxhsRUapfX+DRzNnrCKLlb5rErT3vfs0L0ntYpyjZ0vjWnvwakNhHc 16KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K7aKO1RVrESioDmXfc/uQzaqAxN2cIWA1gbroKbEYuQ=; b=Md3jmz2SdKngHTyifHEY3ErV7YtIhcjBr7LGBFH7hD1l7meT87s4QYFeELhWvFxOnc gHRo8BUGw9oef5Nxuh6oX65GNwJiryIGJEatjjDe6mZyUfQT+AabTI1mAthMsyGYKZlr jUVDC82g6JlrMsB0zvsBq7xbuNEOFuaHcBuavD7ZOcrFViq70YuRideRQJAa0d78CBNv n0Q0P8SX9z84/P7mWlwhXGAgPPG+WPiFU089QmcG0LfUYk5qvFfHxrTUZcL6fCUyqOH2 6qe8fdds6bn0J1aqQOFwtQoZcji40UdH+/M9IObBhmbp9Koub6WUCk5Wb739F2sU+qP6 qpVA== X-Gm-Message-State: AOAM533RT80jIQZQ0/wErYjSBfkZWkmEQW6FVkQ6zCqw1pbCjCiK0E6s 9+Y/6WZXv0cAGucJIP2X2iFgzA== X-Received: by 2002:a17:907:72d2:: with SMTP id du18mr5821491ejc.524.1643055379049; Mon, 24 Jan 2022 12:16:19 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r15sm5242379ejz.72.2022.01.24.12.16.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:14 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D11301FFBD; Mon, 24 Jan 2022 20:16:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 05/22] MAINTAINERS: Cover lcitool submodule with build test / automation Date: Mon, 24 Jan 2022 20:15:51 +0000 Message-Id: <20220124201608.604599-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::635 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x635.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , aaron@os.amperecomputing.com, robhenry@microsoft.com, =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé lcitool is used by build test / automation, we want maintainers to get notified if the submodule is updated. Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-2-f4bug@amsat.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index e4b3a4bcdf..6d5539d46f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3579,6 +3579,7 @@ F: .travis.yml F: scripts/ci/ F: tests/docker/ F: tests/vm/ +F: tests/lcitool/ F: scripts/archive-source.sh W: https://gitlab.com/qemu-project/qemu/pipelines W: https://travis-ci.org/qemu/qemu From patchwork Mon Jan 24 20:15:52 2022 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: 534523 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3147900imr; Mon, 24 Jan 2022 12:33:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJzhKClda/+GgiPHb5evZ0qMLaksdrULCRJyAoCOi6ErJ3miPQroqZuNbqJ9yO3oAYTX62tQ X-Received: by 2002:a25:9248:: with SMTP id e8mr24550006ybo.682.1643056386505; Mon, 24 Jan 2022 12:33:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056386; cv=none; d=google.com; s=arc-20160816; b=Zmw6AMo8yYRvfXOGXq7fgRH2zDs/05tkdoqbgP2J62vDpSu4iiAgH4qlZr7InI/2q+ azm4YZ4iJZpJI/IsbSSucmq2eHd9EmZ9FVbUovBZEIKIY7nfX86VtBqdFnSkrRgZ0pjB +7wfpljyZlt1omcfyBHYXV3ucZhNVpAmLAkjEDjq8NQBsCw/7OCCyRKPWhJgasXd+EDh FBeTUHOHhTvRMtZzvhsLxWCqIva0qFKybVKb9biJQzdYuejJBqQmBwj32BWqo7PBd1AJ V45mC8KAsFTLF9Ciq/C7n+cRkCaJvpjiXI76oDvGltduEgax5GL3HQx7OKD8Oc2YTLqK 46gw== 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=Qh3MOdvacAJFLMgwCts4uchTskk0TJYrOoHeZN2YKoI=; b=RY0YRLMEU3s/zaIiAuPnf5jBrl3tvmBnSHPoCiij2aTbXi1T3jclh9DN8Xt3tzsY/y vVASO02bryFRNFp2b/gIuCUEcH8xcPPyCOAiIj6Sva2YJEjkYicRNDT8xWTMHj2BOO4/ TfTFEcbbrhTVJaUnUAOjVQgutnDUMJ1T4BXXuZF8/rRhqBnzUfHQob1X8oK9BDlCpA+u k3p81Df4V7rAJedWF0OxysS7wYj/GmAOmlIXbtDkXzn8Pe1fyLIHwW0NWCu2L0IA1XbL TXakEWgXZ+9idoZdmVxCh+yndfdmf9ef0nLmmNuuR9IZdTXZlsgx3OYqyjPjBzL8A+Dz 098w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gfP2snqz; 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 n82si14044992ybb.405.2022.01.24.12.33.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:33:06 -0800 (PST) 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=gfP2snqz; 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]:49772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC61S-0003NA-10 for patch@linaro.org; Mon, 24 Jan 2022 15:33:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lN-0006dS-BE for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:31 -0500 Received: from [2a00:1450:4864:20::631] (port=36497 helo=mail-ej1-x631.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5lK-0003EX-MD for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:28 -0500 Received: by mail-ej1-x631.google.com with SMTP id s13so24649766ejy.3 for ; Mon, 24 Jan 2022 12:16:24 -0800 (PST) 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=Qh3MOdvacAJFLMgwCts4uchTskk0TJYrOoHeZN2YKoI=; b=gfP2snqzcbpHmSMLahP2bAETYJxeHrHRY7fu7B7y7sHghMXyiiVmkpvlWerT9cmNg/ 4oH+IYJ2jsNU65oBTisiWYFJ5tfKK72VIWZcAg/+TSJZOPQ/QDrlVSDHt1JIgt1oSHKW zaeVxs+r4DQ78bJDIzNXB+xa4DO5DCA7blyojfEGgJ2rF5FcRzLgJ1/Ci2qCjqUauHcl nzG6hwOyyBK4uNp4T276P8KsGkZuTH1nsw2R+/SCSMhCJZ5WVN86EWerhjhhtc/1tPBh qa7RDDaYRq9KFzsJc3ttZDiLLwqAZ27R5nwCkG4N/ucfkQwY3S3YikzeWd6Q/XV3R7WU DLfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Qh3MOdvacAJFLMgwCts4uchTskk0TJYrOoHeZN2YKoI=; b=2Ur5VZF30KKOumrFgYLN84AKhhduGpcyD86QHxG3g4adTsKuMYWt03WKMnxd0y1Hmv DBbdY/OsQCcjLkmFnZMzaNZBjnxoDLn91xg8+6KcFW5SGCezY3G4QLA0FTEMrpfaG2JH RbDpT7AVY6DqpG/jtU0KzUDIMsPAHPtnTOxNJOx6nX6PI6cJXUZIpDuC/c3LoDuEeB0z fZyA7l93YXNsnNXJ95Khr2v8inMpuMmQzB1oDzFysZiSG3JQKGgQniQUxD7btkhlPWbN KmpPRzJDJBFrIAp3F7U+f7SA+h6jMNQ3EKGSEyyPJyduGAn+G/Eu3PY+I2dtvUVw7RBq o7sg== X-Gm-Message-State: AOAM532urf+FljYWyDvBbhOsnoNCuhyHXN/rPn+WXEavWWkTVo4/WfOz Y71bR+IBB1g3OM6XyY6FNZgjWw== X-Received: by 2002:a17:907:3e96:: with SMTP id hs22mr5111052ejc.640.1643055383193; Mon, 24 Jan 2022 12:16:23 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h1sm6989437edz.64.2022.01.24.12.16.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:14 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E7F791FFBE; Mon, 24 Jan 2022 20:16:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 06/22] gitmodules: Correct libvirt-ci submodule URL Date: Mon, 24 Jan 2022 20:15:52 +0000 Message-Id: <20220124201608.604599-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::631 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x631.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , aaron@os.amperecomputing.com, robhenry@microsoft.com, =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Correct the libvirt-ci repository URL to avoid this warning when cloning / refreshing the submodule: warning: redirecting to https://gitlab.com/libvirt/libvirt-ci.git/ Fixes: 4ebb040f1fd ("tests: integrate lcitool for generating build env manifests") Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-3-f4bug@amsat.org> --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 84425d87e2..f4b6a9b401 100644 --- a/.gitmodules +++ b/.gitmodules @@ -66,4 +66,4 @@ url = https://gitlab.com/qemu-project/vbootrom.git [submodule "tests/lcitool/libvirt-ci"] path = tests/lcitool/libvirt-ci - url = http://gitlab.com/libvirt/libvirt-ci + url = https://gitlab.com/libvirt/libvirt-ci.git From patchwork Mon Jan 24 20:15:53 2022 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: 534517 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3142046imr; Mon, 24 Jan 2022 12:23:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJzAJbDWD3YihnVO0AHooZcs1lhHDdyIvczObgDSTzEpnuj+JOf4CIokEhCrQ5gEylW/RI1q X-Received: by 2002:a05:6602:168d:: with SMTP id s13mr8739059iow.55.1643055824135; Mon, 24 Jan 2022 12:23:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643055824; cv=none; d=google.com; s=arc-20160816; b=wM4OYPAk2g3i67vvPn5FgY6mP3REeBReLTqWWbMe//CVWq1me1QUiWQpshNYWznETp hRLigqynbA4wvKoHJbFn/1MUiXfzcX2e6il2gS0UziuFCOzxKLBJAos1ISLpoLdCx0uh t272iMALHPFLYjqevahAc02hi1WI19KbAxRjl/acWw9/gJZGiShLNHwkcu1T4gxpQfvi EUdY7DYgBHXNB1V1TfyhdZUmKe05PjClsdjKJ5ZaATG38sY0X2PCk5ZaSQfQSofIZrIJ ev8ubbr2TwBBiX1eh4LSLlJnQ2SFUbY6FdrcDX73Z3d48byq43Wu6ETUJ2tiTSOsVZoA cGlA== 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=WwQt43irj7rm302zSIC5pBYW4+QTRQTsXzXbo7p8Q+o=; b=k72Ndq5a98RjKX316Tixxl7gxb135+wq1Nt77fzhHPxzmrdGT6+gUXrRvgnr7TZOaS JE87CRWJf+ExLEL3JpC2J395Ayl5zr08mx9y9VbtHJEG9iLijWt8n8ZbJK0T/uFt/mDv 4KMjx9lszKGf8/X5FXt5yBrJ4/fpYIET1hdP/o9sDGg3K1nbVFAbb3e3bOHPWxilq8/A E7X7XcAYv+QCGv7+iXc6lFpwYijeO6IyxszeYUFbLfjwmiNdL0VKFFHXOf00hseLPlsH OhTu267nBJfFsMW82cBfz4V8iPkuhDjhF2kRmQNeiZ6cjHPZFBtCpM10O4Ts2f6sV6bf vGoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JTdmoRVV; 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 g9si7927627iov.52.2022.01.24.12.23.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:23:44 -0800 (PST) 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=JTdmoRVV; 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]:53610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC5sN-0003iG-8e for patch@linaro.org; Mon, 24 Jan 2022 15:23:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lJ-0006bq-BI for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:26 -0500 Received: from [2a00:1450:4864:20::629] (port=33630 helo=mail-ej1-x629.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5lF-0003E6-E8 for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:23 -0500 Received: by mail-ej1-x629.google.com with SMTP id jx6so24697425ejb.0 for ; Mon, 24 Jan 2022 12:16:21 -0800 (PST) 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=WwQt43irj7rm302zSIC5pBYW4+QTRQTsXzXbo7p8Q+o=; b=JTdmoRVVzdDGZfAvT6r5W92MIobkS1cOS//T0DmSJ28E8j/yB3lQe7nJeRfzkyHuzV oBnIc871CxmP2hV7+3ZKlKX38hLuyuygNfDa8FbYiL3YiNXr/9HHo6fiaQ3RfF+PwXiP ng69GUeLPvS76+8SMYxvtsNvnuzq21+QRo56BJsATowgd2jSqL05Hd43f4QJ5mZTzgTR CkEDKC/TVxWtulJOv0I4+wd/uCZaiOqCv1cLeLil4T58vu0psMFGmr3j4wZEm1CyIuQJ imCgP02PeSrJSDQuR/rQPpk9bPkXAFyU16FKnCs0acCkJYe41UrScivn3Pvy/nARPkkQ JBZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WwQt43irj7rm302zSIC5pBYW4+QTRQTsXzXbo7p8Q+o=; b=xZCDvXqUROTRN80vNLhGoJFcAG3ImwbIgZ7pHhnWL8lVQGtODDi9WxLMqNLHdoCYsr ssAo4xzMtsJXe050bar5MbCz6QB0wvb7l2gKgiZ+5CN6LHhs9G7CwzIYiMosyI7iGqcx 9T1qcJvk+o3QBuC9Q56hfMM3M5bNuOgPWOKktr6xOO1mx30mv67KthECzl/sRth+aRht vKruf6+KEx71fm7qOpxLqKYPEEj7fJUGVnun0N5ZOce+2pozxnmCSrjakahs+kajm5cx z+BAcEMhLrSyE4OBPRLzweEQxWBfMdkPeE+sKZUTslo6mTWCvBT7nGfPzLQz+NIXdjiJ RDDw== X-Gm-Message-State: AOAM5317majp4bdC6cldVYnlE7xq+c5BJCraiEUkW9bOgC/4WgEGAzhs NKqw/n9WgseKAZlXmXamNg0t1Q== X-Received: by 2002:a17:906:7306:: with SMTP id di6mr13410799ejc.255.1643055380031; Mon, 24 Jan 2022 12:16:20 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c14sm7119954edy.66.2022.01.24.12.16.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:14 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0C6141FFBF; Mon, 24 Jan 2022 20:16:09 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 07/22] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Date: Mon, 24 Jan 2022 20:15:53 +0000 Message-Id: <20220124201608.604599-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::629 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x629.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Beraldo Leal , aaron@os.amperecomputing.com, robhenry@microsoft.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The script only include the local qemu.yml for Dockerfiles. Since we want to keep the Cirrus-CI generated files in sync, also use the --data-dir option in generate_cirrus(). Fixes: c45a540f4bd (".gitlab-ci.d/cirrus: auto-generate variables with lcitool") Reported-by: Daniel P. Berrangé Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-4-f4bug@amsat.org> --- tests/lcitool/refresh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 033120e223..25301f2ef0 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -62,7 +62,7 @@ def generate_dockerfile(host, target, cross=None, trailer=None): def generate_cirrus(target, trailer=None): filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars") - cmd = [lcitool_path, "variables", target, "qemu"] + cmd = lcitool_cmd + ["variables", target, "qemu"] generate(filename, cmd, trailer) ubuntu1804_skipssh = [ From patchwork Mon Jan 24 20:15:54 2022 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: 534528 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3151134imr; Mon, 24 Jan 2022 12:38:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJyzh3Xo6Tpr5zVgzbXHrEhgVNeZcDeXOX4dTF1UccjvIO1a5yg5WqoX3bVadYQbjhe6uFSk X-Received: by 2002:a05:6602:493:: with SMTP id y19mr9112947iov.126.1643056689694; Mon, 24 Jan 2022 12:38:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056689; cv=none; d=google.com; s=arc-20160816; b=k41J+jfY6eUeYQrK01c+ZtcvegsEiw06Hvd+NrDCoUMNMoY854lFotAx1q1jd1AVlA jySiihVc0Gg7Xsl1i4941cxTtzxzdfimVvgOUgiAEAZxiKWXbaunlSFTpnb9093LG9La VRCbkBpBH/tOitsKKvZSCSvLde4r6YktV5/eWqjz2OxO5OHYrZpAMkQry2+wfol/k6M6 BCOyrOLdSpC2fv+7IkEldxTpux9RTF9tJrhBiUBVxICvSyc8MEfCBhl/f/pWLTPJiyZn e47khDiGehUNHJ40XQtQpgrKbjY4/jAgcnp1VvGaRY48/xdD9gdzuK0zYvv+htD+WFOH NXfg== 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=iIScV2hzu0d5hJ8cpH3X3ZD3eZ/sGounuHjKpSD2I3Y=; b=yJeZ3sENBTsr9jh40S/NlSnAknR0e1i21T5boVlWTvvsMlUipgxvMAHNH7ba9NLKn1 hQFLStjL8QsmZB98KeA7kbn1XEFiK9QKiYuK1ZNC/VcyrjiF6iQ5yoS5JslIMEmL88hi 34CtPi/KMJgHvUMhtyHSQ8JPgSGOJLLUTMv91Aa9MfeW9kOyV6PUZtOSBcBEOjQRXnGC UEFLubfpGf6SmUnrrmZUFhnejX3A+5sZsrJ+bg7RRaWWumAn4Kju+TcVVat4JZNGuA1z KfGwjf3sbpKSLdqpjq6GOXLFmzBbInocM6KcOffiS1v+FHucA/HcZJpZQT2G4+zKiwhx rVQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RZkVmLsz; 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 m14si3475753jat.73.2022.01.24.12.38.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:38:09 -0800 (PST) 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=RZkVmLsz; 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]:34556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC66L-0003eb-5S for patch@linaro.org; Mon, 24 Jan 2022 15:38:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lN-0006dT-BW for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:31 -0500 Received: from [2a00:1450:4864:20::62c] (port=43777 helo=mail-ej1-x62c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5lK-0003EK-L8 for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:28 -0500 Received: by mail-ej1-x62c.google.com with SMTP id d10so24650017eje.10 for ; Mon, 24 Jan 2022 12:16:23 -0800 (PST) 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=iIScV2hzu0d5hJ8cpH3X3ZD3eZ/sGounuHjKpSD2I3Y=; b=RZkVmLszoSXjaJbszflHnwZk37vPnIwNajvytOXg3I1pLE8QaOyzGc/WuV8j/D+XI8 fULUTvJCan3jEHHYIipL2qtKSoOYvhMQuOGSPWrtvMdEGvbtUbA/qWWKM0mMSu/jfEWm VnccCJl1umraqqe1VEJBzk8y2HnRn6s2D54yoBQ5DKJgP84uqTkEPEDpZmzt99c896LX /v0XVkuWUP0O/6TZRUG2401l152NZd7azdLOkcGHNIiqfaqucES49+rW8pWYkSxOZSFu qS6UKkmvUEJep+K/YjjIzZls5tMtjJ2iHxZPvHl4s1l4xmIFRP8X2yZdWkg8AxzV9svA JJxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iIScV2hzu0d5hJ8cpH3X3ZD3eZ/sGounuHjKpSD2I3Y=; b=07sghexv2BLX+nvNJkIhwcDcLIXcrksNhNc1CHFAThpNbnl81vVKMrA/91M5F+Xivv znXRCKe585uffQDSGZM/8meh2wqHot8vxockkTj5Fkz9K15D3vJBZINdoGP68q9sClIz u1cPuVD5kwPbwzv3GqMmvP6uh2m56+lB7ejnGBk8CsaIxOtmgF5M2n1Bnd9+bMQul5Y6 +LrUll+rI7gagAc1aKeR5/C6tncm2yuFv23r/PGibzlfCvcVpr4AFziuUHpFqbIjNkSK 52Y+Ov7Z6zOKaRmI4Vkm+VjO4qF99tLMsYngd5RRm2VOtR8dslEUSraOJHa85VxC9D6z 4N7Q== X-Gm-Message-State: AOAM530WQeF3DeRPD5S7Ero8d9sngtSuXzDY/w2ARnBtMpZoFGE4JQ4k 6Eu5+4FZNpydsOvhsGbbfm/3h/5Shhp5aA== X-Received: by 2002:a17:907:968c:: with SMTP id hd12mr13535625ejc.639.1643055382241; Mon, 24 Jan 2022 12:16:22 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id gg14sm5319186ejb.62.2022.01.24.12.16.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:14 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 378B41FFC0; Mon, 24 Jan 2022 20:16:09 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 08/22] drop libxml2 checks since libxml is not actually used (for parallels) Date: Mon, 24 Jan 2022 20:15:54 +0000 Message-Id: <20220124201608.604599-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62c.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Hanna Reitz , Thomas Huth , Stefan Hajnoczi , "open list:Block layer core" , Peter Maydell , Michael Tokarev , aaron@os.amperecomputing.com, robhenry@microsoft.com, =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Michael Tokarev For a long time, we assumed that libxml2 is necessary for parallels block format support (block/parallels*). However, this format actually does not use libxml [*]. Since this is the only user of libxml2 in whole QEMU tree, we can drop all libxml2 checks and dependencies too. It is even more: --enable-parallels configure option was the only option which was silently ignored when it's (fake) dependency (libxml2) isn't installed. Drop all mentions of libxml2. [*] Actually the basis for libxml use were introduced in commit ed279a06c53 ("configure: add dependency") but the implementation was never merged: https://lore.kernel.org/qemu-devel/70227bbd-a517-70e9-714f-e6e0ec431be9@openvz.org/ Signed-off-by: Michael Tokarev Reviewed-by: Stefan Hajnoczi Message-Id: <20220119090423.149315-1-mjt@msgid.tls.msk.ru> Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé [PMD: Updated description and adapted to use lcitool] Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-5-f4bug@amsat.org> Reviewed-by: Vladimir Sementsov-Ogievskiy --- meson.build | 6 ------ block/meson.build | 3 +-- meson_options.txt | 2 -- scripts/checkpatch.pl | 1 - scripts/ci/org.centos/stream/8/x86_64/configure | 1 - scripts/coverity-scan/coverity-scan.docker | 1 - scripts/coverity-scan/run-coverity-scan | 2 +- scripts/meson-buildoptions.sh | 3 --- 8 files changed, 2 insertions(+), 17 deletions(-) diff --git a/meson.build b/meson.build index 833fd6bc4c..51e3090438 100644 --- a/meson.build +++ b/meson.build @@ -451,11 +451,6 @@ if not get_option('linux_io_uring').auto() or have_block required: get_option('linux_io_uring'), method: 'pkg-config', kwargs: static_kwargs) endif -libxml2 = not_found -if not get_option('libxml2').auto() or have_block - libxml2 = dependency('libxml-2.0', required: get_option('libxml2'), - method: 'pkg-config', kwargs: static_kwargs) -endif libnfs = not_found if not get_option('libnfs').auto() or have_block libnfs = dependency('libnfs', version: '>=1.9.3', @@ -3491,7 +3486,6 @@ summary_info += {'bzip2 support': libbzip2} summary_info += {'lzfse support': liblzfse} summary_info += {'zstd support': zstd} summary_info += {'NUMA host support': config_host.has_key('CONFIG_NUMA')} -summary_info += {'libxml2': libxml2} summary_info += {'capstone': capstone_opt == 'internal' ? capstone_opt : capstone} summary_info += {'libpmem support': libpmem} summary_info += {'libdaxctl support': libdaxctl} diff --git a/block/meson.build b/block/meson.build index deb73ca389..90dc9983e5 100644 --- a/block/meson.build +++ b/block/meson.build @@ -58,8 +58,7 @@ block_ss.add(when: 'CONFIG_QED', if_true: files( 'qed-table.c', 'qed.c', )) -block_ss.add(when: [libxml2, 'CONFIG_PARALLELS'], - if_true: files('parallels.c', 'parallels-ext.c')) +block_ss.add(when: 'CONFIG_PARALLELS', if_true: files('parallels.c', 'parallels-ext.c')) block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-aio.c')) block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref, iokit]) block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c')) diff --git a/meson_options.txt b/meson_options.txt index 921967eddb..95d527f773 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -113,8 +113,6 @@ option('libudev', type : 'feature', value : 'auto', description: 'Use libudev to enumerate host devices') option('libusb', type : 'feature', value : 'auto', description: 'libusb support for USB passthrough') -option('libxml2', type : 'feature', value : 'auto', - description: 'libxml2 support for Parallels image format') option('linux_aio', type : 'feature', value : 'auto', description: 'Linux AIO support') option('linux_io_uring', type : 'feature', value : 'auto', diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 5caa739db4..5e50111060 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -307,7 +307,6 @@ our @typeList = ( qr{target_(?:u)?long}, qr{hwaddr}, # external libraries - qr{xml${Ident}}, qr{xen\w+_handle}, # Glib definitions qr{gchar}, diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure index e05f2fddcc..9850dd4444 100755 --- a/scripts/ci/org.centos/stream/8/x86_64/configure +++ b/scripts/ci/org.centos/stream/8/x86_64/configure @@ -81,7 +81,6 @@ --disable-libssh \ --disable-libudev \ --disable-libusb \ ---disable-libxml2 \ --disable-linux-aio \ --disable-linux-io-uring \ --disable-linux-user \ diff --git a/scripts/coverity-scan/coverity-scan.docker b/scripts/coverity-scan/coverity-scan.docker index ecff6ac5b4..6f60a52d23 100644 --- a/scripts/coverity-scan/coverity-scan.docker +++ b/scripts/coverity-scan/coverity-scan.docker @@ -59,7 +59,6 @@ ENV PACKAGES \ libubsan \ libudev-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lzo-devel \ diff --git a/scripts/coverity-scan/run-coverity-scan b/scripts/coverity-scan/run-coverity-scan index 6d443250a9..181bdcb263 100755 --- a/scripts/coverity-scan/run-coverity-scan +++ b/scripts/coverity-scan/run-coverity-scan @@ -402,7 +402,7 @@ echo "Configuring..." --enable-libiscsi --enable-libnfs --enable-seccomp \ --enable-tpm --enable-libssh --enable-lzo --enable-snappy --enable-bzip2 \ --enable-numa --enable-rdma --enable-smartcard --enable-virglrenderer \ - --enable-mpath --enable-libxml2 --enable-glusterfs \ + --enable-mpath --enable-glusterfs \ --enable-virtfs --enable-zstd echo "Running cov-build..." diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index a4af02c527..48a454cece 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -58,7 +58,6 @@ meson_options_help() { printf "%s\n" ' libssh ssh block device support' printf "%s\n" ' libudev Use libudev to enumerate host devices' printf "%s\n" ' libusb libusb support for USB passthrough' - printf "%s\n" ' libxml2 libxml2 support for Parallels image format' printf "%s\n" ' linux-aio Linux AIO support' printf "%s\n" ' linux-io-uring Linux io_uring support' printf "%s\n" ' lzfse lzfse support for DMG images' @@ -188,8 +187,6 @@ _meson_option_parse() { --disable-libudev) printf "%s" -Dlibudev=disabled ;; --enable-libusb) printf "%s" -Dlibusb=enabled ;; --disable-libusb) printf "%s" -Dlibusb=disabled ;; - --enable-libxml2) printf "%s" -Dlibxml2=enabled ;; - --disable-libxml2) printf "%s" -Dlibxml2=disabled ;; --enable-linux-aio) printf "%s" -Dlinux_aio=enabled ;; --disable-linux-aio) printf "%s" -Dlinux_aio=disabled ;; --enable-linux-io-uring) printf "%s" -Dlinux_io_uring=enabled ;; From patchwork Mon Jan 24 20:15:55 2022 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: 534531 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3154487imr; Mon, 24 Jan 2022 12:44:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJyH3fkl+hihIsHCu6WBEzkTBw8J0PKQ+Ywt3fLrNY/rxxXF3iPNigxJKPQDzVsXWt83ojj5 X-Received: by 2002:a05:6102:e4e:: with SMTP id p14mr5594812vst.26.1643057064133; Mon, 24 Jan 2022 12:44:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643057064; cv=none; d=google.com; s=arc-20160816; b=TB4+99xitSiARc6c1xe5LDrQGSU7Qj8pz1i/YKNtoTCsfjrzxKem4pkE3UuPHqtcAv WIA44HHuxvccMCIYxXoHRDq++UONnTUs6Z2+zlGow/26Agw9NrUJI9t8IjGD/fA5ryAP mU7iuC+9cIAG8iPMtYN3LL9AD+piXw38GjUUoFtQdh3w0SOhBKs26B/91YDAEZTMbs8F riBJEh5bPJp7gJrUTNPcBmIp7Dtx1EXQdQEHFwT+n5DQyOGxhrAJz1DAuRHIGUInjuey Jwa/xfrLJrjImOSC728Qk7+B8khBROWyU+NnbLuE5wrzPb4tA0G/O0sfMHhLu73NlpgX Z3kw== 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=OyqkU1LPhKwfsKUpKLuXSgvVGrpNMLeDAARAAPWkiJA=; b=QC7mTrbGtMIU/9s2HlIQD11GPQ3EWWt3bKJ/z6w4+haEhCo1bisL5xh11zgy+pQ6+K a/au+V1El6HgtdKwtugG7d66ER0m+V/LtCc0Ezth8Gy8UMOYuwp3Wk82K46WqFbq4aHf VFTNAGUv5JKw/1R4j79tTdj9tntPIwkAlFNF2AaWTjjejPIdOcNktcl6l+UNTFEQWXxr fwUy4H15hDJTroEN+mBeUtQLxnjCOhiQlmrYRYqpzBZxCxMElLHKrzSjch2IViAsx8kW mGa2H/8LFVYE0Pa2RIZ2Tr/pw3dCaCdYdS/Ro0Zqw9lzznZzBJEEFUuQDv2S4o4O7HYk WK5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lb0fMSzT; 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 t9si236372vsj.618.2022.01.24.12.44.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:44:24 -0800 (PST) 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=lb0fMSzT; 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]:45986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6CN-0003FJ-0P for patch@linaro.org; Mon, 24 Jan 2022 15:44:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lQ-0006fj-QY for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:34 -0500 Received: from [2a00:1450:4864:20::631] (port=42801 helo=mail-ej1-x631.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5lO-0003G6-8N for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:32 -0500 Received: by mail-ej1-x631.google.com with SMTP id m4so24689466ejb.9 for ; Mon, 24 Jan 2022 12:16:29 -0800 (PST) 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=OyqkU1LPhKwfsKUpKLuXSgvVGrpNMLeDAARAAPWkiJA=; b=lb0fMSzTr9MrtHWENLgYHtis/I7dJRdXpZsysiSVPX2QQMjHwKbYa56nvEuwiBuJ1r E1LDNRU8PSeknfP615k+7/bqLTI55xUxKfEmJCbIir/KZM8fe3sBuzGWIAXffUtJElLP o2U22ENqMgZIm8QC7Rw14o/ILdRl9wUUWCXUF9ZSUWrxvTCJv2fs/I+PsPh2jzGfQDS5 gVNXVjmZcOk8A/vhtK28jxf7XdkB0GQNdHlDdVno6K/RbGGWE1YQDcdMt69/o8cH3Vx1 d8ctQIJCEncsglcxwu4tmKl1bIBub5xRPZuIYTKchfck5+oYR6RQkDqVNBRJ9SwTmIPx RkvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OyqkU1LPhKwfsKUpKLuXSgvVGrpNMLeDAARAAPWkiJA=; b=bQK9kc9tnT9DXlkKI4lXxS5kdnnenxYwT920cWJlDlb6Myn/L2MmkxNaQ51s/BFAf2 N4WoVxMsjSRHd04zy7Gwnuu7bYAFDn6Vt2veFPBK1ysbG0TZROcf6UQ5SJtc5YYmIbKe CA9ZZbJGRma48TY/9ZnWIlk8868gKL3WZ5goxXz/F2R0o7pWJtgn1WM7WGlvKMpg9UxA 3hl6Lf6P6bXaKpN7TvZ4HxLC9CxgSjyWqRYSUS2ZhW2J0wXQA+BrDXnnFMtcbI5A5FE/ Zy/eVV+qiZ6qxg40/DmghebnsgnJPyouaAFApIcoD1Q9PtRh7uuwAXd3vOm5TxOsvQY0 kceA== X-Gm-Message-State: AOAM533dqSDdr7jGLPD9oUAXyc+PHBo3Zpw4FCuKrOmYXmWi1uB68A5K B3VYW/QxMEYlMHDQdsWyNMngpw== X-Received: by 2002:a17:906:6a90:: with SMTP id p16mr13381832ejr.115.1643055388759; Mon, 24 Jan 2022 12:16:28 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id bo19sm5757636edb.56.2022.01.24.12.16.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 60C6F1FFC1; Mon, 24 Jan 2022 20:16:09 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 09/22] tests/lcitool: Refresh submodule and remove libxml2 Date: Mon, 24 Jan 2022 20:15:55 +0000 Message-Id: <20220124201608.604599-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::631 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x631.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Beraldo Leal , aaron@os.amperecomputing.com, robhenry@microsoft.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The previous commit removed all uses of libxml2. Refresh lcitool submodule, update qemu.yml and refresh the generated files by running: $ make lcitool-refresh Note: This refreshment also removes libudev dependency on Fedora and CentOS due to libvirt-ci commit 18bfaee ("mappings: Improve mapping for libudev"), since "The udev project has been absorbed by the systemd project", and lttng-ust on FreeBSD runners due to libvirt-ci commit 6dd9b6f ("guests: drop lttng-ust from FreeBSD platform"). Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-6-f4bug@amsat.org> --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-11.vars | 2 +- tests/docker/dockerfiles/alpine.docker | 4 ++-- tests/docker/dockerfiles/centos8.docker | 4 +--- tests/docker/dockerfiles/fedora.docker | 4 +--- tests/docker/dockerfiles/opensuse-leap.docker | 3 +-- tests/docker/dockerfiles/ubuntu1804.docker | 3 +-- tests/docker/dockerfiles/ubuntu2004.docker | 3 +-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/projects/qemu.yml | 1 - 11 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index 9c52266811..07f313aa3a 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars index 7b44dba324..8a648dda1e 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-11.vars index 613d1373c2..08183f8793 100644 --- a/.gitlab-ci.d/cirrus/macos-11.vars +++ b/.gitlab-ci.d/cirrus/macos-11.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/usr/local/bin/pip3' -PKGS='bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb libxml2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' +PKGS='bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv' PYTHON='/usr/local/bin/python3' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index eb2251c81c..591af43d60 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile alpine-edge qemu +# $ lcitool dockerfile --layers all alpine-edge qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -56,7 +56,6 @@ RUN apk update && \ libtasn1-dev \ liburing-dev \ libusb-dev \ - libxml2-dev \ linux-pam-dev \ llvm11 \ lttng-ust-dev \ @@ -109,6 +108,7 @@ RUN apk update && \ zlib-dev \ zlib-static \ zstd-dev && \ + apk list | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index cbb909d02b..3abac7a8b1 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile centos-8 qemu +# $ lcitool dockerfile --layers all centos-8 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -69,10 +69,8 @@ RUN dnf update -y && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ liburing-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 60207f3da3..1d01cd9440 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile fedora-35 qemu +# $ lcitool dockerfile --layers all fedora-35 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -77,10 +77,8 @@ exec "$@"' > /usr/bin/nosync && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ liburing-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index f57d8cfb29..1b78d8369a 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile opensuse-leap-152 qemu +# $ lcitool dockerfile --layers all opensuse-leap-152 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -71,7 +71,6 @@ RUN zypper update -y && \ libudev-devel \ liburing-devel \ libusb-1_0-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 0ffa3c4d4b..003ee2cfed 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-1804 qemu +# $ lcitool dockerfile --layers all ubuntu-1804 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -89,7 +89,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libvirglrenderer-dev \ libvte-2.91-dev \ libxen-dev \ - libxml2-dev \ libzstd-dev \ llvm \ locales \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 4e562dfdcd..8993d2d9e0 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-2004 qemu +# $ lcitool dockerfile --layers all ubuntu-2004 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -91,7 +91,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libvirglrenderer-dev \ libvte-2.91-dev \ libxen-dev \ - libxml2-dev \ libzstd-dev \ llvm \ locales \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 29cec2153b..6dd9b6fab1 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 29cec2153b9a4dbb2e66f1cbc9866a4eff519cfd +Subproject commit 6dd9b6fab1fe081b16bc975485d7a02c81ba5fbe diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index ed5ab1407a..de51a2f1dd 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -63,7 +63,6 @@ packages: - liburing - libusbx - libvdeplug - - libxml2 - libzstd - llvm - lttng-ust From patchwork Mon Jan 24 20:15:56 2022 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: 534529 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3152845imr; Mon, 24 Jan 2022 12:41:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJy16bS80342KWBZBjU2ukhdFLbhhlWZs6Bcu+nWpiQcU7J/1rcvEiir4TpqpeXqesFm4o81 X-Received: by 2002:a05:6902:382:: with SMTP id f2mr24887680ybs.352.1643056891375; Mon, 24 Jan 2022 12:41:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056891; cv=none; d=google.com; s=arc-20160816; b=EZgtYlpzSOWTF/m+fposo2RCQN1d5a8DposmP9xnI7h8qNQiJmJ31PhT5IWFzc5GXO tjRS3vLematdmYB9md6kVfbhRr/kf7Z6XjnJUaPcZwVK/W/XrWnAzMjawH6m1NWcOKUi 6nNNofqN0zuST6z0jesPfQhiyj+poyoM1wPyafbC16ub1hXUABfx+H5t02IC75t9E/Yy lMfajXnNux+2mleYqiCkI+4jle57UA38fFdsAV6RjOkBUEniyiQrzRfbQE53sglvZpdu 3kqWolAP7yWeFp7/TLWo8OZkQdUPXiGb2OMESACn7DpdvAiCD40wLRi7bYOUIqZif+eU C7Gg== 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=TW3W9KlK1GSYsFODuOKwc8BNQgjkV0+601rjpw3zLtY=; b=FxaJZJF9Dqr0M3dwPgy7Ux53wMWsSToeaYK/4GnZYJMbPfpy8EE8PgtW6o0mjbr7/M rKPanyAALzJ6J7MKrnh2+LrUWiuhLeRJ+YEk83RHYulgHTsa2Pr9WUwg+R6zi+0230oR 5DFkhYx1ly3ELNHO0khpPXG2d2PQv9u8CmntMGRkvqs6nGZi6zf0PrDqr7zcX9wqKPPY +N7XEmv318FzBBJfvbIZgxBstGYvHwHgYITDZNWIUqOpAutrUR0BV9jVQetehVPpl6/d F8dvsYrtSwsParnVziEekyojypb3oPYnl/jWhpNt/6DMxw6vR62eTL1i1J3RpHCTI+OC jNNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DS1D1rkY; 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 p11si6023662ybu.656.2022.01.24.12.41.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:41:31 -0800 (PST) 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=DS1D1rkY; 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]:40670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC69a-0007r0-TZ for patch@linaro.org; Mon, 24 Jan 2022 15:41:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lQ-0006eM-4R for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:32 -0500 Received: from [2a00:1450:4864:20::52d] (port=33765 helo=mail-ed1-x52d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5lN-0003Fj-1s for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:31 -0500 Received: by mail-ed1-x52d.google.com with SMTP id b13so58843252edn.0 for ; Mon, 24 Jan 2022 12:16:28 -0800 (PST) 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=TW3W9KlK1GSYsFODuOKwc8BNQgjkV0+601rjpw3zLtY=; b=DS1D1rkYXqWEdTLxJePOavXm7T899dtv3hFMa0d/ussc7dL5aemRbM5n4mAgqt66T2 dC+DSM4o9J1YizqxnU3pMgSALR0PB91fmvNjOLGT+WjdbZuJSw39JkVYOwJ9Z0n+yBbu Wqj5G5CyECqxcujLgxGsymN+Nz2XcRahnKY2O9y5zgqeDUIbbS5ypJiLypfmMDW+CkNo dtRvgumrVSz+PZdauDSC4+g3/sTFFd1MxChq7Jboa0GXhdIv3WAN1U+Y2/6b6pfKCSrI tPOsJQIJhnIpeaZzXtL9IWYC/zEXMWuOz224TksjXvSCifl4V1PXdYXNTXteRXI36le5 Fkgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TW3W9KlK1GSYsFODuOKwc8BNQgjkV0+601rjpw3zLtY=; b=E26DiDZCWbNba+QONR6bgzydDS0D9bLrJPEo26lf6Sgdrx1YdbkvYgux5+r/ez0BpL el+lMIbAW3GzWLhCicYFa34s0zaiIdRK7cAUYPk5bwIJZIXBOGGFZkmPqV4udy5axGPd MXiuZbYN8f34BaEOZPEjU2AAZjdrkeMwcw92n+9RQoRRkioEYkWZAgpS75pnwuodRWfo XJueu/zzArf9D1U1Aa3L7/xdntvOVwf5MYKXHea1J1vHTGLpPm2r49IL05NTkU+ZoiTA 1tuvjoOQ/l91rjEpUqMmsw8k87nHxLoxv7afiCYsv31LLa4hnE3UJgNDUUmluIi9W6gb MJIA== X-Gm-Message-State: AOAM532vRdD5PZ44NdQPe81jZmA3M81USthXuG+P4TMYrp0iEVb3mKGW PXGe8VrZC0Vp2/qSSWPmvuqtWg== X-Received: by 2002:a05:6402:483:: with SMTP id k3mr17134238edv.323.1643055386167; Mon, 24 Jan 2022 12:16:26 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v3sm6448329edy.21.2022.01.24.12.16.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7B5561FFC2; Mon, 24 Jan 2022 20:16:09 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 10/22] tests: Manually remove libxml2 on MSYS2 runners Date: Mon, 24 Jan 2022 20:15:56 +0000 Message-Id: <20220124201608.604599-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Beraldo Leal , aaron@os.amperecomputing.com, robhenry@microsoft.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, Ed Maste , =?utf-8?q?Alex_Benn=C3=A9e?= , Li-Wen Hsu , Yonggang Luo Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé lcitool doesn't support MSYS2 targets, so manually remove this now unnecessary library. Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-7-f4bug@amsat.org> --- .cirrus.yml | 1 - .gitlab-ci.d/windows.yml | 2 -- 2 files changed, 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 02c43a074a..7552d70974 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -32,7 +32,6 @@ windows_msys2_task: mingw-w64-x86_64-libgcrypt mingw-w64-x86_64-libpng mingw-w64-x86_64-libssh - mingw-w64-x86_64-libxml2 mingw-w64-x86_64-snappy mingw-w64-x86_64-libusb mingw-w64-x86_64-usbredir diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 62dd9ed832..1df1630349 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -44,7 +44,6 @@ msys2-64bit: mingw-w64-x86_64-libssh mingw-w64-x86_64-libtasn1 mingw-w64-x86_64-libusb - mingw-w64-x86_64-libxml2 mingw-w64-x86_64-nettle mingw-w64-x86_64-ninja mingw-w64-x86_64-pixman @@ -80,7 +79,6 @@ msys2-32bit: mingw-w64-i686-libssh mingw-w64-i686-libtasn1 mingw-w64-i686-libusb - mingw-w64-i686-libxml2 mingw-w64-i686-lzo2 mingw-w64-i686-ninja mingw-w64-i686-pixman From patchwork Mon Jan 24 20:15:57 2022 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: 534535 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3158460imr; Mon, 24 Jan 2022 12:51:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJwG3A3FV1fXKFXhrmlapEZrkqi5XqB40Q0Gn207SUCsqsBAEil8tWtB4cuwlhc0/4JR7EX9 X-Received: by 2002:a05:6830:2304:: with SMTP id u4mr4444550ote.110.1643057502682; Mon, 24 Jan 2022 12:51:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643057502; cv=none; d=google.com; s=arc-20160816; b=fpgl3yId3a6SpDBJr56vEu3f8rnlgiZ8TQRkFYkii01BGUUoq7YayKFNVuuT3r9169 FSV+zhDhRFxtB6Jk4YMylrj4msogh6IpYdE/jxOUy5aiT9U03oLVRBUphJU5PO7oZVL6 zt96QXJmjN2ZJ7Gms2Vo7dwsdrTA6zrSded9fyFdt9wiB2PgZodK8nERPe1TniKIiqMO EgJ2UKJ7sMItos0B+ZzXmV0RhUhUxoKrRdq8oonhVctfe5fSGbyuOhcMFwC/57eR3uHm mSzZjS2ZTFyVijey/RjC2LuQDs+X+ntNnpz5PKrueAHpyqPYfxH5eFz0xFZoPx8eTmPg qPIQ== 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=HC58EObwQwfK/vMOJz8flDooLpW5CCL0WXMr1KEvE1w=; b=iVSgE9IaG51iB5icJojLtF39e3n/x6N85Os+uyMzRQ7hbR5Eb5QGFkC8Nto42tjG7K ZppDu9NO7g7daozsuMpFTotAv+BD+LytuMmgXwuNd6aL/QNCwsR6co18Dhc1PLkhePpe Tm5y5VJWN3e0lk0n7BX0rfrXVkK9idee0q4r8RmR1tPvMizP97T9s5Lz7lfQDh09JsL7 +4k3STNT0Qbv7kMs2CHccs1yu67iOiYuC0NmwAhGNrxjzHHRQInzRLs52UPPg/FaNaEv SoWQASol/E53KmZDz0pgZFDpYwJ2P3hx//fgbe5wvtXO+l2RbjVh/rAJ7orykwOqHR0h IIMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LLsjFPSV; 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 d6si8420724oiw.279.2022.01.24.12.51.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:51:42 -0800 (PST) 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=LLsjFPSV; 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]:59354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6JQ-000440-Be for patch@linaro.org; Mon, 24 Jan 2022 15:51:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lX-0006qI-VU for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:40 -0500 Received: from [2a00:1450:4864:20::534] (port=38428 helo=mail-ed1-x534.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5lW-0003Gr-9s for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:39 -0500 Received: by mail-ed1-x534.google.com with SMTP id j23so53526439edp.5 for ; Mon, 24 Jan 2022 12:16:32 -0800 (PST) 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=HC58EObwQwfK/vMOJz8flDooLpW5CCL0WXMr1KEvE1w=; b=LLsjFPSV3Sf6donEnhCKSAnRmdiv3ymYpC0X/fV0dzdjMvm4/fk52+7KsIYbaU6vcW HaWM0fOPPxx9swUnIbvVnzANcQUX7jF6s3dNrumJSMNW1mtm43+h+8eNlJzNBppuszfI b5y+mqiBywjQJBai3tu0RIKP8rfbKnrUGAuW7JJsTh3yuAMllLPy8sEUIG1vnLzmYPcE 19Ii9uNX/xaxEUC6b3PvUvl5yTFLmOBvNZdPE5S5AbsNQLRfZlQCjR5WH7VvCbKSv54B RISBwDF8H/PFl2pzevG+FIDcc8QWgMZqvxETETsmaVqkt0NHKXuswF7/QXZtJHG2o3MB mV5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HC58EObwQwfK/vMOJz8flDooLpW5CCL0WXMr1KEvE1w=; b=lE1rNBFVHeA1C0MXp7ZPEv+1zY9ERyArdWQooQBbDucollFp8f33h/OjUe8vkSBW1U 5rGO3PfSTqyA9PjE/QtMNgKIL2sLB+JPt7p8rp/F6gZhvg36jR6jRJOexpSijALwfR8I 7xP7Nr1VQ3u6Az/Zhyw0claGU+onjo4qfobi4jx8WgbgesaIC5WGfUxRnL+HuE2cYLOx NsZuW3zLHPVoI1bj9j72pMAlNwPHnpQ9eLKXElodAqQUsmD2gPygOTdI0uF70n4D+lwK nZf7+rYP1bwSil/5vBDhVeSv/blU48s9T+I21j+gWvEC87BTVBAS+0XwUb4ABBwFi2pP aJBA== X-Gm-Message-State: AOAM531pLpWyYgu7D+1ujOx2rVdA3d7RYhKUYArt5VNYjXzvnz3DlNlD xq4iNGXt7ouUOjhkX8UKYLNHOg== X-Received: by 2002:a05:6402:483:: with SMTP id k3mr17134491edv.323.1643055391818; Mon, 24 Jan 2022 12:16:31 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id uz30sm5297909ejb.61.2022.01.24.12.16.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9AA651FFC3; Mon, 24 Jan 2022 20:16:09 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 11/22] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Date: Mon, 24 Jan 2022 20:15:57 +0000 Message-Id: <20220124201608.604599-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::534 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x534.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Beraldo Leal , aaron@os.amperecomputing.com, robhenry@microsoft.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé On Debian we also need libibumad to enable RDMA: $ ../configure --enable-rdma ERROR: OpenFabrics librdmacm/libibverbs/libibumad not present. Your options: (1) Fast: Install infiniband packages (devel) from your distro. (2) Cleanest: Install libraries from www.openfabrics.org (3) Also: Install softiwarp if you don't have RDMA hardware Add the dependency to lcitool's qemu.yml (where librdmacm and libibverbs are already listed) and refresh the generated files by running: $ make lcitool-refresh Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-8-f4bug@amsat.org> --- tests/docker/dockerfiles/ubuntu1804.docker | 1 + tests/docker/dockerfiles/ubuntu2004.docker | 1 + tests/lcitool/projects/qemu.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 003ee2cfed..699f2dfc6a 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libglib2.0-dev \ libgnutls28-dev \ libgtk-3-dev \ + libibumad-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 8993d2d9e0..87513125b8 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -53,6 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libglusterfs-dev \ libgnutls28-dev \ libgtk-3-dev \ + libibumad-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index de51a2f1dd..958868a6ee 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -43,6 +43,7 @@ packages: - libfdt - libffi - libgcrypt + - libibumad - libibverbs - libiscsi - libjemalloc From patchwork Mon Jan 24 20:15:58 2022 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: 534526 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3149563imr; Mon, 24 Jan 2022 12:35:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJyitHJl7hjE5zInLDtZjFNVWIV12/MgsjLG+2uHhWbsnxINYz5coI0TkVpFJ3OS0mcUDsbi X-Received: by 2002:a9d:7441:: with SMTP id p1mr5335479otk.212.1643056542633; Mon, 24 Jan 2022 12:35:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056542; cv=none; d=google.com; s=arc-20160816; b=MH97LU5yD0es2mBpCwobiFUgVboR5KhnvYC7+dn/5feJkBMVsSI+7KDSD9pJaznD/G kKOBYVkGE89fixOwZE6S+fymDV/jO9RGsYpoQwavZToAvi4Q35ZlCGAAy9imywaipRGb tlHX6RTV4BGzJaMbqiQ2a77TZlCCMGeF6LZH1nVgC5Z3FC8YdwCGSR3X2o4k9zxTdjFA nSakfy3SkjT25oz77t7TGCfs8RM2pY2L48lzO+c0RGxdOJipFS2apGCa3nZb3DmZi0OQ qQVxIc+W1hBDsp7G7phJ+EQrNXBM2a+Ur/zXja2s4j7nf75QAQBMOif57VP/Q33lllQE HcnA== 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=5kJKIshDyTcI5rF9NKk0EBn42A9+Ktxo8GSgpgvEDuI=; b=wsnmBJxm08UbOdsVxYBFo4qJ/DoT13hEMYOW9lpsBcDGm5o0j7h6nAGk9k4tH81eQI aWu8QRxZbls4UpOOwRbOaBZihtlgAn06LB2NbFzthU+xHaYxu7cew4Z3/MMHOeCEp2vw kSkzC5Tn9Yl/JBMlBYJ9+Sp25dVhTYWBjQ2v+2CSqg09oMWoAdF1nfjNoHGKeTnnqwIE 0Xu8qlGLTlBG4aGA6OT30gAuKhI4b7EUV5cuxVOru9Izz4QQlXhF6IjA/ebua1ZiGH88 T9Un2p2vtXUnpy/I15aYM1szwUzaZwEqv8iIPOZYZiMYUjwYQfBNe4rBVNdgEp3BqPas cxYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fT5Kashh; 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 bd16si553008oib.182.2022.01.24.12.35.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:35:42 -0800 (PST) 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=fT5Kashh; 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]:56152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC63w-0007a8-GU for patch@linaro.org; Mon, 24 Jan 2022 15:35:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lO-0006dW-LV for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:31 -0500 Received: from [2a00:1450:4864:20::52e] (port=33766 helo=mail-ed1-x52e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5lM-0003Ff-NA for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:30 -0500 Received: by mail-ed1-x52e.google.com with SMTP id b13so58843275edn.0 for ; Mon, 24 Jan 2022 12:16:27 -0800 (PST) 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=5kJKIshDyTcI5rF9NKk0EBn42A9+Ktxo8GSgpgvEDuI=; b=fT5KashhR2NPyO6ZThoHPIdf9qjj5f9ZGl22z8PGtq10sVLrRN07AfByZL0Yfcr92w kOeUQEn3C+o5x05kE9iVyDiJhcMY+Ejl4vD84a6N8bAvoo+n44CayZouw/EsIPNJuRgv iHXEb+5olWXO321aOoI5MkCBQ1AzmFC7l9f+KODuq0GGh6lK+VyMCRoZXHhaxSgu/HUg uG7PZQ72tK2MJwbz3OQQbh+VH6GW85k1ju/L1EkAveK5WJkQS0wj5AMmwFvTPqkGNzlL 0DtpTYD2h1IKXNGDs2hozoLznjC1C+DfprdoPNk8ECmmqwxhzH8tJH+Q6YSJiJDgRcQQ ZM2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5kJKIshDyTcI5rF9NKk0EBn42A9+Ktxo8GSgpgvEDuI=; b=Y/sjsFqq7Q1nWagNblMpthJ7sLXRiTJfVz+nmbkS1O6er9PF8JHQnVe8nT7LYju788 0byVfPRKK9HT9qGf/VGnM2dHP8PDY0v9c0IvHeopHmMdr/87aDK1GfRsWlJQN6NsL3yV 9ut428jgM6/If+V/3SvDOT9TSgZCYRaEN/hIlGik36pAsQeM3PK69e5PF/Qgicpm7PCZ IpigUygBMq5Ybd110wv+LzTSVchDkgKd36JO/fiOxPxltHXwQiY4Nn/cAdj7KZMw1f28 aaxeP5NuTeElbtls1j/v1vzGOmvF/h+qEwgtI6U2EWr7cjzSTcgselKZjSFLVnoW6nqq umzw== X-Gm-Message-State: AOAM5300VnDgSU0PoN8+lmp2fobvcvj0iTikZ2PhICQ0jXjRiol9kOck aXmGM4aII3wXqHcJ5G6769Qc5A== X-Received: by 2002:a05:6402:13c6:: with SMTP id a6mr17349902edx.222.1643055386811; Mon, 24 Jan 2022 12:16:26 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i12sm4929026ejy.43.2022.01.24.12.16.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BB5011FFC4; Mon, 24 Jan 2022 20:16:09 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 12/22] plugins: stxp test case from Aaron (!upstream) Date: Mon, 24 Jan 2022 20:15:58 +0000 Message-Id: <20220124201608.604599-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52e.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , aaron@os.amperecomputing.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, Alexandre Iooss , kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , "open list:ARM TCG CPUs" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Cc: Aaron Lindsay Message-ID: --- [AJB] this was for testing, I think you can show the same stuff with the much more complete execlog now. --- contrib/plugins/stxp-plugin.c | 50 +++++++++++++++++++++++++++++++ tests/tcg/aarch64/stxp.c | 28 +++++++++++++++++ contrib/plugins/Makefile | 1 + tests/tcg/aarch64/Makefile.target | 3 ++ 4 files changed, 82 insertions(+) create mode 100644 contrib/plugins/stxp-plugin.c create mode 100644 tests/tcg/aarch64/stxp.c diff --git a/contrib/plugins/stxp-plugin.c b/contrib/plugins/stxp-plugin.c new file mode 100644 index 0000000000..432cf8c1ed --- /dev/null +++ b/contrib/plugins/stxp-plugin.c @@ -0,0 +1,50 @@ +#include +#include +#include + +QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION; + +void qemu_logf(const char *str, ...) +{ + char message[1024]; + va_list args; + va_start(args, str); + vsnprintf(message, 1023, str, args); + + qemu_plugin_outs(message); + + va_end(args); +} + +void before_insn_cb(unsigned int cpu_index, void *udata) +{ + uint64_t pc = (uint64_t)udata; + qemu_logf("Executing PC: 0x%" PRIx64 "\n", pc); +} + +static void mem_cb(unsigned int cpu_index, qemu_plugin_meminfo_t meminfo, uint64_t va, void *udata) +{ + uint64_t pc = (uint64_t)udata; + qemu_logf("PC 0x%" PRIx64 " accessed memory at 0x%" PRIx64 "\n", pc, va); +} + +static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) +{ + size_t n = qemu_plugin_tb_n_insns(tb); + + for (size_t i = 0; i < n; i++) { + struct qemu_plugin_insn *insn = qemu_plugin_tb_get_insn(tb, i); + uint64_t pc = qemu_plugin_insn_vaddr(insn); + + qemu_plugin_register_vcpu_insn_exec_cb(insn, before_insn_cb, QEMU_PLUGIN_CB_R_REGS, (void *)pc); + qemu_plugin_register_vcpu_mem_cb(insn, mem_cb, QEMU_PLUGIN_CB_NO_REGS, QEMU_PLUGIN_MEM_RW, (void*)pc); + } +} + +QEMU_PLUGIN_EXPORT +int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, + int argc, char **argv) +{ + qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans); + return 0; +} diff --git a/tests/tcg/aarch64/stxp.c b/tests/tcg/aarch64/stxp.c new file mode 100644 index 0000000000..fb8ef6a46d --- /dev/null +++ b/tests/tcg/aarch64/stxp.c @@ -0,0 +1,28 @@ + + +void stxp_issue_demo(void *arr) +{ + asm(".align 8\n\t" + " mov x0, %[in]\n\t" + " mov x18, 0x1000\n\t" + " mov x2, 0x0\n\t" + " mov x3, 0x0\n\t" + "loop:\n\t" + " prfm pstl1strm, [x0]\n\t" + " ldxp x16, x17, [x0]\n\t" + " stxp w16, x2, x3, [x0]\n\t" + "\n\t" + " subs x18, x18, 1\n\t" + " beq done\n\t" + " b loop\n\t" + "done:\n\t" + : /* none out */ + : [in] "r" (arr) /* in */ + : "x0", "x2", "x3", "x16", "x17", "x18"); /* clobbers */ +} + +int main() +{ + char arr[16]; + stxp_issue_demo(&arr); +} diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index 54ac5ccd9f..576ed5875a 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -20,6 +20,7 @@ NAMES += howvec NAMES += lockstep NAMES += hwprofile NAMES += cache +NAMES += stxp-plugin SONAMES := $(addsuffix .so,$(addprefix lib,$(NAMES))) diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 1d967901bd..54b2e90d00 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -72,4 +72,7 @@ endif endif +# Load/Store exclusive test +AARCH64_TESTS += stxp + TESTS += $(AARCH64_TESTS) From patchwork Mon Jan 24 20:15:59 2022 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: 534536 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3159835imr; Mon, 24 Jan 2022 12:54:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKPxmgj2hgaa7Gssw6g4mOH7EG5vUfiZ17j5Tu7uflXjjbU1tMPPTYI7KQLBalsrCLFDZF X-Received: by 2002:ab0:3a82:: with SMTP id r2mr6431149uaw.105.1643057655795; Mon, 24 Jan 2022 12:54:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643057655; cv=none; d=google.com; s=arc-20160816; b=PRlMNWr82PNTY2S6ND3oRGkBLI1h7BbjrWsd84PtBDkJ6XLuxzIF/HrFpwwboZi3en FYkgNGfs4GVuL4f+7vVRWpZC67pWR7gKzSvI9mluSOZGTE3skVOKMaQyEPoYLXsDg8RX jzqVuw8u3ntxneI6/UTA+0dPj+UD5kWOchRc91jfTlQVjCiFqjgydBY+fOQ9Bji0hjaD ct31J9pi0R0cB+2dzRZh9dQj4eq4+lajlrWlY5POh+b923RLrTSk+26YDBtJ1D4GcBfY p+3GO3cHbWTkT4aRJvNoRQyRPgzXjCJIQzj65C4IbvQnwCE7j3M9KFiyZ4POHQoqdR66 IBsw== 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=cyzZ0jkQjwfMeD7GLwLYcz/E1ft7Z71kh0B/0OrXw+Q=; b=WIx0YUMvXFdTpev/056tWObazQFJYNaZ8MYLvAV0dsXyy7p1S4JACNJX2DaTLDUGVj 7Jffs8kIvrS5BStL4ZlYJpMYMHn1XRnipt2J7fQ7g6Ak/UV2m7qOJGrAdi9kewNW562d qKZQlroQifoU6qPnFenO9U/BS/SKx3sowQLApd4xwE5XElMxmPzmc8hajiQOxfgeHjXQ X7uNN58bOQy50po99bEydt3soD8kKUoR7Ww2sqZ9f5OtiA5AYfOjHvtAbb+KrT74mXy1 RMqymTOSvrsJ5+HNfTTB5N6Iu/uTg4U/blX+FCOZfZCplhmzgtAASNRGlvAjf1wZ0f0a dOAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WN1MBalO; 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 h17si1963092vsj.325.2022.01.24.12.54.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:54:15 -0800 (PST) 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=WN1MBalO; 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]:34530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6Lv-0006VA-Ak for patch@linaro.org; Mon, 24 Jan 2022 15:54:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5rp-0005F8-Kd for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:23:09 -0500 Received: from [2a00:1450:4864:20::52d] (port=39604 helo=mail-ed1-x52d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5rn-0004Ja-M0 for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:23:09 -0500 Received: by mail-ed1-x52d.google.com with SMTP id u18so44385438edt.6 for ; Mon, 24 Jan 2022 12:23:07 -0800 (PST) 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=cyzZ0jkQjwfMeD7GLwLYcz/E1ft7Z71kh0B/0OrXw+Q=; b=WN1MBalOshkt8u8LMLtzg8FAMepgL+0Q0DFnVzCzDm1/SfdD+pjItXImDn4noHURfl JJg+CJcShoGXymPq901mtlVm3M4Syc7LEWHBwuoAnwCbVn3DTfORWRy9Lk47A4VlG5UD UsYsGqEUX/oK5+Op0jEUk2dbJc9cyLoR9NTlyDB+qk4d5WlVrmF1p6LwcGjzaNfPlofz bDRFOJdlwqbjA65wfaGzUOA6RscY7DoOhFEtiJ2mAB7BSnnUaqM6jQkRTly62oZqZZt6 z8kOQfnq045hNMLNLCHuOnV3ChBYWS3s2CRLJAESYLgKLgxreGjI8CiqwK6py84SNsCp NXUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cyzZ0jkQjwfMeD7GLwLYcz/E1ft7Z71kh0B/0OrXw+Q=; b=CdP6YfX6Yb3Z/KMP/7CJMsNI/+VV4jlp+ityqzfiyZ484W5EHtHsa2CumbDFUAUOd1 v6dwEfUen0uYDd6CiOrMBKUw+ng7q2G/LJnG324qg2indAwlnyl0Mx66PBigs//KRQEK Lsvwv5FMHrzfkO8MgkC5lW3IqX8zR6qw6rT4hNG+Q5SuQjMsKBcbQKjGtz5fdgc+pFcz ildxoi60QTLOHW5FfCNtvS5hydNVaBAwxIqIT0jj4yN0t6emSV7biFsrGDIMIA3vz1wE RG4SeSbxvNBVQbOmEr9Bjyowsz+w5GI7ROo8CgzZI7mQjQN5s2RpGDFeuguL+JOGhBOk JSfQ== X-Gm-Message-State: AOAM531tmiwc4OGEGXtAtk6xC1dcx2ExxfCRLosyJ/Fi3YICGeC5/fB0 NNp90jjzpxRSkL+0sCqC6937KQ== X-Received: by 2002:a05:6402:1c94:: with SMTP id cy20mr14308418edb.154.1643055785754; Mon, 24 Jan 2022 12:23:05 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m12sm7101443edq.40.2022.01.24.12.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:22:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CC3121FFC5; Mon, 24 Jan 2022 20:16:09 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 13/22] docs: remove references to TCG tracing Date: Mon, 24 Jan 2022 20:15:59 +0000 Message-Id: <20220124201608.604599-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi , Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, Luis Vilanova , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Users wanting this sort of functionality should turn to TCG plugins instead. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Cc: Luis Vilanova Cc: Stefan Hajnoczi --- docs/about/removed-features.rst | 13 +++++ docs/devel/tracing.rst | 85 --------------------------------- 2 files changed, 13 insertions(+), 85 deletions(-) diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 4c4da20d0f..b0156e0f25 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -601,6 +601,19 @@ the upstream Linux kernel in 2018, and it has also been dropped from glibc, so there is no new Linux development taking place with this architecture. For running the old binaries, you can use older versions of QEMU. +TCG introspection features +-------------------------- + +TCG trace-events (since 6.2) +'''''''''''''''''''''''''''' + +The ability to add new TCG trace points had bit rotted and as the +feature can be replicated with TCG plugins it was removed. If +any user is currently using this feature and needs help with +converting to using TCG plugins they should contact the qemu-devel +mailing list. + + System emulator devices ----------------------- diff --git a/docs/devel/tracing.rst b/docs/devel/tracing.rst index ba83954899..ef67bc9d70 100644 --- a/docs/devel/tracing.rst +++ b/docs/devel/tracing.rst @@ -411,88 +411,3 @@ disabled, this check will have no performance impact. return ptr; } -"tcg" ------ - -Guest code generated by TCG can be traced by defining an event with the "tcg" -event property. Internally, this property generates two events: -"_trans" to trace the event at translation time, and -"_exec" to trace the event at execution time. - -Instead of using these two events, you should instead use the function -"trace__tcg" during translation (TCG code generation). This function -will automatically call "trace__trans", and will generate the -necessary TCG code to call "trace__exec" during guest code execution. - -Events with the "tcg" property can be declared in the "trace-events" file with a -mix of native and TCG types, and "trace__tcg" will gracefully forward -them to the "_trans" and "_exec" events. Since TCG values -are not known at translation time, these are ignored by the "_trans" -event. Because of this, the entry in the "trace-events" file needs two printing -formats (separated by a comma):: - - tcg foo(uint8_t a1, TCGv_i32 a2) "a1=%d", "a1=%d a2=%d" - -For example:: - - #include "trace-tcg.h" - - void some_disassembly_func (...) - { - uint8_t a1 = ...; - TCGv_i32 a2 = ...; - trace_foo_tcg(a1, a2); - } - -This will immediately call:: - - void trace_foo_trans(uint8_t a1); - -and will generate the TCG code to call:: - - void trace_foo(uint8_t a1, uint32_t a2); - -"vcpu" ------- - -Identifies events that trace vCPU-specific information. It implicitly adds a -"CPUState*" argument, and extends the tracing print format to show the vCPU -information. If used together with the "tcg" property, it adds a second -"TCGv_env" argument that must point to the per-target global TCG register that -points to the vCPU when guest code is executed (usually the "cpu_env" variable). - -The "tcg" and "vcpu" properties are currently only honored in the root -./trace-events file. - -The following example events:: - - foo(uint32_t a) "a=%x" - vcpu bar(uint32_t a) "a=%x" - tcg vcpu baz(uint32_t a) "a=%x", "a=%x" - -Can be used as:: - - #include "trace-tcg.h" - - CPUArchState *env; - TCGv_ptr cpu_env; - - void some_disassembly_func(...) - { - /* trace emitted at this point */ - trace_foo(0xd1); - /* trace emitted at this point */ - trace_bar(env_cpu(env), 0xd2); - /* trace emitted at this point (env) and when guest code is executed (cpu_env) */ - trace_baz_tcg(env_cpu(env), cpu_env, 0xd3); - } - -If the translating vCPU has address 0xc1 and code is later executed by vCPU -0xc2, this would be an example output:: - - // at guest code translation - foo a=0xd1 - bar cpu=0xc1 a=0xd2 - baz_trans cpu=0xc1 a=0xd3 - // at guest code execution - baz_exec cpu=0xc2 a=0xd3 From patchwork Mon Jan 24 20:16:00 2022 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: 534530 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3152862imr; Mon, 24 Jan 2022 12:41:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJxz/+Ua/pjoUei5fsvLlSYP8xN6b6pBHxecCgQXeOXQ16wsr96Q2Px4hd0uJ7BQ1lKulWzp X-Received: by 2002:a25:6089:: with SMTP id u131mr23153307ybb.308.1643056894816; Mon, 24 Jan 2022 12:41:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056894; cv=none; d=google.com; s=arc-20160816; b=VsW8CIYKsl+a1Locd3z9j4r6G6gThSA+pPAWsdtIJvdrnf65zuPgBw0QTnbAHeTgsN bubGc8MqZW2kScaJWsP4E+YJaNQ5RnLFHtu0WMzROWw9BjAQiWZU0J9nBv9zYcYFAOjn PF5/ML2tmX9Qc9i7XfUninX+28yiBXHfLOFJVwBCMz5bQh1Wpo6KM4+9AvNqhPvF2ur+ /BpOYAZ4+a8tJCB9m0NcuGZeR0EAAYiPan2T9kJQScyST6E8LJSyfkXsBnxUEc8BfOPU KMm6q/H/E21qSk+yhDpKOZ8N6tz8l+zwiwQwGWsl+NQOzVnWz2lcNnqR5eOx+rMU18it uKGQ== 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=TphmjCoHQzMrsIigStP4q3nxIrmP0eJCB98BxrKAi/w=; b=EeWYLk6157AJ5cG8tZMzRXOVtcOsCOxakWCkU9qDmJxtq0CpnkKjk1ZMLk73F5o5Ms VDVnfYu5gGOTjDAbveBYeCGIlz75xJx6mdnDXggcFivp4/Vvyy4FtDDg9zzdfNFkh2nv t0oDEeyO99p4aIMF/aUrzKJRqOMtNk6M96w60OoEnZqLsAbAlaSaInOlDJ+7OJGAxQDA t3Jw5c6rAeSbg6VWrbgcF6LuWLeLI7/89SdckDCLKmTC7mORlbzQfrYUfHKc18P9oLRH pmWlvPPIIR1OTrW01H390mBlAGkqu3aWpQVap55U+19pILPV366PISvOXEb0TmPPECfw wukw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BWl0meub; 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 a4si6987459ybr.446.2022.01.24.12.41.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:41:34 -0800 (PST) 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=BWl0meub; 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]:40694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC69e-0007rt-5N for patch@linaro.org; Mon, 24 Jan 2022 15:41:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lW-0006ke-Pp for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:38 -0500 Received: from [2a00:1450:4864:20::52c] (port=43532 helo=mail-ed1-x52c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5lP-0003GH-Qs for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:33 -0500 Received: by mail-ed1-x52c.google.com with SMTP id w14so5713834edd.10 for ; Mon, 24 Jan 2022 12:16:30 -0800 (PST) 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=TphmjCoHQzMrsIigStP4q3nxIrmP0eJCB98BxrKAi/w=; b=BWl0meubjsbaxHbZt949hEd3IO/rme9XQFC2BS2Pu2TLnYUGX4oeFzs7ukOwKLSaDj 7Jk24nDc8amhUf1B0zkINfEh7imRbQFy46f5T1r3aXeSh6AgoLMvK5uvu4vyTevEF5CO LNIEkdLmdVLW7Dp/1xLR4D8jmbQawhSa3IpcpAQRPBEQqHplC0oRCj0AHBJuq6NE8awj uqftX8i+YihhlKbSZEFRmULD/T+C0XgFhcbBa5a1XIbQeRzcKLeEwAboDULoVlnMSD7V JH0KZSdhSHuqsoatU2clijtXoJaMrAf4NBlaJL7nlL1YPYhcX/e9PC9Q8MFq37tNeiJZ AUUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TphmjCoHQzMrsIigStP4q3nxIrmP0eJCB98BxrKAi/w=; b=JDzo5wB+Hu2NAiokmXxSpfQyd5eZOoW2rdyYQFwI2HD1SUbtjiQ/RRrl1qHjRLbNa1 Suh7AdiCfq3UGOBq6sm/C19xjpuukQAEVojE4WY6s6bFmG8UAbKd8FidvH0mRmS/hFCp lKPRYQkHxnCP+5HBOPU793PrrTrO0qtKgbQnm/u6UIRmyvInlf5el6QNvgTldbpUMQ0l /8rOBNMZonk9nq75fWoc9xt7Cbs3OMHVDZlageZNUr+Ap+fO3YXAu6q3wH593rRU/LYN jsjyqg3qJz5Sjsf2hZBB04o0lPtEKjDkHiCFDDykV/gSwVylzDVTQPcSA6vgcn9LyXM1 4KNg== X-Gm-Message-State: AOAM5335KDNMcrKwozck2to601wPEaNLwbzRLYSgN25eBGtI2okIMAnD m+8WwtHTZ0UhXPEkXIPLazKkWw== X-Received: by 2002:aa7:c0c9:: with SMTP id j9mr17173713edp.270.1643055389852; Mon, 24 Jan 2022 12:16:29 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id oz3sm5266064ejb.219.2022.01.24.12.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F18A61FFC6; Mon, 24 Jan 2022 20:16:09 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 14/22] tracing: remove TCG memory access tracing Date: Mon, 24 Jan 2022 20:16:00 +0000 Message-Id: <20220124201608.604599-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi , Riku Voipio , Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, Luis Vilanova , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, Paolo Bonzini , kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" If you really want to trace all memory operations TCG plugins gives you a more flexible interface for doing so. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Cc: Luis Vilanova Cc: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daudé --- v2 - dropped extra line --- accel/tcg/atomic_template.h | 12 ------------ accel/tcg/cputlb.c | 2 -- accel/tcg/user-exec.c | 14 -------------- tcg/tcg-op.c | 5 ----- accel/tcg/atomic_common.c.inc | 20 -------------------- trace-events | 14 -------------- 6 files changed, 67 deletions(-) diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h index 2d917b6b1f..fc165031e8 100644 --- a/accel/tcg/atomic_template.h +++ b/accel/tcg/atomic_template.h @@ -77,7 +77,6 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, target_ulong addr, PAGE_READ | PAGE_WRITE, retaddr); DATA_TYPE ret; - atomic_trace_rmw_pre(env, addr, oi); #if DATA_SIZE == 16 ret = atomic16_cmpxchg(haddr, cmpv, newv); #else @@ -97,7 +96,6 @@ ABI_TYPE ATOMIC_NAME(ld)(CPUArchState *env, target_ulong addr, PAGE_READ, retaddr); DATA_TYPE val; - atomic_trace_ld_pre(env, addr, oi); val = atomic16_read(haddr); ATOMIC_MMU_CLEANUP; atomic_trace_ld_post(env, addr, oi); @@ -110,7 +108,6 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong addr, ABI_TYPE val, DATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, PAGE_WRITE, retaddr); - atomic_trace_st_pre(env, addr, oi); atomic16_set(haddr, val); ATOMIC_MMU_CLEANUP; atomic_trace_st_post(env, addr, oi); @@ -124,7 +121,6 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, target_ulong addr, ABI_TYPE val, PAGE_READ | PAGE_WRITE, retaddr); DATA_TYPE ret; - atomic_trace_rmw_pre(env, addr, oi); ret = qatomic_xchg__nocheck(haddr, val); ATOMIC_MMU_CLEANUP; atomic_trace_rmw_post(env, addr, oi); @@ -138,7 +134,6 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong addr, \ DATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr); \ DATA_TYPE ret; \ - atomic_trace_rmw_pre(env, addr, oi); \ ret = qatomic_##X(haddr, val); \ ATOMIC_MMU_CLEANUP; \ atomic_trace_rmw_post(env, addr, oi); \ @@ -171,7 +166,6 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong addr, \ XDATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr); \ XDATA_TYPE cmp, old, new, val = xval; \ - atomic_trace_rmw_pre(env, addr, oi); \ smp_mb(); \ cmp = qatomic_read__nocheck(haddr); \ do { \ @@ -216,7 +210,6 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, target_ulong addr, PAGE_READ | PAGE_WRITE, retaddr); DATA_TYPE ret; - atomic_trace_rmw_pre(env, addr, oi); #if DATA_SIZE == 16 ret = atomic16_cmpxchg(haddr, BSWAP(cmpv), BSWAP(newv)); #else @@ -236,7 +229,6 @@ ABI_TYPE ATOMIC_NAME(ld)(CPUArchState *env, target_ulong addr, PAGE_READ, retaddr); DATA_TYPE val; - atomic_trace_ld_pre(env, addr, oi); val = atomic16_read(haddr); ATOMIC_MMU_CLEANUP; atomic_trace_ld_post(env, addr, oi); @@ -249,7 +241,6 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong addr, ABI_TYPE val, DATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, PAGE_WRITE, retaddr); - atomic_trace_st_pre(env, addr, oi); val = BSWAP(val); atomic16_set(haddr, val); ATOMIC_MMU_CLEANUP; @@ -264,7 +255,6 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, target_ulong addr, ABI_TYPE val, PAGE_READ | PAGE_WRITE, retaddr); ABI_TYPE ret; - atomic_trace_rmw_pre(env, addr, oi); ret = qatomic_xchg__nocheck(haddr, BSWAP(val)); ATOMIC_MMU_CLEANUP; atomic_trace_rmw_post(env, addr, oi); @@ -278,7 +268,6 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong addr, \ DATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr); \ DATA_TYPE ret; \ - atomic_trace_rmw_pre(env, addr, oi); \ ret = qatomic_##X(haddr, BSWAP(val)); \ ATOMIC_MMU_CLEANUP; \ atomic_trace_rmw_post(env, addr, oi); \ @@ -308,7 +297,6 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong addr, \ XDATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr); \ XDATA_TYPE ldo, ldn, old, new, val = xval; \ - atomic_trace_rmw_pre(env, addr, oi); \ smp_mb(); \ ldn = qatomic_read__nocheck(haddr); \ do { \ diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 5e0d0eebc3..82adefe574 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -2140,7 +2140,6 @@ static inline uint64_t cpu_load_helper(CPUArchState *env, abi_ptr addr, { uint64_t ret; - trace_guest_ld_before_exec(env_cpu(env), addr, oi); ret = full_load(env, addr, oi, retaddr); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R); return ret; @@ -2487,7 +2486,6 @@ static inline void cpu_store_helper(CPUArchState *env, target_ulong addr, uint64_t val, MemOpIdx oi, uintptr_t ra, FullStoreHelper *full_store) { - trace_guest_st_before_exec(env_cpu(env), addr, oi); full_store(env, addr, val, oi, ra); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_W); } diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 6f5d4933f0..8edf0bbaa1 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -250,7 +250,6 @@ uint8_t cpu_ldb_mmu(CPUArchState *env, abi_ptr addr, uint8_t ret; validate_memop(oi, MO_UB); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldub_p(haddr); clear_helper_retaddr(); @@ -265,7 +264,6 @@ uint16_t cpu_ldw_be_mmu(CPUArchState *env, abi_ptr addr, uint16_t ret; validate_memop(oi, MO_BEUW); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = lduw_be_p(haddr); clear_helper_retaddr(); @@ -280,7 +278,6 @@ uint32_t cpu_ldl_be_mmu(CPUArchState *env, abi_ptr addr, uint32_t ret; validate_memop(oi, MO_BEUL); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldl_be_p(haddr); clear_helper_retaddr(); @@ -295,7 +292,6 @@ uint64_t cpu_ldq_be_mmu(CPUArchState *env, abi_ptr addr, uint64_t ret; validate_memop(oi, MO_BEUQ); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldq_be_p(haddr); clear_helper_retaddr(); @@ -310,7 +306,6 @@ uint16_t cpu_ldw_le_mmu(CPUArchState *env, abi_ptr addr, uint16_t ret; validate_memop(oi, MO_LEUW); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = lduw_le_p(haddr); clear_helper_retaddr(); @@ -325,7 +320,6 @@ uint32_t cpu_ldl_le_mmu(CPUArchState *env, abi_ptr addr, uint32_t ret; validate_memop(oi, MO_LEUL); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldl_le_p(haddr); clear_helper_retaddr(); @@ -340,7 +334,6 @@ uint64_t cpu_ldq_le_mmu(CPUArchState *env, abi_ptr addr, uint64_t ret; validate_memop(oi, MO_LEUQ); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldq_le_p(haddr); clear_helper_retaddr(); @@ -354,7 +347,6 @@ void cpu_stb_mmu(CPUArchState *env, abi_ptr addr, uint8_t val, void *haddr; validate_memop(oi, MO_UB); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stb_p(haddr, val); clear_helper_retaddr(); @@ -367,7 +359,6 @@ void cpu_stw_be_mmu(CPUArchState *env, abi_ptr addr, uint16_t val, void *haddr; validate_memop(oi, MO_BEUW); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stw_be_p(haddr, val); clear_helper_retaddr(); @@ -380,7 +371,6 @@ void cpu_stl_be_mmu(CPUArchState *env, abi_ptr addr, uint32_t val, void *haddr; validate_memop(oi, MO_BEUL); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stl_be_p(haddr, val); clear_helper_retaddr(); @@ -393,7 +383,6 @@ void cpu_stq_be_mmu(CPUArchState *env, abi_ptr addr, uint64_t val, void *haddr; validate_memop(oi, MO_BEUQ); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stq_be_p(haddr, val); clear_helper_retaddr(); @@ -406,7 +395,6 @@ void cpu_stw_le_mmu(CPUArchState *env, abi_ptr addr, uint16_t val, void *haddr; validate_memop(oi, MO_LEUW); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stw_le_p(haddr, val); clear_helper_retaddr(); @@ -419,7 +407,6 @@ void cpu_stl_le_mmu(CPUArchState *env, abi_ptr addr, uint32_t val, void *haddr; validate_memop(oi, MO_LEUL); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stl_le_p(haddr, val); clear_helper_retaddr(); @@ -432,7 +419,6 @@ void cpu_stq_le_mmu(CPUArchState *env, abi_ptr addr, uint64_t val, void *haddr; validate_memop(oi, MO_LEUQ); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stq_le_p(haddr, val); clear_helper_retaddr(); diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 61b492d89f..65e1c94c2d 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -27,7 +27,6 @@ #include "tcg/tcg.h" #include "tcg/tcg-op.h" #include "tcg/tcg-mo.h" -#include "trace-tcg.h" #include "exec/plugin-gen.h" /* Reduce the number of ifdefs below. This assumes that all uses of @@ -2877,7 +2876,6 @@ void tcg_gen_qemu_ld_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); memop = tcg_canonicalize_memop(memop, 0, 0); oi = make_memop_idx(memop, idx); - trace_guest_ld_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); orig_memop = memop; if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { @@ -2916,7 +2914,6 @@ void tcg_gen_qemu_st_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); memop = tcg_canonicalize_memop(memop, 0, 1); oi = make_memop_idx(memop, idx); - trace_guest_st_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { swap = tcg_temp_new_i32(); @@ -2965,7 +2962,6 @@ void tcg_gen_qemu_ld_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); memop = tcg_canonicalize_memop(memop, 1, 0); oi = make_memop_idx(memop, idx); - trace_guest_ld_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); orig_memop = memop; if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { @@ -3013,7 +3009,6 @@ void tcg_gen_qemu_st_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); memop = tcg_canonicalize_memop(memop, 1, 1); oi = make_memop_idx(memop, idx); - trace_guest_st_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { swap = tcg_temp_new_i64(); diff --git a/accel/tcg/atomic_common.c.inc b/accel/tcg/atomic_common.c.inc index 1df1f243e9..6602d7689f 100644 --- a/accel/tcg/atomic_common.c.inc +++ b/accel/tcg/atomic_common.c.inc @@ -13,14 +13,6 @@ * See the COPYING file in the top-level directory. */ -static void atomic_trace_rmw_pre(CPUArchState *env, target_ulong addr, - MemOpIdx oi) -{ - CPUState *cpu = env_cpu(env); - - trace_guest_rmw_before_exec(cpu, addr, oi); -} - static void atomic_trace_rmw_post(CPUArchState *env, target_ulong addr, MemOpIdx oi) { @@ -28,24 +20,12 @@ static void atomic_trace_rmw_post(CPUArchState *env, target_ulong addr, } #if HAVE_ATOMIC128 -static void atomic_trace_ld_pre(CPUArchState *env, target_ulong addr, - MemOpIdx oi) -{ - trace_guest_ld_before_exec(env_cpu(env), addr, oi); -} - static void atomic_trace_ld_post(CPUArchState *env, target_ulong addr, MemOpIdx oi) { qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R); } -static void atomic_trace_st_pre(CPUArchState *env, target_ulong addr, - MemOpIdx oi) -{ - trace_guest_st_before_exec(env_cpu(env), addr, oi); -} - static void atomic_trace_st_post(CPUArchState *env, target_ulong addr, MemOpIdx oi) { diff --git a/trace-events b/trace-events index a637a61eba..bc71006675 100644 --- a/trace-events +++ b/trace-events @@ -117,20 +117,6 @@ vcpu guest_cpu_exit(void) # Targets: all vcpu guest_cpu_reset(void) -# tcg/tcg-op.c - -# @vaddr: Access' virtual address. -# @memopidx: Access' information (see below). -# -# Start virtual memory access (before any potential access violation). -# Does not include memory accesses performed by devices. -# -# Mode: user, softmmu -# Targets: TCG(all) -vcpu tcg guest_ld_before(TCGv vaddr, uint32_t memopidx) "info=%d", "vaddr=0x%016"PRIx64" memopidx=0x%x" -vcpu tcg guest_st_before(TCGv vaddr, uint32_t memopidx) "info=%d", "vaddr=0x%016"PRIx64" memopidx=0x%x" -vcpu tcg guest_rmw_before(TCGv vaddr, uint32_t memopidx) "info=%d", "vaddr=0x%016"PRIx64" memopidx=0x%x" - # include/user/syscall-trace.h # @num: System call number. From patchwork Mon Jan 24 20:16:01 2022 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: 534520 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3145144imr; Mon, 24 Jan 2022 12:29:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJxjZnEsD0ZfWt++T/W6Ehy/Td1ziev2npEtX7dSfGsC0SPZeJ9mJttzFREMvrWmoVyu8nb1 X-Received: by 2002:a05:6602:3d1:: with SMTP id g17mr9155912iov.209.1643056140881; Mon, 24 Jan 2022 12:29:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056140; cv=none; d=google.com; s=arc-20160816; b=G0jtdbx9DjXxoZAfBih5ZJLzdH/Bo0ni07Ddn0yVdbocIRWdz6ubVQor1EN6su6MB+ fkSQ0cJSjsyZ0tJ7I+fWp0j6a67mvL9rV5DcuKmrd7Z1hAasvlk9E8q4SYpJtRXT4aCn B6jVon/UZwPm3lKF792F6VTbpCw6FWAvkvlGrFDJz3511xYUdlTBO0yuD+2DPeI+7loe OdCA2lwGjQSURXltuAXYyIm92jMkYqaZgIAsEocTfJtwMGmoNQeVKiWyQC4ApjqyTcMj RItdFEnQA8hZyq8wLb9z538EOjwGpRykUozbJVgwZsv2qGFPEtYzaRNjcgoL9emF48ya /ROA== 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=uGJA3TY/aTTlz7qnu3uqNbW+4kPxLuwEw7s9yABXdK4=; b=FVSyRgPMd+ITUJCphYXuRWOWeqzoOVsu+VKlwFOGByFZvjBRdHVSo1l1/KMo/uCRvi hSyKU0sKvfcAJFQDwzedQgTl0YZDk91U6rZvzxfvEV2dlfEaPcP7vkoQMHmXiLPRU04O 1MT1FSWvowTK3AvyAMl9i2/9V3lFe1Jm1yEXR3gMnzKWvH4BpMNJzrFQyyvtvKt3E1/L MkZzvLSyKdyb/QQ7OJca1HZ91EqcY6E23mi3BixuRu6PyPGY/Vx2fvBuzk7Zq/wrfsBT Iy9Djxgasr//fez8r4PzJCHTGbWjNi7jSyh36llzww/toCIiXSwqZzqGuojAgYltEHDB ZvmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LvkHCl3i; 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 q14si8173225jat.119.2022.01.24.12.29.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:29:00 -0800 (PST) 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=LvkHCl3i; 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]:39856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC5xU-00058m-CM for patch@linaro.org; Mon, 24 Jan 2022 15:29:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5ro-0005D7-2Z for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:23:08 -0500 Received: from [2a00:1450:4864:20::62d] (port=42914 helo=mail-ej1-x62d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5rl-0004JP-MG for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:23:07 -0500 Received: by mail-ej1-x62d.google.com with SMTP id m4so24734304ejb.9 for ; Mon, 24 Jan 2022 12:23:05 -0800 (PST) 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=uGJA3TY/aTTlz7qnu3uqNbW+4kPxLuwEw7s9yABXdK4=; b=LvkHCl3ivmYkExyB3BLaJPnwdxhm4T/Ude2JckvdSEkh+X+OseqIFh2Yp7xcWTv6QC 0rSNmLAEFf52KWKMzGwRpwTZYCgvsQN/SYmyO/5J7gEJx0KAHTiwtPc6qvY7rUxl+w4f k8dgpRS2wSKpmnVX4KorfehZ0fuVOsP3Yxg6LB8PrmKBqUVAmsdLZGyHKikD1+b7qywZ yBqBeZKXzYBd+fSt5025W2Ot1H/J10EE8LliTs95NccTud04BFutCLbtZWc8EIh3LOgC VIie6jUtiNIF2SYkOTHjmdpeZ0EqC0JObIM0lsz/1LUStrtwlcIDd6ywB5Auq9kCIdRP iCkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uGJA3TY/aTTlz7qnu3uqNbW+4kPxLuwEw7s9yABXdK4=; b=cG5wVQhwgHSfzj7UaZ7kC+U81U/s8uEuttsEE8vU62yREdKFmKGomt3JudsE4Nuq0d zmFM5TL/8pQFz8ua3qTHWJxDlsvvyFpNn1Vcv9sGNQzlhx5CZRIhFNm5ocw9LitIYmRM XjnHeVthktWZ1SviMWtVur913jOVVvy0eKEr4tKb/U7TNaqUdGXfceL+O11hAdBW7pIP ncVB6HnFmmRFY4Xydbh5dbgKkZfnpd7ipW07LaDlbuPSPJe7aNQqcEyvfa5JqG5Ab6YH 3/G5S5iFWxvyg6NVYp49KgYuZe/NNFyImnZdWjYAv9EXbPHKQcRCE/DL0bB7z7ss8i4c MnSg== X-Gm-Message-State: AOAM532Mt2T0b3h2vwjcxT40a91pQcBR+jQoYUH9uACUlqzRAP4E2Jlv bCefnPZgI43QKhDej0T9JiqVQw== X-Received: by 2002:a17:907:2704:: with SMTP id w4mr13625585ejk.134.1643055784125; Mon, 24 Jan 2022 12:23:04 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w22sm5279816ejj.64.2022.01.24.12.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:22:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1C06E1FFC7; Mon, 24 Jan 2022 20:16:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 15/22] tracing: remove the trace-tcg includes from the build Date: Mon, 24 Jan 2022 20:16:01 +0000 Message-Id: <20220124201608.604599-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi , Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, Luis Vilanova , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, Paolo Bonzini , kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Cc: Luis Vilanova Cc: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daudé --- v2 - dropped includes here instead of next patch --- include/exec/helper-proto.h | 1 - include/exec/helper-tcg.h | 1 - include/trace-tcg.h | 6 ------ trace/meson.build | 1 - 4 files changed, 9 deletions(-) delete mode 100644 include/trace-tcg.h diff --git a/include/exec/helper-proto.h b/include/exec/helper-proto.h index ba100793a7..c4b1bda632 100644 --- a/include/exec/helper-proto.h +++ b/include/exec/helper-proto.h @@ -38,7 +38,6 @@ dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \ #define IN_HELPER_PROTO #include "helper.h" -#include "trace/generated-helpers.h" #include "accel/tcg/tcg-runtime.h" #include "accel/tcg/plugin-helpers.h" diff --git a/include/exec/helper-tcg.h b/include/exec/helper-tcg.h index 16cd318b83..3933258f1a 100644 --- a/include/exec/helper-tcg.h +++ b/include/exec/helper-tcg.h @@ -59,7 +59,6 @@ | dh_typemask(t5, 5) | dh_typemask(t6, 6) | dh_typemask(t7, 7) }, #include "helper.h" -#include "trace/generated-helpers.h" #include "accel/tcg/tcg-runtime.h" #include "accel/tcg/plugin-helpers.h" diff --git a/include/trace-tcg.h b/include/trace-tcg.h deleted file mode 100644 index da68608c85..0000000000 --- a/include/trace-tcg.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef TRACE_TCG_H -#define TRACE_TCG_H - -#include "trace/generated-tcg-tracers.h" - -#endif /* TRACE_TCG_H */ diff --git a/trace/meson.build b/trace/meson.build index 573dd699c6..e279e33d4d 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -62,7 +62,6 @@ trace_events_all = custom_target('trace-events-all', install_dir: qemu_datadir) foreach d : [ - ['generated-tcg-tracers.h', 'tcg-h'], ['generated-helpers.c', 'tcg-helper-c'], ['generated-helpers.h', 'tcg-helper-h'], ['generated-helpers-wrappers.h', 'tcg-helper-wrapper-h'], From patchwork Mon Jan 24 20:16:02 2022 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: 534537 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3161649imr; Mon, 24 Jan 2022 12:57:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJx2BqP/Ikc7bW9zphoXRjIq5F8B+zptJqF0WG3f/czHSuugkRL3ScR+VWobWpGGHuVIPl/z X-Received: by 2002:a9d:6e8e:: with SMTP id a14mr2523451otr.178.1643057842035; Mon, 24 Jan 2022 12:57:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643057842; cv=none; d=google.com; s=arc-20160816; b=AGrbz0jNgtSdLEAe8roum9ICVVqNNSbySrEk6N2oOlwmq/q/CKfJ+FRahQjiW+PjQ1 MDFLQP+vHuM7Dk3D5eQf/OsRu7LQ4RcYYX91FVt2bVidzEkfspIkV147xOZd0GdgDl40 iFNJlhHA6b8UzsuqwMM/6qxSkXvtZGGsSTmYbsyqglUhtBysguLPXx6BWmVeSHOfINC1 Px86NYT9vokyXxjI32d6Kxq1rHWO2mI7dALlMd9O6rlDJ6PpFE4RVHzdipz5ZPBLVcl4 Ri9lrlK78bqcta2CehIHl8ULVKfaW8Q0K+unSUUbJ3iGOZCsIA4opOdE1R7iYLp/UoCZ l93Q== 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=Pm3beg7fAq93ElUioEER7NIS8SX7AdVOUFS60riq9T8=; b=fTvIQYUD180CWUNnsyYZF7BKIxjiutHEWfqoL2naTyRXobKdaoF64H+UzGd96Iexx9 eUI+YQEy/+KtvasSB0H0AdR9u6GXZ+YU9pwP6NzGGuFLNMtAArD5SkeqCeauCrZPbj1z H+H7k6MARpWxgwmKCxG7rT5RiUWgDLlvK4IYn2EshleT/rFE1Sf4eDSWPdWModWASiKl K7AunftU0EXrA7Ml4oS78tbiECxtA4dSZMEblmFa7nDTeODpDUOqXNEya8cfxzifeUMl gpEADMKeEprlQf91I+YsrAPVhuaDznye8HJRyagjWWlAKpAEYCL1Lu3Bse70ZtAkwX+u n+oA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="aj/ZJAk0"; 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 n16si873298otq.89.2022.01.24.12.57.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:57:22 -0800 (PST) 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="aj/ZJAk0"; 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]:37104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6Ot-0008P8-JD for patch@linaro.org; Mon, 24 Jan 2022 15:57:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5rq-0005Fs-Gf for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:23:11 -0500 Received: from [2a00:1450:4864:20::533] (port=37468 helo=mail-ed1-x533.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5rn-0004Jk-SH for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:23:10 -0500 Received: by mail-ed1-x533.google.com with SMTP id c24so56464513edy.4 for ; Mon, 24 Jan 2022 12:23:07 -0800 (PST) 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=Pm3beg7fAq93ElUioEER7NIS8SX7AdVOUFS60riq9T8=; b=aj/ZJAk0EvVKDdzM5ZpK4PQetMS4T96bI4GZB6w1Ct7rUDBhltUkuvem/M+x2G6mOE DVh3zKicIm5/vNYbpzlmUq1d4CAO0X4KbBmSk/iXaxVwyGrQmFhn70S8r23qEYECFKqa kruuXesrVCn1jcMHkdSBABKdrPQxN7fAx/m+exPKYk6Goz/n0vyQ+Tjo6ERe72gBtKo4 mRrS3H/esyfXrr7IjQjMto2+JcjI5Sc/51ZPIoCGwlYfsqauLnG+gcrtRCFYVCe+aWLz pzF+Yu+TqxkSJ01ugXHt50hRz5QBAjD9kxcRDsPyXCSCBdroMX8K5LLGNjPwHedzSiGC K/Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Pm3beg7fAq93ElUioEER7NIS8SX7AdVOUFS60riq9T8=; b=JXyu/H2GcJMEzLAWEfnx6IfUiwqg345BAKffOTFFabHHgSCt7YDSOh5YCcnljcSbg9 9ZEaMB9zW+jtU+9i/5Gs6StGHNEmYB8HYDxnCgzuJ6ovVOVYFSobRAsOtmsiWyjHJmF3 R8mxccmpvhLHC2/Vfl2CVUVez/BzsrC0skR7F6+CPP/d5HMCCnE/iylcdqHj6j/Z1Sxk OdCGLXolXClxSi9xl2c+80QwmFwHgayPQuK3O6W5ReNgjjMApsqWFSUpvOFNoW3Ao0qj EkqXJ0Pz5Ptf7VON0TJyX37jnk4/K5GgPeWdAIxwFOES1Fdn3brHnw9AFWBHmVhoezHu XdTg== X-Gm-Message-State: AOAM53164fnmkYgBPYz0PdtTynR1W2QzXC+TsLm+53PC+vBWS8Ca3eBc 6sG2g1M6I3NpIbeq+cijvVwTIQ== X-Received: by 2002:aa7:d986:: with SMTP id u6mr17274399eds.339.1643055786415; Mon, 24 Jan 2022 12:23:06 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g15sm7126772edy.77.2022.01.24.12.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:22:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 42B691FFC8; Mon, 24 Jan 2022 20:16:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 16/22] tracing: excise the tcg related from tracetool Date: Mon, 24 Jan 2022 20:16:02 +0000 Message-Id: <20220124201608.604599-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::533 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x533.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi , Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, Luis Vilanova , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, Paolo Bonzini , kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now we have no TCG trace events and no longer handle them in the code we can remove the handling from the tracetool to generate them. vcpu tracing is still available although the existing syscall event is an exercise in redundancy (plugins and -strace can also get the information). Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Cc: Luis Vilanova Cc: Stefan Hajnoczi --- meson.build | 4 - include/exec/helper-gen.h | 2 - scripts/tracetool/__init__.py | 41 +-------- scripts/tracetool/format/tcg_h.py | 83 ------------------- scripts/tracetool/format/tcg_helper_c.py | 79 ------------------ scripts/tracetool/format/tcg_helper_h.py | 48 ----------- .../tracetool/format/tcg_helper_wrapper_h.py | 70 ---------------- scripts/tracetool/vcpu.py | 14 +--- trace/meson.build | 13 --- 9 files changed, 4 insertions(+), 350 deletions(-) delete mode 100644 scripts/tracetool/format/tcg_h.py delete mode 100644 scripts/tracetool/format/tcg_helper_c.py delete mode 100644 scripts/tracetool/format/tcg_helper_h.py delete mode 100644 scripts/tracetool/format/tcg_helper_wrapper_h.py diff --git a/meson.build b/meson.build index 51e3090438..73533f9eaa 100644 --- a/meson.build +++ b/meson.build @@ -2355,19 +2355,15 @@ tracetool_depends = files( 'scripts/tracetool/backend/simple.py', 'scripts/tracetool/backend/syslog.py', 'scripts/tracetool/backend/ust.py', - 'scripts/tracetool/format/tcg_h.py', 'scripts/tracetool/format/ust_events_c.py', 'scripts/tracetool/format/ust_events_h.py', 'scripts/tracetool/format/__init__.py', 'scripts/tracetool/format/d.py', - 'scripts/tracetool/format/tcg_helper_c.py', 'scripts/tracetool/format/simpletrace_stap.py', 'scripts/tracetool/format/c.py', 'scripts/tracetool/format/h.py', - 'scripts/tracetool/format/tcg_helper_h.py', 'scripts/tracetool/format/log_stap.py', 'scripts/tracetool/format/stap.py', - 'scripts/tracetool/format/tcg_helper_wrapper_h.py', 'scripts/tracetool/__init__.py', 'scripts/tracetool/transform.py', 'scripts/tracetool/vcpu.py' diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h index 1c2e7a8ed3..7b6ca975ef 100644 --- a/include/exec/helper-gen.h +++ b/include/exec/helper-gen.h @@ -79,8 +79,6 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \ } #include "helper.h" -#include "trace/generated-helpers.h" -#include "trace/generated-helpers-wrappers.h" #include "accel/tcg/tcg-runtime.h" #include "accel/tcg/plugin-helpers.h" diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 5bc94d95cf..5393c7fc5c 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -87,8 +87,6 @@ def out(*lines, **kwargs): "ssize_t", "uintptr_t", "ptrdiff_t", - # Magic substitution is done by tracetool - "TCGv", ] def validate_type(name): @@ -232,7 +230,7 @@ class Event(object): "(?:(?:(?P\".+),)?\s*(?P\".+))?" "\s*") - _VALID_PROPS = set(["disable", "tcg", "tcg-trans", "tcg-exec", "vcpu"]) + _VALID_PROPS = set(["disable", "vcpu"]) def __init__(self, name, props, fmt, args, lineno, filename, orig=None, event_trans=None, event_exec=None): @@ -321,15 +319,6 @@ def build(line_str, lineno, filename): fmt = [fmt_trans, fmt] args = Arguments.build(groups["args"]) - if "tcg-trans" in props: - raise ValueError("Invalid property 'tcg-trans'") - if "tcg-exec" in props: - raise ValueError("Invalid property 'tcg-exec'") - if "tcg" not in props and not isinstance(fmt, str): - raise ValueError("Only events with 'tcg' property can have two format strings") - if "tcg" in props and isinstance(fmt, str): - raise ValueError("Events with 'tcg' property must have two format strings") - event = Event(name, props, fmt, args, lineno, filename) # add implicit arguments when using the 'vcpu' property @@ -409,33 +398,7 @@ def read_events(fobj, fname): e.args = (arg0,) + e.args[1:] raise - # transform TCG-enabled events - if "tcg" not in event.properties: - events.append(event) - else: - event_trans = event.copy() - event_trans.name += "_trans" - event_trans.properties += ["tcg-trans"] - event_trans.fmt = event.fmt[0] - # ignore TCG arguments - args_trans = [] - for atrans, aorig in zip( - event_trans.transform(tracetool.transform.TCG_2_HOST).args, - event.args): - if atrans == aorig: - args_trans.append(atrans) - event_trans.args = Arguments(args_trans) - - event_exec = event.copy() - event_exec.name += "_exec" - event_exec.properties += ["tcg-exec"] - event_exec.fmt = event.fmt[1] - event_exec.args = event_exec.args.transform(tracetool.transform.TCG_2_HOST) - - new_event = [event_trans, event_exec] - event.event_trans, event.event_exec = new_event - - events.extend(new_event) + events.append(event) return events diff --git a/scripts/tracetool/format/tcg_h.py b/scripts/tracetool/format/tcg_h.py deleted file mode 100644 index 4d84440aff..0000000000 --- a/scripts/tracetool/format/tcg_h.py +++ /dev/null @@ -1,83 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -Generate .h file for TCG code generation. -""" - -__author__ = "Lluís Vilanova " -__copyright__ = "Copyright 2012-2017, Lluís Vilanova " -__license__ = "GPL version 2 or (at your option) any later version" - -__maintainer__ = "Stefan Hajnoczi" -__email__ = "stefanha@redhat.com" - - -from tracetool import out, Arguments -import tracetool.vcpu - - -def vcpu_transform_args(args): - assert len(args) == 1 - return Arguments([ - args, - # NOTE: this name must be kept in sync with the one in "tcg_h" - # NOTE: Current helper code uses TCGv_env (CPUArchState*) - ("TCGv_env", "__tcg_" + args.names()[0]), - ]) - - -def generate(events, backend, group): - if group == "root": - header = "trace/trace-root.h" - else: - header = "trace.h" - - out('/* This file is autogenerated by tracetool, do not edit. */', - '/* You must include this file after the inclusion of helper.h */', - '', - '#ifndef TRACE_%s_GENERATED_TCG_TRACERS_H' % group.upper(), - '#define TRACE_%s_GENERATED_TCG_TRACERS_H' % group.upper(), - '', - '#include "exec/helper-proto.h"', - '#include "%s"' % header, - '', - ) - - for e in events: - # just keep one of them - if "tcg-exec" not in e.properties: - continue - - out('static inline void %(name_tcg)s(%(args)s)', - '{', - name_tcg=e.original.api(e.QEMU_TRACE_TCG), - args=tracetool.vcpu.transform_args("tcg_h", e.original)) - - if "disable" not in e.properties: - args_trans = e.original.event_trans.args - args_exec = tracetool.vcpu.transform_args( - "tcg_helper_c", e.original.event_exec, "wrapper") - if "vcpu" in e.properties: - trace_cpu = e.args.names()[0] - cond = "trace_event_get_vcpu_state(%(cpu)s,"\ - " TRACE_%(id)s)"\ - % dict( - cpu=trace_cpu, - id=e.original.event_exec.name.upper()) - else: - cond = "true" - - out(' %(name_trans)s(%(argnames_trans)s);', - ' if (%(cond)s) {', - ' gen_helper_%(name_exec)s(%(argnames_exec)s);', - ' }', - name_trans=e.original.event_trans.api(e.QEMU_TRACE), - name_exec=e.original.event_exec.api(e.QEMU_TRACE), - argnames_trans=", ".join(args_trans.names()), - argnames_exec=", ".join(args_exec.names()), - cond=cond) - - out('}') - - out('', - '#endif /* TRACE_%s_GENERATED_TCG_TRACERS_H */' % group.upper()) diff --git a/scripts/tracetool/format/tcg_helper_c.py b/scripts/tracetool/format/tcg_helper_c.py deleted file mode 100644 index 72576e67d1..0000000000 --- a/scripts/tracetool/format/tcg_helper_c.py +++ /dev/null @@ -1,79 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -Generate trace/generated-helpers.c. -""" - -__author__ = "Lluís Vilanova " -__copyright__ = "Copyright 2012-2017, Lluís Vilanova " -__license__ = "GPL version 2 or (at your option) any later version" - -__maintainer__ = "Stefan Hajnoczi" -__email__ = "stefanha@redhat.com" - - -from tracetool import Arguments, out -from tracetool.transform import * -import tracetool.vcpu - - -def vcpu_transform_args(args, mode): - assert len(args) == 1 - # NOTE: this name must be kept in sync with the one in "tcg_h" - args = Arguments([(args.types()[0], "__tcg_" + args.names()[0])]) - if mode == "code": - return Arguments([ - # Does cast from helper requirements to tracing types - ("CPUState *", "env_cpu(%s)" % args.names()[0]), - ]) - else: - args = Arguments([ - # NOTE: Current helper code uses TCGv_env (CPUArchState*) - ("CPUArchState *", args.names()[0]), - ]) - if mode == "header": - return args - elif mode == "wrapper": - return args.transform(HOST_2_TCG) - else: - assert False - - -def generate(events, backend, group): - if group == "root": - header = "trace/trace-root.h" - else: - header = "trace.h" - - events = [e for e in events - if "disable" not in e.properties] - - out('/* This file is autogenerated by tracetool, do not edit. */', - '', - '#include "qemu/osdep.h"', - '#include "cpu.h"', - '#include "exec/helper-proto.h"', - '#include "%s"' % header, - '', - ) - - for e in events: - if "tcg-exec" not in e.properties: - continue - - e_args_api = tracetool.vcpu.transform_args( - "tcg_helper_c", e.original, "header").transform( - HOST_2_TCG_COMPAT, TCG_2_TCG_HELPER_DEF) - e_args_call = tracetool.vcpu.transform_args( - "tcg_helper_c", e, "code") - - out('void %(name_tcg)s(%(args_api)s)', - '{', - # NOTE: the check was already performed at TCG-generation time - ' %(name)s(%(args_call)s);', - '}', - name_tcg="helper_%s_proxy" % e.api(), - name=e.api(e.QEMU_TRACE_NOCHECK), - args_api=e_args_api, - args_call=", ".join(e_args_call.casted()), - ) diff --git a/scripts/tracetool/format/tcg_helper_h.py b/scripts/tracetool/format/tcg_helper_h.py deleted file mode 100644 index 08554fbc85..0000000000 --- a/scripts/tracetool/format/tcg_helper_h.py +++ /dev/null @@ -1,48 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -Generate trace/generated-helpers.h. -""" - -__author__ = "Lluís Vilanova " -__copyright__ = "Copyright 2012-2016, Lluís Vilanova " -__license__ = "GPL version 2 or (at your option) any later version" - -__maintainer__ = "Stefan Hajnoczi" -__email__ = "stefanha@redhat.com" - - -from tracetool import out -from tracetool.transform import * -import tracetool.vcpu - - -def generate(events, backend, group): - events = [e for e in events - if "disable" not in e.properties] - - out('/* This file is autogenerated by tracetool, do not edit. */', - '', - ) - - for e in events: - if "tcg-exec" not in e.properties: - continue - - # TCG helper proxy declaration - fmt = "DEF_HELPER_FLAGS_%(argc)d(%(name)s, %(flags)svoid%(types)s)" - e_args = tracetool.vcpu.transform_args("tcg_helper_c", e.original, "header") - args = e_args.transform(HOST_2_TCG_COMPAT, HOST_2_TCG, - TCG_2_TCG_HELPER_DECL) - types = ", ".join(args.types()) - if types != "": - types = ", " + types - - flags = "TCG_CALL_NO_RWG, " - - out(fmt, - flags=flags, - argc=len(args), - name=e.api() + "_proxy", - types=types, - ) diff --git a/scripts/tracetool/format/tcg_helper_wrapper_h.py b/scripts/tracetool/format/tcg_helper_wrapper_h.py deleted file mode 100644 index 0c5a9797d1..0000000000 --- a/scripts/tracetool/format/tcg_helper_wrapper_h.py +++ /dev/null @@ -1,70 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -Generate trace/generated-helpers-wrappers.h. -""" - -__author__ = "Lluís Vilanova " -__copyright__ = "Copyright 2012-2016, Lluís Vilanova " -__license__ = "GPL version 2 or (at your option) any later version" - -__maintainer__ = "Stefan Hajnoczi" -__email__ = "stefanha@redhat.com" - - -from tracetool import out -from tracetool.transform import * -import tracetool.vcpu - - -def generate(events, backend, group): - events = [e for e in events - if "disable" not in e.properties] - - out('/* This file is autogenerated by tracetool, do not edit. */', - '', - '#define tcg_temp_new_nop(v) (v)', - '#define tcg_temp_free_nop(v)', - '', - ) - - for e in events: - if "tcg-exec" not in e.properties: - continue - - # tracetool.generate always transforms types to host - e_args = tracetool.vcpu.transform_args("tcg_helper_c", e.original, "wrapper") - - # mixed-type to TCG helper bridge - args_tcg_compat = e_args.transform(HOST_2_TCG_COMPAT) - - code_new = [ - "%(tcg_type)s __%(name)s = %(tcg_func)s(%(name)s);" % - {"tcg_type": transform_type(type_, HOST_2_TCG), - "tcg_func": transform_type(type_, HOST_2_TCG_TMP_NEW), - "name": name} - for (type_, name) in args_tcg_compat - ] - - code_free = [ - "%(tcg_func)s(__%(name)s);" % - {"tcg_func": transform_type(type_, HOST_2_TCG_TMP_FREE), - "name": name} - for (type_, name) in args_tcg_compat - ] - - gen_name = "gen_helper_" + e.api() - - out('static inline void %(name)s(%(args)s)', - '{', - ' %(code_new)s', - ' %(proxy_name)s(%(tmp_names)s);', - ' %(code_free)s', - '}', - name=gen_name, - args=e_args, - proxy_name=gen_name + "_proxy", - code_new="\n ".join(code_new), - code_free="\n ".join(code_free), - tmp_names=", ".join(["__%s" % name for _, name in e_args]), - ) diff --git a/scripts/tracetool/vcpu.py b/scripts/tracetool/vcpu.py index 868b4cb04c..d232cb1d06 100644 --- a/scripts/tracetool/vcpu.py +++ b/scripts/tracetool/vcpu.py @@ -19,19 +19,9 @@ def transform_event(event): """Transform event to comply with the 'vcpu' property (if present).""" if "vcpu" in event.properties: - # events with 'tcg-trans' and 'tcg-exec' are auto-generated from - # already-patched events - assert "tcg-trans" not in event.properties - assert "tcg-exec" not in event.properties - event.args = Arguments([("void *", "__cpu"), event.args]) - if "tcg" in event.properties: - fmt = "\"cpu=%p \"" - event.fmt = [fmt + event.fmt[0], - fmt + event.fmt[1]] - else: - fmt = "\"cpu=%p \"" - event.fmt = fmt + event.fmt + fmt = "\"cpu=%p \"" + event.fmt = fmt + event.fmt return event diff --git a/trace/meson.build b/trace/meson.build index e279e33d4d..298926036a 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -61,19 +61,6 @@ trace_events_all = custom_target('trace-events-all', install: true, install_dir: qemu_datadir) -foreach d : [ - ['generated-helpers.c', 'tcg-helper-c'], - ['generated-helpers.h', 'tcg-helper-h'], - ['generated-helpers-wrappers.h', 'tcg-helper-wrapper-h'], -] - gen = custom_target(d[0], - output: d[0], - input: meson.project_source_root() / 'trace-events', - command: [ tracetool, '--group=root', '--format=@0@'.format(d[1]), '@INPUT@', '@OUTPUT@' ], - depend_files: tracetool_depends) - specific_ss.add(when: 'CONFIG_TCG', if_true: gen) -endforeach - if 'ust' in get_option('trace_backends') trace_ust_all_h = custom_target('trace-ust-all.h', output: 'trace-ust-all.h', From patchwork Mon Jan 24 20:16:03 2022 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: 534532 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3154521imr; Mon, 24 Jan 2022 12:44:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJzRh4dxMmF336eJRzpq4sxZ/ODEjAnM0iqRnHulaA+V9xKcH3u07jGZ8iql21kf20E3CFXj X-Received: by 2002:a25:1ec4:: with SMTP id e187mr24758118ybe.276.1643057067496; Mon, 24 Jan 2022 12:44:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643057067; cv=none; d=google.com; s=arc-20160816; b=vM3syOxpUHVTr2JGNUCfWB6m7fyPGmo/oyapXlXvlAZG+FDYBiYApfyxjSGdVV32aX 5lkUSPQOXJO4RWoKNhaN4hYTDp2oC1OsMkxL36uzSpttFH3ZMgKUK8MFhSZIdmWiDOvc isvkIeHvr5JeMhi4GSH+pnL0+eAF2y7mkZTzz4bSaPCIy0tYV3XC1QquQeNwMaMVe60i TANX5jKdKJdbVFc/G2rHDEuIVlxGhBLKd8qpcPqNmSUfL8K0AYXBH8WEmL1W+5agDIlj n+UNy6R08XHcrc3j4GLmG+ApSUD+D/Khc2E0Tsa+hg81rLCZinFS+iAPeByP5KP3l2kG VS3g== 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=nAdmbpsGRI7IIKYGmTuV2CO734xKeZibs75jIXQLIvc=; b=FTuONQ0NgkzpTCGXj/vgFi30C2vYlcgNNHgO8XWNExPLX6kiOahx0bG+7qkDAa+2nG nxPrX7TFr9VhaCGvmXuqdPtfS9kZe0PTuVDflVECZd4nosLTQmZyymUR6bg1GuWEoXY3 iJ9hXXTudrdKPI80PxVWeKblurtSyqpnT9nAC7nSJeQYTetybTefUdJMh3W7GcHji20U JIOnGOgU5uiDeMc9rSodk6z9/IJWezhFjjxWqIRmEvij3mTtTcgqUYknpfvEzcVHUQi6 ZSM+ndImN0zPBBA9wE5DTB+ms4a1N7Pq8nBw9Tnkn31giLVc8GOLFWtqg7iOTus/ALtd e1fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FPBHcTlP; 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 a4si6996245ybr.446.2022.01.24.12.44.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:44:27 -0800 (PST) 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=FPBHcTlP; 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]:46226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6CQ-0003OR-VT for patch@linaro.org; Mon, 24 Jan 2022 15:44:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lZ-0006wq-Ia for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:41 -0500 Received: from [2a00:1450:4864:20::636] (port=34762 helo=mail-ej1-x636.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5lW-0003IE-Av for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:41 -0500 Received: by mail-ej1-x636.google.com with SMTP id h7so24656618ejf.1 for ; Mon, 24 Jan 2022 12:16:35 -0800 (PST) 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=nAdmbpsGRI7IIKYGmTuV2CO734xKeZibs75jIXQLIvc=; b=FPBHcTlPEWAg1AU/XKC5CB/h5g7WHu53iNXIIHMDKBdVsX3gvcNiFqhsYCg8QnNsQm 4biQ7o2l8up04+Ld+SoRaU2SwaKPZcwl5jlUvrombVhgsm86kCMqiiljHcJhzcA+uzB+ mAX+4vYa25OBNnZ+igwKNFJ+LWwb8tWHnbVpujPy7prZBemyUMK5UoKrjALyupSxQ3mX alG1Up9552ETe/UnCryTnYeS904WkAzUQQN+Fl2xgEQpJaLvtG1vSHkuXZur6YLPL1pB iwed5CsuiqP/Q/0jk/ajiI65XcuUAvQWs+qoccyOmC5MTW4Yo7lh/8u+gWh4yYWhy4PG R9wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nAdmbpsGRI7IIKYGmTuV2CO734xKeZibs75jIXQLIvc=; b=32McKIctaJy7X6RVgFbjzrSQLycbNZLdIQNxd3H1WP5fPqxBbWQsgiC9dWfkwO5KLQ imwSozDzT3cEjz7bF3lxVF8H5o3B2gdwMWPqUFfj1UYv3UPi1Wk3eFre2X7lIpLQqWHL fM5buUfUPP36wi68SUQljIi5CuCXzJLkitj5RxWyQlTNHdVDvmwOI+2GwrynCtm7jYih 24TiaCeSLxhx7vC/Udtb/03dkk0+RYD4HQ5TiJKxtaJUOtoPlCUmrPT0SwboBsFPESk+ GYSSWPnpsD+SSg3BnoLALPCfZqEM+cnFEL3EtOPV9x68c9fWpYavvJdq0EHhgGljuwlh dbRw== X-Gm-Message-State: AOAM532whcXF9r5AtPZwtd3hYQvd/0v1BDBLiOxt6OB2DOOAgYYIV2tH iYWktm5L+fLTygebsbrb5pkjag== X-Received: by 2002:a17:906:4785:: with SMTP id cw5mr8338734ejc.406.1643055394332; Mon, 24 Jan 2022 12:16:34 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w8sm5283925ejq.220.2022.01.24.12.16.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:30 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 61B9B1FFB8; Mon, 24 Jan 2022 20:16:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 17/22] plugins: add helper functions for coverage plugins Date: Mon, 24 Jan 2022 20:16:03 +0000 Message-Id: <20220124201608.604599-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::636 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x636.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Iooss , aaron@os.amperecomputing.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, Ivanov Arkady , kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Ivanov Arkady Which provide information about: - start_code. - end_code. - entry. - path to the executable binary. Signed-off-by: Ivanov Arkady Message-Id: <163491883461.304355.8210754161847179432.stgit@pc-System-Product-Name> [AJB: reword title, better descriptions, defaults, rm export, fix include] Signed-off-by: Alex Bennée --- include/qemu/qemu-plugin.h | 34 ++++++++++++++++++++++++++ plugins/api.c | 46 ++++++++++++++++++++++++++++++++++++ plugins/qemu-plugins.symbols | 4 ++++ 3 files changed, 84 insertions(+) diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h index 5f1017201f..535ddbf0ae 100644 --- a/include/qemu/qemu-plugin.h +++ b/include/qemu/qemu-plugin.h @@ -590,4 +590,38 @@ void qemu_plugin_outs(const char *string); */ bool qemu_plugin_bool_parse(const char *name, const char *val, bool *ret); +/** + * qemu_plugin_path_to_binary() - path to binary file being executed + * + * Return a string representing the path to the binary. For user-mode + * this is the main executable. For system emulation we currently + * return NULL. The user should g_free() the string once no longer + * needed. + */ +const char *qemu_plugin_path_to_binary(void); + +/** + * qemu_plugin_start_code() - returns start of text segment + * + * Returns the nominal start address of the main text segment in + * user-mode. Currently returns 0 for system emulation. + */ +uint64_t qemu_plugin_start_code(void); + +/** + * qemu_plugin_end_code() - returns end of text segment + * + * Returns the nominal end address of the main text segment in + * user-mode. Currently returns 0 for system emulation. + */ +uint64_t qemu_plugin_end_code(void); + +/** + * qemu_plugin_entry_code() - returns start address for module + * + * Returns the nominal entry address of the main text segment in + * user-mode. Currently returns 0 for system emulation. + */ +uint64_t qemu_plugin_entry_code(void); + #endif /* QEMU_PLUGIN_API_H */ diff --git a/plugins/api.c b/plugins/api.c index b143b09ce9..e6a2c9dde3 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -44,6 +44,9 @@ #ifndef CONFIG_USER_ONLY #include "qemu/plugin-memory.h" #include "hw/boards.h" +#else +#include "qemu.h" +#include "loader.h" #endif /* Uninstall and Reset handlers */ @@ -391,3 +394,46 @@ bool qemu_plugin_bool_parse(const char *name, const char *value, bool *ret) { return name && value && qapi_bool_parse(name, value, ret, NULL); } + +/* + * Binary path, start and end locations + */ +const char *qemu_plugin_path_to_binary(void) +{ + char *path = NULL; +#ifdef CONFIG_USER_ONLY + TaskState *ts = (TaskState *) current_cpu->opaque; + path = g_strdup(ts->bprm->filename); +#endif + return path; +} + +uint64_t qemu_plugin_start_code(void) +{ + uint64_t start = 0; +#ifdef CONFIG_USER_ONLY + TaskState *ts = (TaskState *) current_cpu->opaque; + start = ts->info->start_code; +#endif + return start; +} + +uint64_t qemu_plugin_end_code(void) +{ + uint64_t end = 0; +#ifdef CONFIG_USER_ONLY + TaskState *ts = (TaskState *) current_cpu->opaque; + end = ts->info->end_code; +#endif + return end; +} + +uint64_t qemu_plugin_entry_code(void) +{ + uint64_t entry = 0; +#ifdef CONFIG_USER_ONLY + TaskState *ts = (TaskState *) current_cpu->opaque; + entry = ts->info->entry; +#endif + return entry; +} diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols index 4834756ba3..71f6c90549 100644 --- a/plugins/qemu-plugins.symbols +++ b/plugins/qemu-plugins.symbols @@ -1,5 +1,7 @@ { qemu_plugin_bool_parse; + qemu_plugin_end_code; + qemu_plugin_entry_code; qemu_plugin_get_hwaddr; qemu_plugin_hwaddr_device_name; qemu_plugin_hwaddr_is_io; @@ -17,6 +19,7 @@ qemu_plugin_n_max_vcpus; qemu_plugin_n_vcpus; qemu_plugin_outs; + qemu_plugin_path_to_binary; qemu_plugin_register_atexit_cb; qemu_plugin_register_flush_cb; qemu_plugin_register_vcpu_exit_cb; @@ -33,6 +36,7 @@ qemu_plugin_register_vcpu_tb_exec_inline; qemu_plugin_register_vcpu_tb_trans_cb; qemu_plugin_reset; + qemu_plugin_start_code; qemu_plugin_tb_get_insn; qemu_plugin_tb_n_insns; qemu_plugin_tb_vaddr; From patchwork Mon Jan 24 20:16:04 2022 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: 534538 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3162612imr; Mon, 24 Jan 2022 12:59:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJxoG1OsbGQgf4GoADuO+R9lOYyZOIMv0h91W/KcufsHpTPwubB2/UYpQcldpajj+zNDODg0 X-Received: by 2002:a05:6808:1185:: with SMTP id j5mr3036123oil.78.1643057946358; Mon, 24 Jan 2022 12:59:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643057946; cv=none; d=google.com; s=arc-20160816; b=NJ0TBegmRL8f9+PKH1TQgWNA6jtvQ3RcMLBR5ccIsXkY9j8Kd1Ot+2unsM6sfY3sJC 88Cx/anrU88P74FxrGgSzc5Znksx4e1KZIOoFY8FpCYpbDfYHUKONHX2EXZAjXZ3lUeN ljYSRA/Jz/QTihN2dt+CpK4DuqibKyoURmaxDiydnLCT3Lgfbt4FCHx+Ulztwx1aZa1c mlqTtKDvKV8fy3u4wJxoJ3GPIs1IBSNXGyFSKdWMzpp0zk0ggTpdA4b440bRiZ/8aLY2 ZmIAnFctV10cXPFATGtc/2OVAjoR7xpGkQmQ8QtJcZHeDBPZR4lUVYJgIpju9oHeO4V7 gX/Q== 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=qvlq4EbF8sgpZEXEh1QmS3gXAHV79S6jhTAWHRC4jv8=; b=EM7hXl9pAI4t3sBFHAC7RBnThZanJzPbLYS0gjoUNVyUNmKg2sL6+Cn6UpZrWj6Fvv AdV8+DUiwbSBhUBkSFMKgi0BL2sRt5r6gTucm0FMu0tTIEDJkSNMP8o4LXMUv6MTyJ65 vIIGqnE1QydGur8zThyADCpanzEkA1DlFpKKY0mBPy/hdtMc87qcRnLz5VO3JHpqNyK+ iaQpci0giZC0e02ewPtHqDUqbVsFx69QIZOg4DAVWIo4jy4UetqDjR6O3eHL6RkkzShT 6p2DyFiBpLqT/iL+o/UC9eUDyak4rJVrFW6tPbRTIKEVE7qaWvI/zuZZD50BKLdlcd32 AytQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=etxNXnuU; 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 s17si8897705oiw.107.2022.01.24.12.59.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:59:06 -0800 (PST) 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=etxNXnuU; 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]:39936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6Qa-00020n-6f for patch@linaro.org; Mon, 24 Jan 2022 15:59:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5ru-0005Mh-FN for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:23:14 -0500 Received: from [2a00:1450:4864:20::52b] (port=33322 helo=mail-ed1-x52b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5rs-0004Ka-IL for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:23:14 -0500 Received: by mail-ed1-x52b.google.com with SMTP id b13so58872958edn.0 for ; Mon, 24 Jan 2022 12:23:12 -0800 (PST) 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=qvlq4EbF8sgpZEXEh1QmS3gXAHV79S6jhTAWHRC4jv8=; b=etxNXnuUJrQpaJhYhP7rdnRc8BimFvRUStAgcvPd135BngaZ04tq85MoKS/ItIRObb 2PMHDzpqo/bZcMKu8KunCNUO1OwBUtWff9HGfPQX4fmc8fUtBJxEAaIpHdgnmcCsKg0x MBGgJuO2gseKG5wLNAZTFShjBIFdqr/jXb3SJwUsxawDz4aNib6Q8jX+XHF6S1C/i7OP OsH9mMDicV2YQUL2AzVOEAN0CP61K274iQcFqYxZAL0p39P75hhN09ufbt2ac/Z2hoBV aLFPHgQPuyFkPcKGcQ9JueJY0KfMXaT2VmYr+lxTpzDnt+g0Iisdy5ACcGMDQziTZjYP dMXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qvlq4EbF8sgpZEXEh1QmS3gXAHV79S6jhTAWHRC4jv8=; b=GTU7wcSiqWf9H59Q+PlQHc8mPryJhUGkjidIHyRNIJ+JJTC1Hj+qt2+6RL61JoHize nHCuu9Gu7xuUsqYjM8Qf+NjWo4i5dnP+w7DtUS3miaoUeI0yNIns+jYf6u20TL0/2CRn QycWM4TNIYOSi+naxrGxXtx6fSxaOBPHvCF3jukg/CWUn1dtz9MVo7dEjitxEXQR0976 X1ey9X/TIuLRyN6GtSGfa6K1pQbpY1sGrRKWROjlzbrCReu5yAzrvFwaF1cWjh1/il9r rwrG+rNnr01GeqKxuuXljR/FREGbKq2wJaqGAswalKhOgXCKNJr0uN6hdXlH8gRv5Wiv BvNA== X-Gm-Message-State: AOAM5315g6m+RDjROzc01M0H5yhq6smTBulKGUR1cC/eQ5TyBfsw8L2F ZuRmaugYGbYBg+OK5rCQ53YEEg== X-Received: by 2002:a05:6402:230e:: with SMTP id l14mr17299621eda.370.1643055791270; Mon, 24 Jan 2022 12:23:11 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h1sm5252189ejt.122.2022.01.24.12.23.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:23:07 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 745A31FFC9; Mon, 24 Jan 2022 20:16:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 18/22] contrib/plugins: add a drcov plugin Date: Mon, 24 Jan 2022 20:16:04 +0000 Message-Id: <20220124201608.604599-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52b.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Iooss , aaron@os.amperecomputing.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, Ivanov Arkady , kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Ivanov Arkady This patch adds the ability to generate files in drcov format. Primary goal this script is to have coverage logfiles thatwork in Lighthouse. Signed-off-by: Ivanov Arkady Message-Id: <163491884553.304355.13246023070235438959.stgit@pc-System-Product-Name> [AJB: use g_ptr_array instead of slist] Signed-off-by: Alex Bennée --- contrib/plugins/drcov.c | 163 +++++++++++++++++++++++++++++++++++++++ contrib/plugins/Makefile | 1 + 2 files changed, 164 insertions(+) create mode 100644 contrib/plugins/drcov.c diff --git a/contrib/plugins/drcov.c b/contrib/plugins/drcov.c new file mode 100644 index 0000000000..b4a855adaf --- /dev/null +++ b/contrib/plugins/drcov.c @@ -0,0 +1,163 @@ +/* + * Copyright (C) 2021, Ivanov Arkady + * + * Drcov - a DynamoRIO-based tool that collects coverage information + * from a binary. Primary goal this script is to have coverage log + * files that work in Lighthouse. + * + * License: GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION; + +static char header[] = "DRCOV VERSION: 2\n" + "DRCOV FLAVOR: drcov-64\n" + "Module Table: version 2, count 1\n" + "Columns: id, base, end, entry, path\n"; + +static FILE *fp; +static const char *file_name = "file.drcov.trace"; +static GMutex lock; + +typedef struct { + uint32_t start; + uint16_t size; + uint16_t mod_id; + bool exec; +} bb_entry_t; + +/* Translated blocks */ +static GPtrArray *blocks; + +static void printf_header(unsigned long count) +{ + fprintf(fp, "%s", header); + const char *path = qemu_plugin_path_to_binary(); + uint64_t start_code = qemu_plugin_start_code(); + uint64_t end_code = qemu_plugin_end_code(); + uint64_t entry = qemu_plugin_entry_code(); + fprintf(fp, "0, 0x%lx, 0x%lx, 0x%lx, %s\n", + start_code, end_code, entry, path); + fprintf(fp, "BB Table: %ld bbs\n", count); +} + +static void printf_char_array32(uint32_t data) +{ + const uint8_t *bytes = (const uint8_t *)(&data); + fwrite(bytes, sizeof(char), sizeof(data), fp); +} + +static void printf_char_array16(uint16_t data) +{ + const uint8_t *bytes = (const uint8_t *)(&data); + fwrite(bytes, sizeof(char), sizeof(data), fp); +} + + +static void printf_el(gpointer data, gpointer user_data) +{ + bb_entry_t *bb = (bb_entry_t *)data; + if (bb->exec) { + printf_char_array32(bb->start); + printf_char_array16(bb->size); + printf_char_array16(bb->mod_id); + } + g_free(bb); +} + +static void count_block(gpointer data, gpointer user_data) +{ + unsigned long *count = (unsigned long *) user_data; + bb_entry_t *bb = (bb_entry_t *)data; + if (bb->exec) { + *count = *count + 1; + } +} + +static void plugin_exit(qemu_plugin_id_t id, void *p) +{ + unsigned long count = 0; + g_mutex_lock(&lock); + g_ptr_array_foreach(blocks, count_block, &count); + + /* Print function */ + printf_header(count); + g_ptr_array_foreach(blocks, printf_el, NULL); + + /* Clear */ + g_ptr_array_free(blocks, true); + + fclose(fp); + + g_mutex_unlock(&lock); +} + +static void plugin_init(void) +{ + fp = fopen(file_name, "wb"); + blocks = g_ptr_array_sized_new(128); +} + +static void vcpu_tb_exec(unsigned int cpu_index, void *udata) +{ + bb_entry_t *bb = (bb_entry_t *) udata; + + g_mutex_lock(&lock); + bb->exec = true; + g_mutex_unlock(&lock); +} + +static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) +{ + uint64_t pc = qemu_plugin_tb_vaddr(tb); + size_t n = qemu_plugin_tb_n_insns(tb); + + g_mutex_lock(&lock); + + bb_entry_t *bb = g_new0(bb_entry_t, 1); + for (int i = 0; i < n; i++) { + bb->size += qemu_plugin_insn_size(qemu_plugin_tb_get_insn(tb, i)); + } + + bb->start = pc; + bb->mod_id = 0; + bb->exec = false; + g_ptr_array_add(blocks, bb); + + g_mutex_unlock(&lock); + qemu_plugin_register_vcpu_tb_exec_cb(tb, vcpu_tb_exec, + QEMU_PLUGIN_CB_NO_REGS, + (void *)bb); + +} + +QEMU_PLUGIN_EXPORT +int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, + int argc, char **argv) +{ + for (int i = 0; i < argc; i++) { + g_autofree char **tokens = g_strsplit(argv[i], "=", 2); + if (g_strcmp0(tokens[0], "filename") == 0) { + file_name = g_strdup(tokens[1]); + } + } + + plugin_init(); + + qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans); + qemu_plugin_register_atexit_cb(id, plugin_exit, NULL); + + return 0; +} diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index 576ed5875a..7eed5d51f8 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -21,6 +21,7 @@ NAMES += lockstep NAMES += hwprofile NAMES += cache NAMES += stxp-plugin +NAMES += drcov SONAMES := $(addsuffix .so,$(addprefix lib,$(NAMES))) From patchwork Mon Jan 24 20:16:05 2022 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: 534533 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3156839imr; Mon, 24 Jan 2022 12:48:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJwNK+JLDf7wzga8w9JRU7+JaalPrCH/LCVLAtPiQH4oX0kPJdQl7XEtiB2bOwW+J4W5rqJo X-Received: by 2002:a25:7e46:: with SMTP id z67mr24588423ybc.595.1643057306812; Mon, 24 Jan 2022 12:48:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643057306; cv=none; d=google.com; s=arc-20160816; b=dfmDU+0SToXTnDK3FoalipsWdArIqJ4URiOyn2cha/gLEd8SEdZ0DJUkn1MjSTuRuW tH0xmeP9ChzSFQDmcGIm0qzlazNysWyPKnT847SD1nKtFf7K1ddEHO4qjj62Tdh/Siox 3cml5y3QYm2iDNqYSNzvmX/nhHqZpCDU6FSZWfWz/95aAoY2LIu2Q1jhoH0r9d5VSXxK LoCxztuQ1TTwu+qE+W0t8hbMKWZk66vWRPQp67LrqVGGeBcdkZdPRwVzLtNFJSpekp5y s1MDkgCbz/fQ0NCCsGrRYD099YPEtAFpMFpbw2k+2TZlk/n/PcyW+o2Vze1p1X69xNTo DXtQ== 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=Aw9//rMqmIasQm/iGFUqITI+tDFIlD0DW72eVqm7DkE=; b=f6oJ9st877f29z0Oh05Nh8mpayzEnAw+T8rvRI1xBzzSkStRQzKQUjs7yY8EQsmRLg Ca6b6Y4CyVeNglrxPqQEgDsBXCtGUbG5+djYKoAsTIIR7jXEVnA7H1pzNd+ky1akYNzL jEpiVcVNFHO75FlVTHvUk8Wd9CJB0mammnhHiQ13M44h8gIO/arCApF42Hp1EQtwsnHR +3FlulJ4sQqiLcmkImEVNjFqmxzfsXzS24C1IjWPKgwz0g6m5amS6Wv8aMGIUbPdKh73 iAlEUGF7aevt0DddxCbEbas6Jdm+tZlpOR/XpHh9qrPFBabJYFzIfvLlw1tWm5Q3pmPB B+mQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HYLqfquS; 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 3si15640289ybu.614.2022.01.24.12.48.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:48:26 -0800 (PST) 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=HYLqfquS; 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]:52416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6GI-0007gD-AM for patch@linaro.org; Mon, 24 Jan 2022 15:48:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5rm-0005Bj-Ll for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:23:06 -0500 Received: from [2a00:1450:4864:20::62b] (port=35648 helo=mail-ej1-x62b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5rk-0004JK-TZ for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:23:06 -0500 Received: by mail-ej1-x62b.google.com with SMTP id s5so24634781ejx.2 for ; Mon, 24 Jan 2022 12:23:04 -0800 (PST) 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=Aw9//rMqmIasQm/iGFUqITI+tDFIlD0DW72eVqm7DkE=; b=HYLqfquScx/h8wnEQ3Mw7hSkylcYU0FQ8CCpAUf6h/z1ukEByh+QCt0gVgDcq1D24s hjDgyF0wQmPrcF943sMNgvLmsDkgc/Jr0Oqfdx+1We3UHtTZiN1qJflgXxT5I6ZdtVfu KIBwKqeYgzDHLWPwUc3RHsUaMaWuLt/4u7YVUEhBVly6QtXL2s0B16+t8FrMxKNoNsvc QkM0Pg/y5dr8N3M/yAYAImyl2jp73j9AHkDBuTXuBLir18ubRwX9a84CMRg5HtWtDvOw PEOFOHoKkb/fB7EB9K+w8CKsJtko4dmbqijyV/KceEPnJWNIwjosFByZPzTlKQrdylJ4 6aUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Aw9//rMqmIasQm/iGFUqITI+tDFIlD0DW72eVqm7DkE=; b=ZLypNnLIVRCJAfZ9FqE/d6PCffMSGtLFpmNOBqfnGJYq5ezWSyoPkDllz1L1ftpSne sv1if6qVK/M344nUR085sftmyzu714MQlkg2R5KSHdX6oqBt9lfumj/BAxaEumMifvvx YbU3Jzye8aVsxu4uadt991nsCwEN4hPHyfWUuK/icXv9oK9HauHHoN77UJU4tzPMY4P0 UCTydGKIzRv5gWp1rsrlPJYq7oPJB49dNT50Do87C8HhxSj+lvPp0dWM1b3YK3SQDqBb 2WJ+RlXCYpzGzt4sYfQ2/Dozwyxx082th4OZ/SvVkS5kXhoSPT0Lz7q2WXzMhr66SrNu 1FSg== X-Gm-Message-State: AOAM533XPvc0C9uTzNe8I4S4euPJTK4n5nUesPzbdv3tIVYiCu/Fof+g nhwYQ6mGJeGwqG5NiTyZp1sztg== X-Received: by 2002:a17:907:2d06:: with SMTP id gs6mr4361974ejc.765.1643055783444; Mon, 24 Jan 2022 12:23:03 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id uz30sm5303096ejb.61.2022.01.24.12.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:22:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 91D0C1FFCA; Mon, 24 Jan 2022 20:16:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 19/22] tests/plugin: allow libinsn.so per-CPU counts Date: Mon, 24 Jan 2022 20:16:05 +0000 Message-Id: <20220124201608.604599-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62b.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aaron@os.amperecomputing.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, Alexandre Iooss , kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We won't go fully flexible but for most system emulation 8 vCPUs resolution should be enough for anybody ;-) Signed-off-by: Alex Bennée --- tests/plugin/insn.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/tests/plugin/insn.c b/tests/plugin/insn.c index d229fdc001..d5a0a08cb4 100644 --- a/tests/plugin/insn.c +++ b/tests/plugin/insn.c @@ -16,22 +16,33 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION; -static uint64_t insn_count; +#define MAX_CPUS 8 /* lets not go nuts */ + +typedef struct { + uint64_t last_pc; + uint64_t insn_count; +} InstructionCount; + +static InstructionCount counts[MAX_CPUS]; +static uint64_t inline_insn_count; + static bool do_inline; static bool do_size; +static bool do_frequency; static GArray *sizes; static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata) { - static uint64_t last_pc; + unsigned int i = cpu_index % MAX_CPUS; + InstructionCount *c = &counts[i]; uint64_t this_pc = GPOINTER_TO_UINT(udata); - if (this_pc == last_pc) { + if (this_pc == c->last_pc) { g_autofree gchar *out = g_strdup_printf("detected repeat execution @ 0x%" PRIx64 "\n", this_pc); qemu_plugin_outs(out); } - last_pc = this_pc; - insn_count++; + c->last_pc = this_pc; + c->insn_count++; } static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) @@ -44,7 +55,7 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) if (do_inline) { qemu_plugin_register_vcpu_insn_exec_inline( - insn, QEMU_PLUGIN_INLINE_ADD_U64, &insn_count, 1); + insn, QEMU_PLUGIN_INLINE_ADD_U64, &inline_insn_count, 1); } else { uint64_t vaddr = qemu_plugin_insn_vaddr(insn); qemu_plugin_register_vcpu_insn_exec_cb( @@ -66,9 +77,9 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) static void plugin_exit(qemu_plugin_id_t id, void *p) { g_autoptr(GString) out = g_string_new(NULL); + int i; if (do_size) { - int i; for (i = 0; i <= sizes->len; i++) { unsigned long *cnt = &g_array_index(sizes, unsigned long, i); if (*cnt) { @@ -76,8 +87,20 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) "len %d bytes: %ld insns\n", i, *cnt); } } + } else if (do_inline) { + g_string_append_printf(out, "insns: %" PRIu64 "\n", inline_insn_count); } else { - g_string_append_printf(out, "insns: %" PRIu64 "\n", insn_count); + uint64_t total_insns = 0; + for (i = 0; i < MAX_CPUS; i++) { + InstructionCount *c = &counts[i]; + if (c->insn_count) { + g_string_append_printf(out, "cpu %d insns: %" PRIu64 "\n", + i, c->insn_count); + total_insns += c->insn_count; + } + } + g_string_append_printf(out, "total insns: %" PRIu64 "\n", + total_insns); } qemu_plugin_outs(out->str); } From patchwork Mon Jan 24 20:16:06 2022 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: 534522 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3145618imr; Mon, 24 Jan 2022 12:29:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJzyFJA2n/YBtdcVRmkJPePONe9mQnjoAPdox/Puwy6VuZo/nkFaafCU8U9hrEZHgyZsWQFa X-Received: by 2002:a05:6602:1482:: with SMTP id a2mr8919072iow.182.1643056193403; Mon, 24 Jan 2022 12:29:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056193; cv=none; d=google.com; s=arc-20160816; b=I3duugYOq/LCpA07g5uxMRcXLQQm1Ugef8HD8Odb+xSb+5k5GSMQbqdLHjY/LFTj7l iswl4Fej7uoY4jhItMv59EbDn+jyATYS0qr/zV0sJrExtZRmtR9ja11pmHE9eSZyScVN oBxwijAA29CPbFhReKDbMboouYEZPMJH+lkJxkAvSBGzNbFHqRGOaq5ZdMLNY/zVOW6A e4GyHhvlAuQqBKEDbyQYUzk9sUSY/r4UmMJTz7R5im5/YA1ADeYaox3dQlnMAx6hbe3D pMJwPWRfRGatu+OKWUf/qm9Hi7VuCqb/dqcpnjjLYPB3ad1QekAOXxcNmVFsZwgm8PyL E3Tg== 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=axHH0XLnnpwjpRa/aOwox3XwLDn8CpqdWoFvoE9BTRU=; b=qYTKj/8nDDB+Jo4FFnbBFF3Riy3N2k3OuM84u+2fVtqF4yNAm7rhWvzkaZCxoAze2H A8qtlbERTsAQqJjPc5D4RKGVd5WZsWrBiPe8PLXU1XOWxAHjznU/gX9981tbI4o1gACq TmuyrWiKWYRdGaFwb/qHUPCM5OH3Df4DNtEYoM6cqbpU/oLW3uEH+ZJUkHd17PLWm54F 4EBHKdxpAne1BAulrEMRZWickqARIgY5c6mU4WOjistRYyrKABEIRV+5tVe477JCyda+ +5zDwgHxne1lNEPbTf5Bf1UAiV6Y7n17uO8y+lDdFSemPL4LtgQP8WBFZqJ3vL5QrYn6 EqRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HtkSebmI; 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 t18si2344010ilf.49.2022.01.24.12.29.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:29:53 -0800 (PST) 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=HtkSebmI; 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]:44348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC5yJ-00085w-KZ for patch@linaro.org; Mon, 24 Jan 2022 15:29:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5rj-0005AJ-Sc for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:23:04 -0500 Received: from [2a00:1450:4864:20::533] (port=41550 helo=mail-ed1-x533.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5ri-0004J8-8H for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:23:03 -0500 Received: by mail-ed1-x533.google.com with SMTP id j2so58502195edj.8 for ; Mon, 24 Jan 2022 12:23:01 -0800 (PST) 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=axHH0XLnnpwjpRa/aOwox3XwLDn8CpqdWoFvoE9BTRU=; b=HtkSebmIKUEb2Ybmwkih4yeK32INV55+ZPTBNMnSj0Ne5O0aPi1t5lcu4W3iDN0VAo NaN/qsB0VQyOa22zWZiXXm8Q+rilNVJ17wGMm56YspGLlU+4gFZ7dCZ02nnMYIhfI2UK 8SsKMQFHu2sJP6R0Ktg2TqeLczVgxNuqBSZJ6OZheZCYV3vUgCXCC2XV0f72iYPu6RVO tQZFL2OcgPiI5vcD5Pj8og2eY/Le6gSzPfDOaqXu+5M2hU4+gpagiXMccmpL3qSkO5O+ y5imd6db5NXiiKMjn1r7xzNTV5yHfN5u+3FB5OOUWCSReJL2Pzs5oSgnbwINWDB4QrUK 3CYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=axHH0XLnnpwjpRa/aOwox3XwLDn8CpqdWoFvoE9BTRU=; b=5ata+PpLur23Isc1FWqQa7yd82CLXudDJ598Eq0+O1gu2e8LT0OitFjTkc3OBrMjh4 a3f5hyeTn6uzg11VU9LNfOCINnFa34mD7sHJuSK/rYzf33Ndsm0lBfFwLy+E+J8ZYFhP cbMXhI06PTbnUIk1ctnMKmCEfEcv+58zk0WZtBREBOWSjAhHtAE3XoX3a8/80U6KPrr1 j033qkDITjXn1+icMLqaA9VuD9WuXaLBlQ7C+OJFKEufgjGZE0hTjVQNVma3OSAyhSI0 FtYtx68UQgtFmAZ01vJYndjAAmoVXX2d2Pq1JvZtxW5N0OlKg4bhX5917h8qQKga8qyI 3JGA== X-Gm-Message-State: AOAM531VldYcDNVvSuveFNjA2H8PCd53oaRVZHjaHjTAAxlAdOPEDqg/ xk203UUguL/jHrFdSDqGRwJebg== X-Received: by 2002:a05:6402:1604:: with SMTP id f4mr17387585edv.352.1643055780801; Mon, 24 Jan 2022 12:23:00 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o23sm5270901ejn.22.2022.01.24.12.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:22:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A0E851FFCB; Mon, 24 Jan 2022 20:16:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 20/22] tests/plugins: add instruction matching to libinsn.so Date: Mon, 24 Jan 2022 20:16:06 +0000 Message-Id: <20220124201608.604599-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::533 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x533.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vasilev Oleg , Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, Alexandre Iooss , kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This adds simple instruction matching to the libinsn.so plugin which is useful for examining the execution distance between instructions. For example to track how often we flush in ARM due to TLB updates: -plugin ./tests/plugin/libinsn.so,match=tlbi which leads to output like this: 0xffffffc01018fa00, tlbi aside1is, x0, 339, 32774 match hits, 23822 since last, avg 47279 0xffffffc01018fa00, tlbi aside1is, x0, 340, 32775 match hits, 565051 since last, avg 47295 0xffffffc0101915a4, tlbi vae1is, x0, 155, 32776 match hits, 151135 since last, avg 47298 0xffffffc01018fc60, tlbi vae1is, x4, 224, 32777 match hits, 814 since last, avg 47297 0xffffffc010194a44, tlbi vale1is, x1, 8835, 32778 match hits, 52027 since last, avg 47297 0xffffffc010194a44, tlbi vale1is, x1, 8836, 32779 match hits, 8347 since last, avg 47296 0xffffffc010194a44, tlbi vale1is, x1, 8837, 32780 match hits, 33677 since last, avg 47295 showing we do some sort of TLBI invalidation every 47 thousand instructions. Cc: Vasilev Oleg Cc: Richard Henderson Cc: Emilio Cota Signed-off-by: Alex Bennée --- tests/plugin/insn.c | 88 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 1 deletion(-) diff --git a/tests/plugin/insn.c b/tests/plugin/insn.c index d5a0a08cb4..3f48c86fd7 100644 --- a/tests/plugin/insn.c +++ b/tests/plugin/insn.c @@ -28,9 +28,25 @@ static uint64_t inline_insn_count; static bool do_inline; static bool do_size; -static bool do_frequency; static GArray *sizes; +typedef struct { + char *match_string; + uint64_t hits[MAX_CPUS]; + uint64_t last_hit[MAX_CPUS]; + uint64_t total_delta[MAX_CPUS]; + GPtrArray *history[MAX_CPUS]; +} Match; + +static GArray *matches; + +typedef struct { + Match *match; + uint64_t vaddr; + uint64_t hits; + char *disas; +} Instruction; + static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata) { unsigned int i = cpu_index % MAX_CPUS; @@ -45,6 +61,36 @@ static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata) c->insn_count++; } +static void vcpu_insn_matched_exec_before(unsigned int cpu_index, void *udata) +{ + unsigned int i = cpu_index % MAX_CPUS; + Instruction *insn = (Instruction *) udata; + Match *match = insn->match; + g_autoptr(GString) ts = g_string_new(""); + + insn->hits++; + g_string_append_printf(ts, "0x%" PRIx64 ", %s, % "PRId64, + insn->vaddr, insn->disas, insn->hits); + + uint64_t icount = counts[i].insn_count; + uint64_t delta = icount - match->last_hit[i]; + + match->hits[i]++; + match->total_delta[i] += delta; + + g_string_append_printf(ts, + ", %"PRId64" match hits, %"PRId64 + " since last, avg %"PRId64"\n", + match->hits[i], delta, + match->total_delta[i] / match->hits[i]); + + match->last_hit[i] = icount; + + qemu_plugin_outs(ts->str); + + g_ptr_array_add(match->history[i], insn); +} + static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) { size_t n = qemu_plugin_tb_n_insns(tb); @@ -71,6 +117,29 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) unsigned long *cnt = &g_array_index(sizes, unsigned long, sz); (*cnt)++; } + + /* + * If we are tracking certain instructions we will need more + * information about the instruction which we also need to + * save if there is a hit. + */ + if (matches) { + char *insn_disas = qemu_plugin_insn_disas(insn); + int j; + for (j = 0; j < matches->len; j++) { + Match *m = &g_array_index(matches, Match, j); + if (g_str_has_prefix(insn_disas, m->match_string)) { + Instruction *rec = g_new0(Instruction, 1); + rec->disas = g_strdup(insn_disas); + rec->vaddr = qemu_plugin_insn_vaddr(insn); + rec->match = m; + qemu_plugin_register_vcpu_insn_exec_cb( + insn, vcpu_insn_matched_exec_before, + QEMU_PLUGIN_CB_NO_REGS, rec); + } + } + g_free(insn_disas); + } } } @@ -105,6 +174,21 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) qemu_plugin_outs(out->str); } + +/* Add a match to the array of matches */ +static void parse_match(char *match) +{ + Match new_match = { .match_string = match }; + int i; + for (i = 0; i < MAX_CPUS; i++) { + new_match.history[i] = g_ptr_array_new(); + } + if (!matches) { + matches = g_array_new(false, true, sizeof(Match)); + } + g_array_append_val(matches, new_match); +} + QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, int argc, char **argv) @@ -122,6 +206,8 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, fprintf(stderr, "boolean argument parsing failed: %s\n", opt); return -1; } + } else if (g_strcmp0(tokens[0], "match") == 0) { + parse_match(tokens[1]); } else { fprintf(stderr, "option parsing failed: %s\n", opt); return -1; From patchwork Mon Jan 24 20:16:07 2022 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: 534534 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3156964imr; Mon, 24 Jan 2022 12:48:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJyapqspFBUuVlz+NC5+5aBT+szHjpJyy741suGddqAYpwvk9yPoxWPTusKT+/vgobUg2ww8 X-Received: by 2002:a25:9103:: with SMTP id v3mr24893571ybl.416.1643057321174; Mon, 24 Jan 2022 12:48:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643057321; cv=none; d=google.com; s=arc-20160816; b=1AU2L9RudNHX62gLI0zV6XNDtNRdoZcOPt5p9U8I2gW6rvRuX4BUXzWcbQpAKTWbBc ZY2U6LJG7h0Jz7GTVluNWt/o1TWpXYwRloV5evaTPz8gPMUJ3BQNpqfbaNxPN+FBAGQo CkMhmYTELKqCuPVzfnaXWHAwZGE3kgfkgzLAlCcCtBIrPHVklhj9Szc1RTDodYCaDivM rtoBhxdEpFWg4lVH2ML4TQZCTIH5XOZKcQTviKiEykHBnbIXXRS3Y0zfPG1RGnqbOHK/ 5sZ28oZYuzmm+SqSKuFqsfylJzAZGguYl/flVeaRVJGlUhbjoWPKwEX50F05T5sK4oPo aE/g== 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=/z5GGZMV35f+I2ea4vFQTVFSNKkQJlZfsfq4OFs3GJ0=; b=Yt6i2j0lFCdR3NLHKpg2PQKxPdFydAIZWWZWyKXJL3klDM/ORgrPTR5vhzR6JIqBfh Xf+0GLGTrTXp2ihOsvywlVq97vSSObap8oUtCEH4yOC9XBx8xlVudJoXZQ3bxBP477ij oQKY1y+JiOUbajSVdmUj42e8Bpv9WY7uKVFigcP31xwMlIxKRkLL+bruGDdJO4x40MOK d9c1R940Fe+6Gz0277pszPPWv/D4r+96Bepbsq+XoyVT1cDhu7CJ42e4KgXlxFr1tztF xF/5/Ew459qzqRvE/W1NTk7kaUisPaBSnnAst7Qht3Edpfd8sSUWYV7Cd9XPt4t9+aDN iZSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HmM6OMdR; 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 z5si8666396ybu.647.2022.01.24.12.48.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:48:41 -0800 (PST) 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=HmM6OMdR; 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]:54008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6GW-0000OC-Jp for patch@linaro.org; Mon, 24 Jan 2022 15:48:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5lX-0006qB-Uu for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:40 -0500 Received: from [2a00:1450:4864:20::635] (port=34761 helo=mail-ej1-x635.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5lW-0003I0-AO for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:16:39 -0500 Received: by mail-ej1-x635.google.com with SMTP id h7so24656403ejf.1 for ; Mon, 24 Jan 2022 12:16:33 -0800 (PST) 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=/z5GGZMV35f+I2ea4vFQTVFSNKkQJlZfsfq4OFs3GJ0=; b=HmM6OMdRqL8k7LC9Y4JBHxl89VKdCt4AiBHAQt+kpPCaYZtIVWHPakIMOPCuBtg4J5 crdWz2Et/UtwILdjo3AsDiQUQRYiA229W6T3PmNtlcvmtNHwV//pI3NFLqPeUn/n1w3x GgBMPA6QjkRUq6QtaWZ04TygU4QryZo15rH1+Ir3pehzK7xk5/MmlR9qK529+iBzpgMs pF+EGkX8wYD/i5Of3VBeVcVmGBUpQWKpGzjely6BJm0C0kZn+6pGyYVDzxwCFtvgudwJ Zac+pev9gwpUHaBTy/16waaNq5HXk5PTCW4hoFk0oOk+Fh10oSG7xpMpN7QkQJNeNHEy OatQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/z5GGZMV35f+I2ea4vFQTVFSNKkQJlZfsfq4OFs3GJ0=; b=zp/PyTEBk80RDdjSsC7UerS7giL6jaP5tdXRfedQkpTmnZhBoQ1wUYRSWHmoJdk64U 67OvapeKqWisssPpkptb7zbQ0o9iWOG0OQqHTx7OzEQCoPDhTGUp5pSiznkqjsXJCDY/ cXr+y+A1WC+BKGlDkIM96Lg4H7uDEnLf8H1UMpEOYX6L7q4Sa2K4ctTfrrHalvRK59G7 ifXzHry1wHvHn9Sk6GBJtMoNL0ULWljSG3m39kuNeWe3AkZvlnfBTRBtZp5etTwAby6P sCbZTGMfW8CDF0MIeYHTlSHQdl8+fCsQsmYJ3qyCeJPIMfdbbmvJUkjRiN3ZE43U4mPd 9qqw== X-Gm-Message-State: AOAM532H4IetanjjO0w0i1lE9QLkHkFuqrd9E8WqP/nVbjqnE73VCsXt EVjKDJvriKIQae4H58UaJC2Gqw== X-Received: by 2002:a17:907:2d0c:: with SMTP id gs12mr7551646ejc.165.1643055392742; Mon, 24 Jan 2022 12:16:32 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id op20sm5317494ejb.68.2022.01.24.12.16.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:16:26 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B8CB11FFCC; Mon, 24 Jan 2022 20:16:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 21/22] target/i386: use CPU_LOG_INT for IRQ servicing Date: Mon, 24 Jan 2022 20:16:07 +0000 Message-Id: <20220124201608.604599-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::635 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x635.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, Paolo Bonzini , kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" I think these have been wrong since f193c7979c (do not depend on thunk.h - more log items). Fix them so as not to confuse other debugging. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/i386/tcg/sysemu/seg_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/tcg/sysemu/seg_helper.c b/target/i386/tcg/sysemu/seg_helper.c index bf3444c26b..824b9a5a26 100644 --- a/target/i386/tcg/sysemu/seg_helper.c +++ b/target/i386/tcg/sysemu/seg_helper.c @@ -167,7 +167,7 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request) cs->interrupt_request &= ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_VIRQ); intno = cpu_get_pic_interrupt(env); - qemu_log_mask(CPU_LOG_TB_IN_ASM, + qemu_log_mask(CPU_LOG_INT, "Servicing hardware INT=0x%02x\n", intno); do_interrupt_x86_hardirq(env, intno, 1); break; @@ -175,7 +175,7 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request) cpu_svm_check_intercept_param(env, SVM_EXIT_VINTR, 0, 0); intno = x86_ldl_phys(cs, env->vm_vmcb + offsetof(struct vmcb, control.int_vector)); - qemu_log_mask(CPU_LOG_TB_IN_ASM, + qemu_log_mask(CPU_LOG_INT, "Servicing virtual hardware INT=0x%02x\n", intno); do_interrupt_x86_hardirq(env, intno, 1); cs->interrupt_request &= ~CPU_INTERRUPT_VIRQ; From patchwork Mon Jan 24 20:16:08 2022 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: 534524 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3148491imr; Mon, 24 Jan 2022 12:33:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJxxNxJl2z1BCUMD+cbl5rmuQXytIFi9lGnSkYBrt6NAtI4ruBjMTHAS9idTOPCu9uEX4JIl X-Received: by 2002:a05:6902:692:: with SMTP id i18mr24145811ybt.410.1643056428926; Mon, 24 Jan 2022 12:33:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643056428; cv=none; d=google.com; s=arc-20160816; b=HL0BOQ6/a2RnUviBvzwNbrCow5ifO8Qq/q2l6Lmi33pBHRvbjztcLu/7A0L8zhzAyp Epv2KeXNP2oux3lfOUz7xMKSfzAARXVYNHNKYiDwbI8chMObg75DtHYLL4ZIBQEyY4ST +99GYzBOGl0/TdwUfIZb3/Njti/rUkjixVUf/m21bi7jTkBzoD0s9yCDPfTEGjxkjQpW 87WVJtHkwnnwFQQeMiDyzCpe2Oge2GgfNBUWDijh1BzR0bfLc15CWEGUlsE3vODPyFwV M+tv4+478u+ag8PVhrHzQGSdNic+zK1iHheLmfwhD3CJhiHAcCV08Pm+1rYEAkSIA8b9 3ezw== 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=MRNIvDYLPOqN3WM8XDKQNxj/+D1kLnUW2Ll6/NI+3fM=; b=dfjeNUUeOTHST6OA/aAS3O5OMwDp5Dfe2ibkQ/TZ3GGyL5zAjCieteazUBsbtnbMlL KrtyJepAe7qXUMKNRAhy5zU4HuXYCg+CpuISWh3OsgMAEvYqoiUbUWMZnH393BZkm+Xa BxjxpzSk6WjXmKNlinb+bjVNwBf/GC3nqnZqUKA0JzUVo86QiuKoXMh22p99bA268FFb Q/mIm6LaScxCTyb7tgGq+CQhcczrGt419LuloIsCEgJMMK+v9mUCoFwkgRiJCgQAfud1 vCbVcdbm05u3nY6OxeO0NY7o5yZqecprW72LV/2KTerQFoFpfq9RDFQVr6ckAsLmZZf5 I92w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QRFR7hTp; 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 r12si11690948ybu.177.2022.01.24.12.33.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jan 2022 12:33:48 -0800 (PST) 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=QRFR7hTp; 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]:51970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC628-0004pF-5K for patch@linaro.org; Mon, 24 Jan 2022 15:33:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC5rs-0005It-Em for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:23:12 -0500 Received: from [2a00:1450:4864:20::536] (port=39613 helo=mail-ed1-x536.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC5rq-0004K5-IZ for qemu-devel@nongnu.org; Mon, 24 Jan 2022 15:23:11 -0500 Received: by mail-ed1-x536.google.com with SMTP id u18so44385689edt.6 for ; Mon, 24 Jan 2022 12:23:10 -0800 (PST) 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=MRNIvDYLPOqN3WM8XDKQNxj/+D1kLnUW2Ll6/NI+3fM=; b=QRFR7hTp3ynUvvtF4cEGPxHNn3k3pueplETmOTePGSolhCEq7ksTAiZv2u/uafb+au 0nhs+II+0tsOSMQJAsHpizqIxN91BM94p3UXH4tC+QACnIWnPNnmhK7qJyuDwDmrn+Fa JeO9VvimZSHnJxVODc2sTkF8LcqFkkI54jNR7pWKjp1y95rUe28QkH2eLdy7kN9g/4ym f8QofCdLpLgi30M3YqUINpsyzPiJstdf5dwlMQCnRMs16wVf1I5sceSkibxYv1z5jiVE flb2bCCF8Bkt8rsMAMcQFKfv8zBIhkGxlvjyagopBIvImc1kh+/O0rVRE9GYoR+E+4se XHtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MRNIvDYLPOqN3WM8XDKQNxj/+D1kLnUW2Ll6/NI+3fM=; b=OPA3vXnPVBgFphsxuEtsGrzu2zNVUA3pXRszywNIix/olBLo3dHkXSyJ4PzOxLG63p Mc05pRyoHEeD8s1XurTWfbEnr+JJ6jljGuAoKSwb4eUvFx4LeRCofSdvZUuG7RxX8HJU 52tSWZbSeaDBFIDjkNUSecT/SDmEGKUAMTnuhfAEXoleBRSLFOKjrjMDx7QIUYOGTJsj pCd8iu3UohTuKi9rEKNnPFv+lWbTVW4Blu6YqpfTfzKAf2qR8n+k/iVgceA27WIl65g4 syVwCbsTySzL2pzQo72DwWN55uxwvL5AxY11wyA5ehjNtHqdzsSGwD5mZGiBn2hQCI+u 6OeQ== X-Gm-Message-State: AOAM530x0pj7dWkPYIfUoFPdAgmf5tSeQzheG38PEtm+yp89DHLRzC7c gaF+nlszx807Gf0WvyUzzlc4zQ== X-Received: by 2002:a05:6402:4383:: with SMTP id o3mr5045113edc.353.1643055789055; Mon, 24 Jan 2022 12:23:09 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w22sm5279874ejj.64.2022.01.24.12.23.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 12:23:07 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C62831FFCD; Mon, 24 Jan 2022 20:16:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 22/22] plugins: move reset of plugin data to tb_start Date: Mon, 24 Jan 2022 20:16:08 +0000 Message-Id: <20220124201608.604599-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124201608.604599-1-alex.bennee@linaro.org> References: <20220124201608.604599-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::536 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x536.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, Paolo Bonzini , kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can't always guarantee we get to the end of a translator loop. Although this can happen for a variety of reasons it does happen more often on x86 system emulation when an instruction spans across to an un-faulted page. This caused confusion of the instruction tracking data resulting in apparent reverse execution (at least from the plugins point of view). Fix this by moving the reset code to plugin_gen_tb_start so we always start with a clean slate. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/824 Signed-off-by: Alex Bennée --- accel/tcg/plugin-gen.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 22d95fe1c3..ae70e4a5b0 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -854,10 +854,21 @@ static void plugin_gen_inject(const struct qemu_plugin_tb *plugin_tb) bool plugin_gen_tb_start(CPUState *cpu, const TranslationBlock *tb, bool mem_only) { - struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; bool ret = false; if (test_bit(QEMU_PLUGIN_EV_VCPU_TB_TRANS, cpu->plugin_mask)) { + struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; + int i; + + /* reset callbacks */ + for (i = 0; i < PLUGIN_N_CB_SUBTYPES; i++) { + if (ptb->cbs[i]) { + g_array_set_size(ptb->cbs[i], 0); + } + } + ptb->n = 0; + tcg_ctx->plugin_insn = NULL; + ret = true; ptb->vaddr = tb->pc; @@ -904,23 +915,19 @@ void plugin_gen_insn_end(void) plugin_gen_empty_callback(PLUGIN_GEN_AFTER_INSN); } +/* + * There are cases where we never get to finalise a translation - for + * example a page fault during translation. As a result we shouldn't + * do any clean-up here and make sure things are reset in + * plugin_gen_tb_start. + */ void plugin_gen_tb_end(CPUState *cpu) { struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; - int i; /* collect instrumentation requests */ qemu_plugin_tb_trans_cb(cpu, ptb); /* inject the instrumentation at the appropriate places */ plugin_gen_inject(ptb); - - /* clean up */ - for (i = 0; i < PLUGIN_N_CB_SUBTYPES; i++) { - if (ptb->cbs[i]) { - g_array_set_size(ptb->cbs[i], 0); - } - } - ptb->n = 0; - tcg_ctx->plugin_insn = NULL; }