From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643055786795323.03750108497877; Mon, 24 Jan 2022 12:23:06 -0800 (PST) Received: from localhost ([::1]:53640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC5rl-0003jg-2S for importer@patchew.org; Mon, 24 Jan 2022 15:23:05 -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) 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) 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-Google-Smtp-Source: ABdhPJxyX1OtV7yWh/m9ao6r7VDqI8WZq7Tyj7YO91b0Rn/EDdXWPavFH/xEyxHXMWmilx+5aJ+FsA== X-Received: by 2002:aa7:d3c2:: with SMTP id o2mr17699363edr.207.1643055370306; Mon, 24 Jan 2022 12:16:10 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52e (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643055789414100003 This is no longer needed since 5516623020 ("meson: convert migration directory to Meson") Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 =20 -# Get the list of all supported sysemu targets -SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ - $(wildcard $(SRC_PATH)/configs/*-softmmu.mak))) - SPEED =3D quick =20 # Build up our target list from the filtered list of ninja targets --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643055976842700.9964320902886; Mon, 24 Jan 2022 12:26:16 -0800 (PST) Received: from localhost ([::1]:34136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC5uq-0001Nf-3K for importer@patchew.org; Mon, 24 Jan 2022 15:26:16 -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) 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) 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-Google-Smtp-Source: ABdhPJzWyLXrflc9yi1nHNIiFIgVbxrULtve0PA5xaP25/uz2s+k7m/UdbF/0z2KlrrRuyWCreMsNg== X-Received: by 2002:a17:907:9722:: with SMTP id jg34mr5046853ejc.757.1643055371288; Mon, 24 Jan 2022 12:16:11 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62e (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643055980474100001 If this starts causing failures again we should probably fix that. Signed-off-by: Alex Benn=C3=A9e 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); =20 - /* keeps failing on build-system since Aug 15 2017 */ - if (getenv("QTEST_VHOST_USER_FIXME")) { - opts.before =3D vhost_user_test_setup_reconnect; - qos_add_test("vhost-user/reconnect", "virtio-net", - test_reconnect, &opts); + opts.before =3D vhost_user_test_setup_reconnect; + qos_add_test("vhost-user/reconnect", "virtio-net", + test_reconnect, &opts); =20 - opts.before =3D vhost_user_test_setup_connect_fail; - qos_add_test("vhost-user/connect-fail", "virtio-net", - test_vhost_user_started, &opts); + opts.before =3D vhost_user_test_setup_connect_fail; + qos_add_test("vhost-user/connect-fail", "virtio-net", + test_vhost_user_started, &opts); =20 - opts.before =3D vhost_user_test_setup_flags_mismatch; - qos_add_test("vhost-user/flags-mismatch", "virtio-net", - test_vhost_user_started, &opts); - } + opts.before =3D vhost_user_test_setup_flags_mismatch; + qos_add_test("vhost-user/flags-mismatch", "virtio-net", + test_vhost_user_started, &opts); =20 opts.before =3D vhost_user_test_setup_multiqueue; opts.edge.extra_device_opts =3D "mq=3Don"; --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643056712601844.8459988004869; Mon, 24 Jan 2022 12:38:32 -0800 (PST) Received: from localhost ([::1]:36940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC66h-0005G5-Sy for importer@patchew.org; Mon, 24 Jan 2022 15:38:31 -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) 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) 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-Google-Smtp-Source: ABdhPJzfUPqdqfMRv/6JsICgJIl9LFH4neB9z/74kz9wQj/lSPysj6myFc9pCStH0E5koqAyJtyhlQ== X-Received: by 2002:a17:906:a091:: with SMTP id q17mr13631031ejy.669.1643055375651; Mon, 24 Jan 2022 12:16:15 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::630 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643056715944100001 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=C3=A9e --- 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 {} + --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643056553102763.0765493873988; Mon, 24 Jan 2022 12:35:53 -0800 (PST) Received: from localhost ([::1]:58466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC648-0000hu-8y for importer@patchew.org; Mon, 24 Jan 2022 15:35:52 -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) 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) 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-Google-Smtp-Source: ABdhPJzWMUbn/E2Mg0RJoCmp3DY/33WoNxLrTu+VsgZjlwxtjLir/6P1RvD/wx7X94Z5TCmoTuqh8A== X-Received: by 2002:a17:907:9804:: with SMTP id ji4mr3298008ejc.409.1643055377128; Mon, 24 Jan 2022 12:16:17 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::636 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643056556104100001 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=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- .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 --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16430560884624.0539471597438705; Mon, 24 Jan 2022 12:28:08 -0800 (PST) Received: from localhost ([::1]:38150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC5wc-00041C-P0 for importer@patchew.org; Mon, 24 Jan 2022 15:28:06 -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) 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) 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-Google-Smtp-Source: ABdhPJzPLiA9Dnx9kGzaCY4sX+NQua31G9wTMTXTkrrxTrGrVF4BPYPADeGr0jbE9H+xJSgaUyEggg== X-Received: by 2002:a17:907:72d2:: with SMTP id du18mr5821491ejc.524.1643055379049; Mon, 24 Jan 2022 12:16:19 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::635 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20P=20=2E=20Berrang=C3=A9?= , aaron@os.amperecomputing.com, robhenry@microsoft.com, =?UTF-8?q?Philippe=20Mathieu-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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643056090189100001 From: Philippe Mathieu-Daud=C3=A9 lcitool is used by build test / automation, we want maintainers to get notified if the submodule is updated. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e 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 --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643056416310411.777240687425; Mon, 24 Jan 2022 12:33:36 -0800 (PST) Received: from localhost ([::1]:52724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC61v-0005J7-87 for importer@patchew.org; Mon, 24 Jan 2022 15:33:35 -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) 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) 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-Google-Smtp-Source: ABdhPJy7p7ViqCfxLEm7XSfPFEwVBTOjVWhui7bEKastWHS1SnSF8QuN03rjjNZw9Wu5wLpfq0+y4Q== X-Received: by 2002:a17:907:3e96:: with SMTP id hs22mr5111052ejc.640.1643055383193; Mon, 24 Jan 2022 12:16:23 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::631 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20P=20=2E=20Berrang=C3=A9?= , aaron@os.amperecomputing.com, robhenry@microsoft.com, =?UTF-8?q?Philippe=20Mathieu-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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643056417443100001 From: Philippe Mathieu-Daud=C3=A9 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 mani= fests") Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e 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 =3D https://gitlab.com/qemu-project/vbootrom.git [submodule "tests/lcitool/libvirt-ci"] path =3D tests/lcitool/libvirt-ci - url =3D http://gitlab.com/libvirt/libvirt-ci + url =3D https://gitlab.com/libvirt/libvirt-ci.git --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643055886159392.4741602789245; Mon, 24 Jan 2022 12:24:46 -0800 (PST) Received: from localhost ([::1]:57710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC5tN-0006cZ-9m for importer@patchew.org; Mon, 24 Jan 2022 15:24:45 -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) 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) 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-Google-Smtp-Source: ABdhPJxe98PdPu1oENm8/J8iEF76FTALsZc135hhJVuCBWdAGXSzRsblaqFVbTTUHK/rC3gY8qNn8g== X-Received: by 2002:a17:906:7306:: with SMTP id di6mr13410799ejc.255.1643055380031; Mon, 24 Jan 2022 12:16:20 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::629 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20P=20=2E=20Berrang=C3=A9?= , Beraldo Leal , aaron@os.amperecomputing.com, robhenry@microsoft.com, =?UTF-8?q?Philippe=20Mathieu-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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643055889098100001 From: Philippe Mathieu-Daud=C3=A9 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 lcit= ool") Reported-by: Daniel P. Berrang=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e 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=3DNone, trail= er=3DNone): =20 def generate_cirrus(target, trailer=3DNone): filename =3D Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars") - cmd =3D [lcitool_path, "variables", target, "qemu"] + cmd =3D lcitool_cmd + ["variables", target, "qemu"] generate(filename, cmd, trailer) =20 ubuntu1804_skipssh =3D [ --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643056738177935.875118675824; Mon, 24 Jan 2022 12:38:58 -0800 (PST) Received: from localhost ([::1]:37604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC677-0005jP-Am for importer@patchew.org; Mon, 24 Jan 2022 15:38:57 -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) 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) 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-Google-Smtp-Source: ABdhPJxxvGH9Sn5GXpTTs3YtXWVqnRSIrqoq5S4oYFGWE784yNPTcPsRVcegPmdm1y99/aX/lkVtqw== X-Received: by 2002:a17:907:968c:: with SMTP id hd12mr13535625ejc.639.1643055382241; Mon, 24 Jan 2022 12:16:22 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62c (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Mathieu-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=20Benn=C3=A9e?= , Beraldo Leal Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643056741615100005 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=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: Updated description and adapted to use lcitool] Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e 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_blo= ck required: get_option('linux_io_uring'), method: 'pkg-config', kwargs: static_kwargs) endif -libxml2 =3D not_found -if not get_option('libxml2').auto() or have_block - libxml2 =3D dependency('libxml-2.0', required: get_option('libxml2'), - method: 'pkg-config', kwargs: static_kwargs) -endif libnfs =3D not_found if not get_option('libnfs').auto() or have_block libnfs =3D dependency('libnfs', version: '>=3D1.9.3', @@ -3491,7 +3486,6 @@ summary_info +=3D {'bzip2 support': libbzip2} summary_info +=3D {'lzfse support': liblzfse} summary_info +=3D {'zstd support': zstd} summary_info +=3D {'NUMA host support': config_host.has_key('CONFIG_NUMA')} -summary_info +=3D {'libxml2': libxml2} summary_info +=3D {'capstone': capstone_opt =3D=3D 'internal' ? c= apstone_opt : capstone} summary_info +=3D {'libpmem support': libpmem} summary_info +=3D {'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', 'para= llels-ext.c')) block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-a= io.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 =3D ( 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/o= rg.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-sca= n/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-bzi= p2 \ --enable-numa --enable-rdma --enable-smartcard --enable-virglrenderer \ - --enable-mpath --enable-libxml2 --enable-glusterfs \ + --enable-mpath --enable-glusterfs \ --enable-virtfs --enable-zstd =20 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 for= mat' 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=3Ddisabled ;; --enable-libusb) printf "%s" -Dlibusb=3Denabled ;; --disable-libusb) printf "%s" -Dlibusb=3Ddisabled ;; - --enable-libxml2) printf "%s" -Dlibxml2=3Denabled ;; - --disable-libxml2) printf "%s" -Dlibxml2=3Ddisabled ;; --enable-linux-aio) printf "%s" -Dlinux_aio=3Denabled ;; --disable-linux-aio) printf "%s" -Dlinux_aio=3Ddisabled ;; --enable-linux-io-uring) printf "%s" -Dlinux_io_uring=3Denabled ;; --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643057101638910.9457017328816; Mon, 24 Jan 2022 12:45:01 -0800 (PST) Received: from localhost ([::1]:49062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6Cy-0005Je-Ig for importer@patchew.org; Mon, 24 Jan 2022 15:45:00 -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) 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) 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-Google-Smtp-Source: ABdhPJxMcCFF2L0riNmuDeALAtvq7C/fpxCRo/Oy4m5/ADEiOuXhtE1OKrmXoS1bE5OgLz63q4RzQw== X-Received: by 2002:a17:906:6a90:: with SMTP id p16mr13381832ejr.115.1643055388759; Mon, 24 Jan 2022 12:16:28 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::631 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20P=20=2E=20Berrang=C3=A9?= , Beraldo Leal , aaron@os.amperecomputing.com, robhenry@microsoft.com, =?UTF-8?q?Philippe=20Mathieu-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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643057104119100001 From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e 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/free= bsd-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=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' -PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gs= ed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libs= sh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p= 5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py3= 8-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio s= dl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrender= er vte3 zstd' +PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gm= ake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspic= e-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv p5-Tes= t-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sph= inx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 s= dl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vt= e3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/free= bsd-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=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' -PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gs= ed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libs= sh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p= 5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py3= 8-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio s= dl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrender= er vte3 zstd' +PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gm= ake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspic= e-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv p5-Tes= t-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sph= inx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 s= dl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vt= e3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/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=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'brew' PIP3=3D'/usr/local/bin/pip3' -PKGS=3D'bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils = dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepox= y libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb l= ibxml2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config pyth= on3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo= usbredir vde vte3 zlib zstd' +PKGS=3D'bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils = dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepox= y libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb l= lvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2= cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredi= r vde vte3 zlib zstd' PYPI_PKGS=3D'PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv' PYTHON=3D'/usr/local/bin/python3' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/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 =20 @@ -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/dockerf= iles/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 =20 @@ -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/dockerfi= les/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 =20 @@ -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/d= ockerfiles/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 =20 @@ -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/dock= erfiles/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 =20 @@ -89,7 +89,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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/dock= erfiles/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 =20 @@ -91,7 +91,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ 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 --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643056956794912.4369520769027; Mon, 24 Jan 2022 12:42:36 -0800 (PST) Received: from localhost ([::1]:42834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6Ad-00016t-J7 for importer@patchew.org; Mon, 24 Jan 2022 15:42:35 -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) 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) 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-Google-Smtp-Source: ABdhPJxvtybvWI6FB0nr4XXpQSSTn2FyslTJ87M8MZD+DMYuXqnds20x2r6/3VvAiDZ9Qb+9VYztXQ== X-Received: by 2002:a05:6402:483:: with SMTP id k3mr17134238edv.323.1643055386167; Mon, 24 Jan 2022 12:16:26 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52d (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20P=20=2E=20Berrang=C3=A9?= , Beraldo Leal , aaron@os.amperecomputing.com, robhenry@microsoft.com, =?UTF-8?q?Philippe=20Mathieu-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=20Benn=C3=A9e?= , Li-Wen Hsu , Yonggang Luo Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643056958230100005 From: Philippe Mathieu-Daud=C3=A9 lcitool doesn't support MSYS2 targets, so manually remove this now unnecessary library. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e 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 --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164305757965832.56042511409919; Mon, 24 Jan 2022 12:52:59 -0800 (PST) Received: from localhost ([::1]:32918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6Kg-0005Lk-Te for importer@patchew.org; Mon, 24 Jan 2022 15:52:58 -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) 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) 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-Google-Smtp-Source: ABdhPJzNB5C4D+6dYP6uQvib2+fPz4gs8b+rfH3KLQNgSyDXJqamSKqZ3CjogyXrwd/JfyFv7T6a0g== X-Received: by 2002:a05:6402:483:: with SMTP id k3mr17134491edv.323.1643055391818; Mon, 24 Jan 2022 12:16:31 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::534 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20P=20=2E=20Berrang=C3=A9?= , Beraldo Leal , aaron@os.amperecomputing.com, robhenry@microsoft.com, =?UTF-8?q?Philippe=20Mathieu-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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643057582142100002 From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e 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/dock= erfiles/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=3Dnoninteractive && \ 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/dock= erfiles/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=3Dnoninteractive && \ 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 --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643056562694564.0680936399057; Mon, 24 Jan 2022 12:36:02 -0800 (PST) Received: from localhost ([::1]:59196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC64H-0001Cl-W6 for importer@patchew.org; Mon, 24 Jan 2022 15:36:02 -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) 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) 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-Google-Smtp-Source: ABdhPJxMuv3LVq/HcucWOBqQarYYXRtsTc6Cf1O6cCdUFZ6u8ZR1xmrw8CivcRk8/DCJ5cQD9HmRZA== X-Received: by 2002:a05:6402:13c6:: with SMTP id a6mr17349902edx.222.1643055386811; Mon, 24 Jan 2022 12:16:26 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52e (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= , "open list:ARM TCG CPUs" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643056564194100001 Signed-off-by: Alex Benn=C3=A9e 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 =3D 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 =3D (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 =3D (uint64_t)udata; + qemu_logf("PC 0x%" PRIx64 " accessed memory at 0x%" PRIx64 "\n", pc, v= a); +} + +static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) +{ + size_t n =3D qemu_plugin_tb_n_insns(tb); + + for (size_t i =3D 0; i < n; i++) { + struct qemu_plugin_insn *insn =3D qemu_plugin_tb_get_insn(tb, i); + uint64_t pc =3D 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_R= EGS, 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 +=3D howvec NAMES +=3D lockstep NAMES +=3D hwprofile NAMES +=3D cache +NAMES +=3D stxp-plugin =20 SONAMES :=3D $(addsuffix .so,$(addprefix lib,$(NAMES))) =20 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 =20 endif =20 +# Load/Store exclusive test +AARCH64_TESTS +=3D stxp + TESTS +=3D $(AARCH64_TESTS) --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643057676172406.09354343250334; Mon, 24 Jan 2022 12:54:36 -0800 (PST) Received: from localhost ([::1]:35564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6MF-0007D2-1B for importer@patchew.org; Mon, 24 Jan 2022 15:54:35 -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) 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) 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-Google-Smtp-Source: ABdhPJz9cESxO8IdToGEBrWCXKAZwJupyfyrxMSKLXMXlxAlLGNXQ/KKFKm08uO3zTcJjd8n8Putxw== X-Received: by 2002:a05:6402:1c94:: with SMTP id cy20mr14308418edb.154.1643055785754; Mon, 24 Jan 2022 12:23:05 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52d (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643057678354100001 Users wanting this sort of functionality should turn to TCG plugins instead. Signed-off-by: Alex Benn=C3=A9e 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 bee= n 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. =20 +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 ----------------------- =20 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; } =20 -"tcg" ------ - -Guest code generated by TCG can be traced by defining an event with the "t= cg" -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 fun= ction -will automatically call "trace__trans", and will generate the -necessary TCG code to call "trace__exec" during guest code exec= ution. - -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 f= orward -them to the "_trans" and "_exec" events. Since TCG v= alues -are not known at translation time, these are ignored by the "_t= rans" -event. Because of this, the entry in the "trace-events" file needs two pri= nting -formats (separated by a comma):: - - tcg foo(uint8_t a1, TCGv_i32 a2) "a1=3D%d", "a1=3D%d a2=3D%d" - -For example:: - - #include "trace-tcg.h" - =20 - void some_disassembly_func (...) - { - uint8_t a1 =3D ...; - TCGv_i32 a2 =3D ...; - 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" vari= able). - -The "tcg" and "vcpu" properties are currently only honored in the root -./trace-events file. - -The following example events:: - - foo(uint32_t a) "a=3D%x" - vcpu bar(uint32_t a) "a=3D%x" - tcg vcpu baz(uint32_t a) "a=3D%x", "a=3D%x" - -Can be used as:: - - #include "trace-tcg.h" - =20 - CPUArchState *env; - TCGv_ptr cpu_env; - =20 - 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 execut= ed (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=3D0xd1 - bar cpu=3D0xc1 a=3D0xd2 - baz_trans cpu=3D0xc1 a=3D0xd3 - // at guest code execution - baz_exec cpu=3D0xc2 a=3D0xd3 --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643056959496954.4079229631506; Mon, 24 Jan 2022 12:42:39 -0800 (PST) Received: from localhost ([::1]:42920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6Ag-00019u-Lr for importer@patchew.org; Mon, 24 Jan 2022 15:42:38 -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) 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) 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-Google-Smtp-Source: ABdhPJyRlymesDV+HSm+b6IWWsnUnDZ1Vzsc+SKHb5h/nTRkxEauREblS3fnP45jcSxFGDW1SM8Qhg== X-Received: by 2002:aa7:c0c9:: with SMTP id j9mr17173713edp.270.1643055389852; Mon, 24 Jan 2022 12:16:29 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52c (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643056962428100011 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=C3=A9e Reviewed-by: Richard Henderson Cc: Luis Vilanova Cc: Stefan Hajnoczi -- v2 - dropped extra line Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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_u= long addr, PAGE_READ | PAGE_WRITE, retaddr); DATA_TYPE ret; =20 - atomic_trace_rmw_pre(env, addr, oi); #if DATA_SIZE =3D=3D 16 ret =3D 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; =20 - atomic_trace_ld_pre(env, addr, oi); val =3D 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 ad= dr, ABI_TYPE val, DATA_TYPE *haddr =3D atomic_mmu_lookup(env, addr, oi, DATA_SIZE, PAGE_WRITE, retaddr); =20 - 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_ul= ong addr, ABI_TYPE val, PAGE_READ | PAGE_WRITE, retaddr); DATA_TYPE ret; =20 - atomic_trace_rmw_pre(env, addr, oi); ret =3D 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 =3D atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr);= \ DATA_TYPE ret; \ - atomic_trace_rmw_pre(env, addr, oi); \ ret =3D 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 =3D atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr)= ; \ XDATA_TYPE cmp, old, new, val =3D xval; \ - atomic_trace_rmw_pre(env, addr, oi); \ smp_mb(); \ cmp =3D 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; =20 - atomic_trace_rmw_pre(env, addr, oi); #if DATA_SIZE =3D=3D 16 ret =3D atomic16_cmpxchg(haddr, BSWAP(cmpv), BSWAP(newv)); #else @@ -236,7 +229,6 @@ ABI_TYPE ATOMIC_NAME(ld)(CPUArchState *env, target_ulon= g addr, PAGE_READ, retaddr); DATA_TYPE val; =20 - atomic_trace_ld_pre(env, addr, oi); val =3D 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 ad= dr, ABI_TYPE val, DATA_TYPE *haddr =3D atomic_mmu_lookup(env, addr, oi, DATA_SIZE, PAGE_WRITE, retaddr); =20 - atomic_trace_st_pre(env, addr, oi); val =3D BSWAP(val); atomic16_set(haddr, val); ATOMIC_MMU_CLEANUP; @@ -264,7 +255,6 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, target_ul= ong addr, ABI_TYPE val, PAGE_READ | PAGE_WRITE, retaddr); ABI_TYPE ret; =20 - atomic_trace_rmw_pre(env, addr, oi); ret =3D 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 =3D atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr);= \ DATA_TYPE ret; \ - atomic_trace_rmw_pre(env, addr, oi); \ ret =3D 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 =3D atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr)= ; \ XDATA_TYPE ldo, ldn, old, new, val =3D xval; \ - atomic_trace_rmw_pre(env, addr, oi); \ smp_mb(); \ ldn =3D 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; =20 - trace_guest_ld_before_exec(env_cpu(env), addr, oi); ret =3D 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 r= a, 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; =20 validate_memop(oi, MO_UB); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret =3D ldub_p(haddr); clear_helper_retaddr(); @@ -265,7 +264,6 @@ uint16_t cpu_ldw_be_mmu(CPUArchState *env, abi_ptr addr, uint16_t ret; =20 validate_memop(oi, MO_BEUW); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret =3D 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; =20 validate_memop(oi, MO_BEUL); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret =3D 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; =20 validate_memop(oi, MO_BEUQ); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret =3D 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; =20 validate_memop(oi, MO_LEUW); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret =3D 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; =20 validate_memop(oi, MO_LEUL); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret =3D 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; =20 validate_memop(oi, MO_LEUQ); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret =3D 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; =20 validate_memop(oi, MO_UB); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr =3D 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, ui= nt16_t val, void *haddr; =20 validate_memop(oi, MO_BEUW); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr =3D 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, ui= nt32_t val, void *haddr; =20 validate_memop(oi, MO_BEUL); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr =3D 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, ui= nt64_t val, void *haddr; =20 validate_memop(oi, MO_BEUQ); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr =3D 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, ui= nt16_t val, void *haddr; =20 validate_memop(oi, MO_LEUW); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr =3D 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, ui= nt32_t val, void *haddr; =20 validate_memop(oi, MO_LEUL); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr =3D 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, ui= nt64_t val, void *haddr; =20 validate_memop(oi, MO_LEUQ); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr =3D 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" =20 /* 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, TCG= Arg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); memop =3D tcg_canonicalize_memop(memop, 0, 0); oi =3D make_memop_idx(memop, idx); - trace_guest_ld_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); =20 orig_memop =3D 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, TCG= Arg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); memop =3D tcg_canonicalize_memop(memop, 0, 1); oi =3D make_memop_idx(memop, idx); - trace_guest_st_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); =20 if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { swap =3D tcg_temp_new_i32(); @@ -2965,7 +2962,6 @@ void tcg_gen_qemu_ld_i64(TCGv_i64 val, TCGv addr, TCG= Arg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); memop =3D tcg_canonicalize_memop(memop, 1, 0); oi =3D make_memop_idx(memop, idx); - trace_guest_ld_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); =20 orig_memop =3D 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, TCG= Arg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); memop =3D tcg_canonicalize_memop(memop, 1, 1); oi =3D make_memop_idx(memop, idx); - trace_guest_st_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); =20 if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { swap =3D 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. */ =20 -static void atomic_trace_rmw_pre(CPUArchState *env, target_ulong addr, - MemOpIdx oi) -{ - CPUState *cpu =3D 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, ta= rget_ulong addr, } =20 #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); } =20 -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) =20 -# 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=3D%d", "vadd= r=3D0x%016"PRIx64" memopidx=3D0x%x" -vcpu tcg guest_st_before(TCGv vaddr, uint32_t memopidx) "info=3D%d", "vadd= r=3D0x%016"PRIx64" memopidx=3D0x%x" -vcpu tcg guest_rmw_before(TCGv vaddr, uint32_t memopidx) "info=3D%d", "vad= dr=3D0x%016"PRIx64" memopidx=3D0x%x" - # include/user/syscall-trace.h =20 # @num: System call number. --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643056164233898.5432204695109; Mon, 24 Jan 2022 12:29:24 -0800 (PST) Received: from localhost ([::1]:43886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC5xr-0007o4-FS for importer@patchew.org; Mon, 24 Jan 2022 15:29:23 -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) 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) 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-Google-Smtp-Source: ABdhPJwJ59XNoGe2rLuRp+SmnnHaQMh4qo/a4ZGwPboPQv5U0c/dextn9jkthz3Qc2hXp5hGTJpH+A== X-Received: by 2002:a17:907:2704:: with SMTP id w4mr13625585ejk.134.1643055784125; Mon, 24 Jan 2022 12:23:04 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62d (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643056167699100005 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Cc: Luis Vilanova Cc: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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), d= h_ctype(t3), \ #define IN_HELPER_PROTO =20 #include "helper.h" -#include "trace/generated-helpers.h" #include "accel/tcg/tcg-runtime.h" #include "accel/tcg/plugin-helpers.h" =20 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) }, =20 #include "helper.h" -#include "trace/generated-helpers.h" #include "accel/tcg/tcg-runtime.h" #include "accel/tcg/plugin-helpers.h" =20 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 =3D custom_target('trace-events-all', install_dir: qemu_datadir) =20 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'], --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643057883736964.4521551134229; Mon, 24 Jan 2022 12:58:03 -0800 (PST) Received: from localhost ([::1]:38558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6Pa-00012Z-Tm for importer@patchew.org; Mon, 24 Jan 2022 15:58:02 -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) 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) 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-Google-Smtp-Source: ABdhPJzRvdLApLtE47veYZ8V7sPOLA3MiBzHa7WcUj3cWz0j0SMX2zXNvdG+JQ8Gq2Ht/wXSLX9Lpg== X-Received: by 2002:aa7:d986:: with SMTP id u6mr17274399eds.339.1643055786415; Mon, 24 Jan 2022 12:23:06 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::533 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643057887355100005 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=C3=A9e 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 =3D 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) \ } =20 #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" =20 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", ] =20 def validate_type(name): @@ -232,7 +230,7 @@ class Event(object): "(?:(?:(?P\".+),)?\s*(?P\".+))?" "\s*") =20 - _VALID_PROPS =3D set(["disable", "tcg", "tcg-trans", "tcg-exec", "vcpu= "]) + _VALID_PROPS =3D set(["disable", "vcpu"]) =20 def __init__(self, name, props, fmt, args, lineno, filename, orig=3DNo= ne, event_trans=3DNone, event_exec=3DNone): @@ -321,15 +319,6 @@ def build(line_str, lineno, filename): fmt =3D [fmt_trans, fmt] args =3D Arguments.build(groups["args"]) =20 - 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 for= mat strings") - event =3D Event(name, props, fmt, args, lineno, filename) =20 # add implicit arguments when using the 'vcpu' property @@ -409,33 +398,7 @@ def read_events(fobj, fname): e.args =3D (arg0,) + e.args[1:] raise =20 - # transform TCG-enabled events - if "tcg" not in event.properties: - events.append(event) - else: - event_trans =3D event.copy() - event_trans.name +=3D "_trans" - event_trans.properties +=3D ["tcg-trans"] - event_trans.fmt =3D event.fmt[0] - # ignore TCG arguments - args_trans =3D [] - for atrans, aorig in zip( - event_trans.transform(tracetool.transform.TCG_2_HOST).= args, - event.args): - if atrans =3D=3D aorig: - args_trans.append(atrans) - event_trans.args =3D Arguments(args_trans) - - event_exec =3D event.copy() - event_exec.name +=3D "_exec" - event_exec.properties +=3D ["tcg-exec"] - event_exec.fmt =3D event.fmt[1] - event_exec.args =3D event_exec.args.transform(tracetool.transf= orm.TCG_2_HOST) - - new_event =3D [event_trans, event_exec] - event.event_trans, event.event_exec =3D new_event - - events.extend(new_event) + events.append(event) =20 return events =20 diff --git a/scripts/tracetool/format/tcg_h.py b/scripts/tracetool/format/t= cg_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__ =3D "Llu=C3=ADs Vilanova " -__copyright__ =3D "Copyright 2012-2017, Llu=C3=ADs Vilanova " -__license__ =3D "GPL version 2 or (at your option) any later version" - -__maintainer__ =3D "Stefan Hajnoczi" -__email__ =3D "stefanha@redhat.com" - - -from tracetool import out, Arguments -import tracetool.vcpu - - -def vcpu_transform_args(args): - assert len(args) =3D=3D 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 =3D=3D "root": - header =3D "trace/trace-root.h" - else: - header =3D "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=3De.original.api(e.QEMU_TRACE_TCG), - args=3Dtracetool.vcpu.transform_args("tcg_h", e.original)) - - if "disable" not in e.properties: - args_trans =3D e.original.event_trans.args - args_exec =3D tracetool.vcpu.transform_args( - "tcg_helper_c", e.original.event_exec, "wrapper") - if "vcpu" in e.properties: - trace_cpu =3D e.args.names()[0] - cond =3D "trace_event_get_vcpu_state(%(cpu)s,"\ - " TRACE_%(id)s)"\ - % dict( - cpu=3Dtrace_cpu, - id=3De.original.event_exec.name.upper()) - else: - cond =3D "true" - - out(' %(name_trans)s(%(argnames_trans)s);', - ' if (%(cond)s) {', - ' gen_helper_%(name_exec)s(%(argnames_exec)s);', - ' }', - name_trans=3De.original.event_trans.api(e.QEMU_TRACE), - name_exec=3De.original.event_exec.api(e.QEMU_TRACE), - argnames_trans=3D", ".join(args_trans.names()), - argnames_exec=3D", ".join(args_exec.names()), - cond=3Dcond) - - out('}') - - out('', - '#endif /* TRACE_%s_GENERATED_TCG_TRACERS_H */' % group.upper()) diff --git a/scripts/tracetool/format/tcg_helper_c.py b/scripts/tracetool/f= ormat/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__ =3D "Llu=C3=ADs Vilanova " -__copyright__ =3D "Copyright 2012-2017, Llu=C3=ADs Vilanova " -__license__ =3D "GPL version 2 or (at your option) any later version" - -__maintainer__ =3D "Stefan Hajnoczi" -__email__ =3D "stefanha@redhat.com" - - -from tracetool import Arguments, out -from tracetool.transform import * -import tracetool.vcpu - - -def vcpu_transform_args(args, mode): - assert len(args) =3D=3D 1 - # NOTE: this name must be kept in sync with the one in "tcg_h" - args =3D Arguments([(args.types()[0], "__tcg_" + args.names()[0])]) - if mode =3D=3D "code": - return Arguments([ - # Does cast from helper requirements to tracing types - ("CPUState *", "env_cpu(%s)" % args.names()[0]), - ]) - else: - args =3D Arguments([ - # NOTE: Current helper code uses TCGv_env (CPUArchState*) - ("CPUArchState *", args.names()[0]), - ]) - if mode =3D=3D "header": - return args - elif mode =3D=3D "wrapper": - return args.transform(HOST_2_TCG) - else: - assert False - - -def generate(events, backend, group): - if group =3D=3D "root": - header =3D "trace/trace-root.h" - else: - header =3D "trace.h" - - events =3D [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 =3D tracetool.vcpu.transform_args( - "tcg_helper_c", e.original, "header").transform( - HOST_2_TCG_COMPAT, TCG_2_TCG_HELPER_DEF) - e_args_call =3D 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=3D"helper_%s_proxy" % e.api(), - name=3De.api(e.QEMU_TRACE_NOCHECK), - args_api=3De_args_api, - args_call=3D", ".join(e_args_call.casted()), - ) diff --git a/scripts/tracetool/format/tcg_helper_h.py b/scripts/tracetool/f= ormat/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__ =3D "Llu=C3=ADs Vilanova " -__copyright__ =3D "Copyright 2012-2016, Llu=C3=ADs Vilanova " -__license__ =3D "GPL version 2 or (at your option) any later version" - -__maintainer__ =3D "Stefan Hajnoczi" -__email__ =3D "stefanha@redhat.com" - - -from tracetool import out -from tracetool.transform import * -import tracetool.vcpu - - -def generate(events, backend, group): - events =3D [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 =3D "DEF_HELPER_FLAGS_%(argc)d(%(name)s, %(flags)svoid%(types)= s)" - e_args =3D tracetool.vcpu.transform_args("tcg_helper_c", e.origina= l, "header") - args =3D e_args.transform(HOST_2_TCG_COMPAT, HOST_2_TCG, - TCG_2_TCG_HELPER_DECL) - types =3D ", ".join(args.types()) - if types !=3D "": - types =3D ", " + types - - flags =3D "TCG_CALL_NO_RWG, " - - out(fmt, - flags=3Dflags, - argc=3Dlen(args), - name=3De.api() + "_proxy", - types=3Dtypes, - ) diff --git a/scripts/tracetool/format/tcg_helper_wrapper_h.py b/scripts/tra= cetool/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__ =3D "Llu=C3=ADs Vilanova " -__copyright__ =3D "Copyright 2012-2016, Llu=C3=ADs Vilanova " -__license__ =3D "GPL version 2 or (at your option) any later version" - -__maintainer__ =3D "Stefan Hajnoczi" -__email__ =3D "stefanha@redhat.com" - - -from tracetool import out -from tracetool.transform import * -import tracetool.vcpu - - -def generate(events, backend, group): - events =3D [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 =3D tracetool.vcpu.transform_args("tcg_helper_c", e.origina= l, "wrapper") - - # mixed-type to TCG helper bridge - args_tcg_compat =3D e_args.transform(HOST_2_TCG_COMPAT) - - code_new =3D [ - "%(tcg_type)s __%(name)s =3D %(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 =3D [ - "%(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 =3D "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=3Dgen_name, - args=3De_args, - proxy_name=3Dgen_name + "_proxy", - code_new=3D"\n ".join(code_new), - code_free=3D"\n ".join(code_free), - tmp_names=3D", ".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 =3D Arguments([("void *", "__cpu"), event.args]) - if "tcg" in event.properties: - fmt =3D "\"cpu=3D%p \"" - event.fmt =3D [fmt + event.fmt[0], - fmt + event.fmt[1]] - else: - fmt =3D "\"cpu=3D%p \"" - event.fmt =3D fmt + event.fmt + fmt =3D "\"cpu=3D%p \"" + event.fmt =3D fmt + event.fmt return event =20 =20 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 =3D custom_target('trace-events-all', install: true, install_dir: qemu_datadir) =20 -foreach d : [ - ['generated-helpers.c', 'tcg-helper-c'], - ['generated-helpers.h', 'tcg-helper-h'], - ['generated-helpers-wrappers.h', 'tcg-helper-wrapper-h'], -] - gen =3D custom_target(d[0], - output: d[0], - input: meson.project_source_root() / 'trace-events', - command: [ tracetool, '--group=3Droot', '--format=3D@0@'.f= ormat(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 =3D custom_target('trace-ust-all.h', output: 'trace-ust-all.h', --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643057147219130.8177107888506; Mon, 24 Jan 2022 12:45:47 -0800 (PST) Received: from localhost ([::1]:49302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6Di-0005T2-DT for importer@patchew.org; Mon, 24 Jan 2022 15:45:46 -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) 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) 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-Google-Smtp-Source: ABdhPJyBwvP/a7qyznqUnopqNGQgz3MVUw0uiB0VtRCoogFvJj3onTy2D8HyQ08ec+p57YajNJmUxQ== X-Received: by 2002:a17:906:4785:: with SMTP id cw5mr8338734ejc.406.1643055394332; Mon, 24 Jan 2022 12:16:34 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::636 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643057150039100001 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-Produc= t-Name> [AJB: reword title, better descriptions, defaults, rm export, fix include] Signed-off-by: Alex Benn=C3=A9e --- 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); =20 +/** + * 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 =20 /* Uninstall and Reset handlers */ @@ -391,3 +394,46 @@ bool qemu_plugin_bool_parse(const char *name, const ch= ar *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 =3D NULL; +#ifdef CONFIG_USER_ONLY + TaskState *ts =3D (TaskState *) current_cpu->opaque; + path =3D g_strdup(ts->bprm->filename); +#endif + return path; +} + +uint64_t qemu_plugin_start_code(void) +{ + uint64_t start =3D 0; +#ifdef CONFIG_USER_ONLY + TaskState *ts =3D (TaskState *) current_cpu->opaque; + start =3D ts->info->start_code; +#endif + return start; +} + +uint64_t qemu_plugin_end_code(void) +{ + uint64_t end =3D 0; +#ifdef CONFIG_USER_ONLY + TaskState *ts =3D (TaskState *) current_cpu->opaque; + end =3D ts->info->end_code; +#endif + return end; +} + +uint64_t qemu_plugin_entry_code(void) +{ + uint64_t entry =3D 0; +#ifdef CONFIG_USER_ONLY + TaskState *ts =3D (TaskState *) current_cpu->opaque; + entry =3D 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; --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643057965317137.81210818545242; Mon, 24 Jan 2022 12:59:25 -0800 (PST) Received: from localhost ([::1]:40936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6Qu-0002iL-4c for importer@patchew.org; Mon, 24 Jan 2022 15:59:24 -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) 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) 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-Google-Smtp-Source: ABdhPJzVRcMvcQISBLW6Np+8/QR/b+gJ0+PoxFRyZnflmL/FM2wu9ttdlgJ0YU3xnbilm+yzFLnA/A== X-Received: by 2002:a05:6402:230e:: with SMTP id l14mr17299621eda.370.1643055791270; Mon, 24 Jan 2022 12:23:11 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643057968014100001 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-Produ= ct-Name> [AJB: use g_ptr_array instead of slist] Signed-off-by: Alex Benn=C3=A9e --- 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 =3D QEMU_PLUGIN_VERSION; + +static char header[] =3D "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 =3D "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 =3D qemu_plugin_path_to_binary(); + uint64_t start_code =3D qemu_plugin_start_code(); + uint64_t end_code =3D qemu_plugin_end_code(); + uint64_t entry =3D 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 =3D (const uint8_t *)(&data); + fwrite(bytes, sizeof(char), sizeof(data), fp); +} + +static void printf_char_array16(uint16_t data) +{ + const uint8_t *bytes =3D (const uint8_t *)(&data); + fwrite(bytes, sizeof(char), sizeof(data), fp); +} + + +static void printf_el(gpointer data, gpointer user_data) +{ + bb_entry_t *bb =3D (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 =3D (unsigned long *) user_data; + bb_entry_t *bb =3D (bb_entry_t *)data; + if (bb->exec) { + *count =3D *count + 1; + } +} + +static void plugin_exit(qemu_plugin_id_t id, void *p) +{ + unsigned long count =3D 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 =3D fopen(file_name, "wb"); + blocks =3D g_ptr_array_sized_new(128); +} + +static void vcpu_tb_exec(unsigned int cpu_index, void *udata) +{ + bb_entry_t *bb =3D (bb_entry_t *) udata; + + g_mutex_lock(&lock); + bb->exec =3D true; + g_mutex_unlock(&lock); +} + +static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) +{ + uint64_t pc =3D qemu_plugin_tb_vaddr(tb); + size_t n =3D qemu_plugin_tb_n_insns(tb); + + g_mutex_lock(&lock); + + bb_entry_t *bb =3D g_new0(bb_entry_t, 1); + for (int i =3D 0; i < n; i++) { + bb->size +=3D qemu_plugin_insn_size(qemu_plugin_tb_get_insn(tb, i)= ); + } + + bb->start =3D pc; + bb->mod_id =3D 0; + bb->exec =3D 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 =3D 0; i < argc; i++) { + g_autofree char **tokens =3D g_strsplit(argv[i], "=3D", 2); + if (g_strcmp0(tokens[0], "filename") =3D=3D 0) { + file_name =3D 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 +=3D lockstep NAMES +=3D hwprofile NAMES +=3D cache NAMES +=3D stxp-plugin +NAMES +=3D drcov =20 SONAMES :=3D $(addsuffix .so,$(addprefix lib,$(NAMES))) =20 --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643057326356124.88643785707359; Mon, 24 Jan 2022 12:48:46 -0800 (PST) Received: from localhost ([::1]:55448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6Gb-0001NI-Ki for importer@patchew.org; Mon, 24 Jan 2022 15:48:45 -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) 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) 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-Google-Smtp-Source: ABdhPJwnph9iQcxLX4U9fM7JNzLz3587LND1vDGIk2jIa708npM4fRs3tQCeryq65w1/e1MHILDK1w== X-Received: by 2002:a17:907:2d06:: with SMTP id gs6mr4361974ejc.765.1643055783444; Mon, 24 Jan 2022 12:23:03 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62b (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643057329301100001 We won't go fully flexible but for most system emulation 8 vCPUs resolution should be enough for anybody ;-) Signed-off-by: Alex Benn=C3=A9e --- 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 @@ =20 QEMU_PLUGIN_EXPORT int qemu_plugin_version =3D QEMU_PLUGIN_VERSION; =20 -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; =20 static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata) { - static uint64_t last_pc; + unsigned int i =3D cpu_index % MAX_CPUS; + InstructionCount *c =3D &counts[i]; uint64_t this_pc =3D GPOINTER_TO_UINT(udata); - if (this_pc =3D=3D last_pc) { + if (this_pc =3D=3D c->last_pc) { g_autofree gchar *out =3D g_strdup_printf("detected repeat executi= on @ 0x%" PRIx64 "\n", this_pc); qemu_plugin_outs(out); } - last_pc =3D this_pc; - insn_count++; + c->last_pc =3D this_pc; + c->insn_count++; } =20 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 qem= u_plugin_tb *tb) =20 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 =3D 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 qem= u_plugin_tb *tb) static void plugin_exit(qemu_plugin_id_t id, void *p) { g_autoptr(GString) out =3D g_string_new(NULL); + int i; =20 if (do_size) { - int i; for (i =3D 0; i <=3D sizes->len; i++) { unsigned long *cnt =3D &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, *cn= t); } } + } else if (do_inline) { + g_string_append_printf(out, "insns: %" PRIu64 "\n", inline_insn_co= unt); } else { - g_string_append_printf(out, "insns: %" PRIu64 "\n", insn_count); + uint64_t total_insns =3D 0; + for (i =3D 0; i < MAX_CPUS; i++) { + InstructionCount *c =3D &counts[i]; + if (c->insn_count) { + g_string_append_printf(out, "cpu %d insns: %" PRIu64 "\n", + i, c->insn_count); + total_insns +=3D c->insn_count; + } + } + g_string_append_printf(out, "total insns: %" PRIu64 "\n", + total_insns); } qemu_plugin_outs(out->str); } --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643056330649159.123052362125; Mon, 24 Jan 2022 12:32:10 -0800 (PST) Received: from localhost ([::1]:48410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC60X-0002S4-UY for importer@patchew.org; Mon, 24 Jan 2022 15:32:09 -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) 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) 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-Google-Smtp-Source: ABdhPJwVBvgClHEx40fErAZGz3P8D9+DFnny1P+AHmAanPNbmI5W5qMgbr7p4Kuk715K+VgUD5pghA== X-Received: by 2002:a05:6402:1604:: with SMTP id f4mr17387585edv.352.1643055780801; Mon, 24 Jan 2022 12:23:00 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::533 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643056332877100001 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=3Dtlbi which leads to output like this: 0xffffffc01018fa00, tlbi aside1is, x0, 339, 32774 match hits, 23822 sinc= e last, avg 47279 0xffffffc01018fa00, tlbi aside1is, x0, 340, 32775 match hits, 565051 sin= ce 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 la= st, avg 47297 0xffffffc010194a44, tlbi vale1is, x1, 8835, 32778 match hits, 52027 sinc= e 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 sinc= e 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=C3=A9e --- 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; =20 static bool do_inline; static bool do_size; -static bool do_frequency; static GArray *sizes; =20 +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 =3D cpu_index % MAX_CPUS; @@ -45,6 +61,36 @@ static void vcpu_insn_exec_before(unsigned int cpu_index= , void *udata) c->insn_count++; } =20 +static void vcpu_insn_matched_exec_before(unsigned int cpu_index, void *ud= ata) +{ + unsigned int i =3D cpu_index % MAX_CPUS; + Instruction *insn =3D (Instruction *) udata; + Match *match =3D insn->match; + g_autoptr(GString) ts =3D g_string_new(""); + + insn->hits++; + g_string_append_printf(ts, "0x%" PRIx64 ", %s, % "PRId64, + insn->vaddr, insn->disas, insn->hits); + + uint64_t icount =3D counts[i].insn_count; + uint64_t delta =3D icount - match->last_hit[i]; + + match->hits[i]++; + match->total_delta[i] +=3D 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] =3D 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 =3D qemu_plugin_tb_n_insns(tb); @@ -71,6 +117,29 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct q= emu_plugin_tb *tb) unsigned long *cnt =3D &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 =3D qemu_plugin_insn_disas(insn); + int j; + for (j =3D 0; j < matches->len; j++) { + Match *m =3D &g_array_index(matches, Match, j); + if (g_str_has_prefix(insn_disas, m->match_string)) { + Instruction *rec =3D g_new0(Instruction, 1); + rec->disas =3D g_strdup(insn_disas); + rec->vaddr =3D qemu_plugin_insn_vaddr(insn); + rec->match =3D m; + qemu_plugin_register_vcpu_insn_exec_cb( + insn, vcpu_insn_matched_exec_before, + QEMU_PLUGIN_CB_NO_REGS, rec); + } + } + g_free(insn_disas); + } } } =20 @@ -105,6 +174,21 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) qemu_plugin_outs(out->str); } =20 + +/* Add a match to the array of matches */ +static void parse_match(char *match) +{ + Match new_match =3D { .match_string =3D match }; + int i; + for (i =3D 0; i < MAX_CPUS; i++) { + new_match.history[i] =3D g_ptr_array_new(); + } + if (!matches) { + matches =3D 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", o= pt); return -1; } + } else if (g_strcmp0(tokens[0], "match") =3D=3D 0) { + parse_match(tokens[1]); } else { fprintf(stderr, "option parsing failed: %s\n", opt); return -1; --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643057357888917.5274721487044; Mon, 24 Jan 2022 12:49:17 -0800 (PST) Received: from localhost ([::1]:56364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC6H6-0001zD-Ud for importer@patchew.org; Mon, 24 Jan 2022 15:49:16 -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) 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) 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-Google-Smtp-Source: ABdhPJze9w6icK0txIOrs9/qYY73TZHBVoKyoNX0RtvEjSqE8StZ1E7fXDhDR79ZdTkvtSLCnMTyww== X-Received: by 2002:a17:907:2d0c:: with SMTP id gs12mr7551646ejc.165.1643055392742; Mon, 24 Jan 2022 12:16:32 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::635 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643057361052100003 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=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 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/s= eg_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 &=3D ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_VIRQ); intno =3D cpu_get_pic_interrupt(env); - qemu_log_mask(CPU_LOG_TB_IN_ASM, + qemu_log_mask(CPU_LOG_INT, "Servicing hardware INT=3D0x%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 =3D 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=3D0x%02x\n", intno); do_interrupt_x86_hardirq(env, intno, 1); cs->interrupt_request &=3D ~CPU_INTERRUPT_VIRQ; --=20 2.30.2 From nobody Sun May 5 16:31:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643056457679642.8946498983549; Mon, 24 Jan 2022 12:34:17 -0800 (PST) Received: from localhost ([::1]:55004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC62a-0006qH-S0 for importer@patchew.org; Mon, 24 Jan 2022 15:34:16 -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) 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) 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-Google-Smtp-Source: ABdhPJyppBA3AU+t1rwRJbKGUAPJPiZyhlsqUdLxxHx7iWYAHC+zLQ1ifhWqQw45SgidI0YV7RTFuw== X-Received: by 2002:a05:6402:4383:: with SMTP id o3mr5045113edc.353.1643055789055; Mon, 24 Jan 2022 12:23:09 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::536 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643056460371100002 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=C3=A9e --- 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_plugi= n_tb *plugin_tb) =20 bool plugin_gen_tb_start(CPUState *cpu, const TranslationBlock *tb, bool m= em_only) { - struct qemu_plugin_tb *ptb =3D tcg_ctx->plugin_tb; bool ret =3D false; =20 if (test_bit(QEMU_PLUGIN_EV_VCPU_TB_TRANS, cpu->plugin_mask)) { + struct qemu_plugin_tb *ptb =3D tcg_ctx->plugin_tb; + int i; + + /* reset callbacks */ + for (i =3D 0; i < PLUGIN_N_CB_SUBTYPES; i++) { + if (ptb->cbs[i]) { + g_array_set_size(ptb->cbs[i], 0); + } + } + ptb->n =3D 0; + tcg_ctx->plugin_insn =3D NULL; + ret =3D true; =20 ptb->vaddr =3D tb->pc; @@ -904,23 +915,19 @@ void plugin_gen_insn_end(void) plugin_gen_empty_callback(PLUGIN_GEN_AFTER_INSN); } =20 +/* + * 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 =3D tcg_ctx->plugin_tb; - int i; =20 /* collect instrumentation requests */ qemu_plugin_tb_trans_cb(cpu, ptb); =20 /* inject the instrumentation at the appropriate places */ plugin_gen_inject(ptb); - - /* clean up */ - for (i =3D 0; i < PLUGIN_N_CB_SUBTYPES; i++) { - if (ptb->cbs[i]) { - g_array_set_size(ptb->cbs[i], 0); - } - } - ptb->n =3D 0; - tcg_ctx->plugin_insn =3D NULL; } --=20 2.30.2