From nobody Fri May 17 11:28:56 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 1643754367480350.7366914976667; Tue, 1 Feb 2022 14:26:07 -0800 (PST) Received: from localhost ([::1]:58996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF1bC-0002of-Ne for importer@patchew.org; Tue, 01 Feb 2022 17:26:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExmY-00086a-VN for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:35 -0500 Received: from [2a00:1450:4864:20::636] (port=40679 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 1nExly-0000bw-4K for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:31 -0500 Received: by mail-ej1-x636.google.com with SMTP id p15so56751707ejc.7 for ; Tue, 01 Feb 2022 10:20:53 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id ch27sm15681434edb.74.2022.02.01.10.20.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:20:51 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C1F0C1FFB8; Tue, 1 Feb 2022 18:20:50 +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=ynFU7GIrDRiFDHdJik7DGdtoBE+darFWUPkAFAGxRwg=; b=NrA9NxxT5KKMEg8zjYbMs+ttSUxuDpRHg0ZHm2bI1Z/6VGlA3plaVNAFIE68256ISt XeiqL+b42ErI4FIkkiC2ubxQcaSEB+E01FHxEy9iIUjcoNeyH7apdbEcnYBMOUlUSjWq /TdSdzpJOjuVZuOlPyhSrkGK9dZBH4qLX4QV979IX7HW+vwtAexldsDA1cJSif6MoW/N R1G5XP+TZDO5Ya8yD4wKMAXKzYwZv8jB1oAwPcPdrrOdoxROTuoUVgDqCalt/LNTLeNS y22x/itJ6au3ObxmpDVIGT2YABD2YYrQz2khB7efAWKbg6MSGVcBg6/9AE+jCme3aiT7 bnPw== 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=ynFU7GIrDRiFDHdJik7DGdtoBE+darFWUPkAFAGxRwg=; b=tca+5QRC8Pxwg0FnA/b2mzuqDcnzOcA0uweCuItj4e29/eRckRMZmdDeJh5HQqo2Pg DgOXS+K2m1IamgRKRILNF5KoSifIlqfYTvgmy3OlLiAGomt9KPtxBIHpl4hMW4X/mMXX IDJr7q4uIDJmXKeeNGSdTb9hfMwkCFaR1lYUAuZWcaPbGeetBvF/JVz/79t9HKJ8ELnH UUwO5V3r2m+D+iaANcqR6klpw7feEU1sh7sL0ZIwCemUmczZkEdrwK5dbp2BkMa2n5ny gkDlPVrIPHy35Kwz0HzuzaJP27s8lyYYW4UxQNdCB5Dy5cT0Wu0tbrq5DzBxcRmJxjOZ HZPg== X-Gm-Message-State: AOAM533nWLpaDDXjGqRHAWJOkRK3/kA86ptH6+onBwh8YA2CL5eCMf6H xp6SAlPWcprWp93GbMN0XVTvJA== X-Google-Smtp-Source: ABdhPJyzolfoyNk3wzbSdjDv1DRVN/aOwnNaaOYukV7h/Ov060GjV2ckhVPKPZXbN6L09IF/cS1Nrw== X-Received: by 2002:a17:907:6e09:: with SMTP id sd9mr18678678ejc.259.1643739652602; Tue, 01 Feb 2022 10:20:52 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 01/25] tests/Makefile.include: clean-up old code Date: Tue, 1 Feb 2022 18:20:26 +0000 Message-Id: <20220201182050.15087-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643754369486100001 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 Message-Id: <20220124201608.604599-2-alex.bennee@linaro.org> --- tests/Makefile.include | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 9157a57b1a..646c8b1334 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 Fri May 17 11:28:56 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 1643755329445488.52611048294955; Tue, 1 Feb 2022 14:42:09 -0800 (PST) Received: from localhost ([::1]:57446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF1qg-0005OK-Pf for importer@patchew.org; Tue, 01 Feb 2022 17:42:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExmZ-000877-Cq for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:35 -0500 Received: from [2a00:1450:4864:20::630] (port=36582 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 1nExlz-0000cD-Jf for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:34 -0500 Received: by mail-ej1-x630.google.com with SMTP id s13so56992724ejy.3 for ; Tue, 01 Feb 2022 10:20:58 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g27sm14807001ejf.108.2022.02.01.10.20.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:20:51 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DAF521FFBA; Tue, 1 Feb 2022 18:20:50 +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=Vu0I9U59bZWZDRHZ0y4P2PGP4T2MyrmhsrSziIlkWNs=; b=SxEZYzRnB5L1MYQvqMv6DjVFsJLIx+y84QTCtouw6B8YbuojoR/IBTWVq1EPaZQlog d+9FD42Zunv0UWtNJlAgzJBMJhPckoBk7/jeTFRiQWip7Sv2lmWnUubRS1Vwuw7t1UJE BUwySl6ktHE+d+LGFUkcmaFOYVuGX4t2X03+3UivIfzYBvEI7U6qFjpH2C7VNSIin8GN uAtcGu1DsUCx8fKxUVPNcH6CqPkWMzrVaucrryYm2LzukMuAKQa6MlI89mEFlzX7pLSd /48iB7QzB2bypOQXQeYXHmX8dChiPL38uq1gdbFv/ercXLSHAn2qf7zozC1HNRo/r5gb QHcw== 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=Vu0I9U59bZWZDRHZ0y4P2PGP4T2MyrmhsrSziIlkWNs=; b=0kzbzq6gAbaJ7XItB4GaakHeJG2SZt/JnJpPghUBUUgKQhqoVA9w29bWEvApSGH+2x nHEStBAfc3r2E2w2WOzVaxhv7EycnB7APQvB7SJEV5vxRKnW0hQsX5X9jtBqTw+ECPTP f3OU/z9v06Lxiaa7y5deMTuDE0wPkJ5PNZKs5dRlE39uX0Qm8C7TqqR6Y9EgO11jX4St qP0g/sQ9I4e/PUvAstSu7bPS4CgCD6UbxMw7M4UV23PCibWqFszHkduzQqCwqZ7TlM2D pSKQEEj5IBOLwxv7mWyl0b16MIWAwPkv1J3adlznxa7EfPH7Ld0YUw49vDqaAmPtfXma UDJQ== X-Gm-Message-State: AOAM530QgRggbsZmapaaKvXZViAw25+MR0D9MmBc7ZEuqI8Sd/dIbcBw Bq/mVqJYWClW6eulDONGZKSzww== X-Google-Smtp-Source: ABdhPJxET4oGyeHq+Rveh5PnOBCCtyWRobi7lwyh3BfGqyvtSbJmshN8BqhA8x0EbrJUeqsxo0ryGg== X-Received: by 2002:a17:906:dc8c:: with SMTP id cs12mr21494140ejc.215.1643739656053; Tue, 01 Feb 2022 10:20:56 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 02/25] tests/qtest: enable more vhost-user tests by default Date: Tue, 1 Feb 2022 18:20:27 +0000 Message-Id: <20220201182050.15087-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, Laurent Vivier , Thomas Huth , berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643755332901100001 If this starts causing failures again we should probably fix that. Signed-off-by: Alex Benn=C3=A9e Tested-by: Thomas Huth Message-Id: <20220124201608.604599-3-alex.bennee@linaro.org> --- 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 Fri May 17 11:28:56 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 1643747832400474.47878827582906; Tue, 1 Feb 2022 12:37:12 -0800 (PST) Received: from localhost ([::1]:57634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEztn-00036N-9a for importer@patchew.org; Tue, 01 Feb 2022 15:37:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExmY-00086X-Um for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:35 -0500 Received: from [2a00:1450:4864:20::635] (port=33361 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 1nExly-0000c2-4r for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:05 -0500 Received: by mail-ej1-x635.google.com with SMTP id jx6so57242486ejb.0 for ; Tue, 01 Feb 2022 10:20:54 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b12sm4981495edw.91.2022.02.01.10.20.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:20:51 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E73731FFBB; Tue, 1 Feb 2022 18:20:50 +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=jLdaq4nPs26ioB8IxHlRj4MYiTrVXXpGcD6fwPTNScM=; b=Z/+dmUlF9mVw1k3dtpJlWgPIR+IYB0Y9MIfVfJB2ekOm1TaXaNDg3qQVjMdwtkNIhp bola+DihR+HpFmOeoi78ITcAhRpv6UL8M3RWHpbj9/BD7gZW2PRGtiwHBvG3+/DsPUqM 8cnPz2zegz46HTcRWzBrjc4YsEamYC/7F8uU75H4YlZTvDgYPqhi7D0+oLHnA6Lk0aqI f7SmEzdPI9iXriREdsQwWaMQ4SNMCZRkGSxeqIoS/kI2BGob83mYlfnjsdL+8ZGGim6y 3w13JIdqpqcLDDabBrTlM4rhhS5zeNoJuu2vweUQ6vWX/1HtaUr25+XdzJcxCvUTwfBm X/Hw== 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=jLdaq4nPs26ioB8IxHlRj4MYiTrVXXpGcD6fwPTNScM=; b=2ZHinfl0+ul8pN3UF+6ibw8MNOdOHIuJJnjXwYNbIet6qle//QY3LuRetZUWlBtIPM yKX5OaCkG62zt7UWzwpYm0kApF1VF7QIjv7PpNF6dkp/Zvj+xylS6oNlZVz+gfe2LkdR 836xNYJ+nUQwZYIIyOXVnaBjqs1X1gevbMzLRK+BGmC2F+6Ts2cEmlexHuLrBCsO401s cy2vGZmD/zvIJi4vgH8eyo5lufuoHq3ENb7eMF/8y4ACk2sk3Xl7WT0JFIlGrpUZz3n0 AuaIzAzsk0k+RZz/7nLWReDcsAaVkAz3G9lCuerBIH+BhQxiRI8icc3nj7BrJO8BSUIa jtIA== X-Gm-Message-State: AOAM531NP8LMlZT3T7MOMcUU6/p1r8tVJuT6Cx/rCvbGI5xO/v+UMSuO CKNLAGvi+wPpUG0/CP1xbb/nPg== X-Google-Smtp-Source: ABdhPJzt++UVdjNJu7GOZTs0ybJXZgVnSwar9hO6v81hWvtTjEtafRT6rczff/N5dxZ9QWa5JN+log== X-Received: by 2002:a17:907:8a29:: with SMTP id sc41mr21123933ejc.312.1643739653232; Tue, 01 Feb 2022 10:20:53 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 03/25] Makefile: also remove .gcno files when cleaning Date: Tue, 1 Feb 2022 18:20:28 +0000 Message-Id: <20220201182050.15087-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643747836515100001 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 Message-Id: <20220124201608.604599-4-alex.bennee@linaro.org> --- v2 - fix whitespace damage --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index db9a788601..e5fd1ebdf6 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 Fri May 17 11:28:56 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 1643755046019483.49120944551896; Tue, 1 Feb 2022 14:37:26 -0800 (PST) Received: from localhost ([::1]:48992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF1m9-0007co-BF for importer@patchew.org; Tue, 01 Feb 2022 17:37:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExmZ-00086d-5U for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:35 -0500 Received: from [2a00:1450:4864:20::62a] (port=35380 helo=mail-ej1-x62a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExm4-0000cI-KQ for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:33 -0500 Received: by mail-ej1-x62a.google.com with SMTP id s5so56580316ejx.2 for ; Tue, 01 Feb 2022 10:20:58 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d26sm19725189edy.92.2022.02.01.10.20.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:20:51 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 091111FFBC; Tue, 1 Feb 2022 18:20:51 +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=dWP+twRL5MOC0yeCWZwM8XygbnhyPigiSEVdDfOE8/E=; b=HIEQSEIZ+mMnqPJNUT5xbaKv2RP9NNNyyspk7CwuN7677xm0iqyUtb3yAKQWzIdyrU raGzrwAiHEbhc7bv3rST57sSi859Hc084DB37XdoaULT35smzGhGrJac+GPEylJ00sMW 7UfhOE8fM+xxXEFGqw+mWJ6isiQ2RBSr5Bb9H/SlVBBiPhvjcDUWvHUFwnlkxEPLB/BY XWQmzTRshY1/iApgWLfVTBXCC7ZVTCnMc2jiNm5VA4qkv3S74sDN1031+142OfXUBS3n c2EKTCLCZPyGkS4R/4ZoHPKZy/9nVEIw873YC5+JWl7HJa9aP/i0zoKvaWp1DgzBwjkp yspw== 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=dWP+twRL5MOC0yeCWZwM8XygbnhyPigiSEVdDfOE8/E=; b=xhHqrLRG7m0aavLgJarLlnvseSsFHVqQfd4S+RIuUh5+DkkCoX3MY5fzMjd59oCt79 R0CI+nBaoORhYazOoZI9xojGUUAs3NWJULJkTx0vlYhyiPE7FqZZ8K5zpxBLaYIwCOJA 1Ogib/MEw+02AKA0JMuDRgPt3RVy/aU+ggKZof5NyhWbppTxkwj6yNjgpC01FQfmiRcR kGQTzC/WtraRllb0Y0VxxnPsEZGcZeCH/JS3beVAWDbLDGlg597xlGDbAUdxj3792BLG 46H1PPq3IUw6WIUwrS2CwQhsWYnWTq/lEU7cYK6g7GKERpwTJWPea/af+6g20Tvpr539 Eg7Q== X-Gm-Message-State: AOAM5303j1MEaPWffdxvWdY7U3RBNjKqh7o0Kjd7QN3XCDB/cyZml4S+ hG9t/jurAggIOpQVydV+zp2z1A== X-Google-Smtp-Source: ABdhPJzKzhv3ZgDk++srPrIxztciOUKcgCFVFJeuzGr9IT8DmnUXyRvqoWga2KTaOkyANE/FdC6lxg== X-Received: by 2002:a17:907:86a0:: with SMTP id qa32mr22110503ejc.336.1643739657743; Tue, 01 Feb 2022 10:20:57 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/25] .gitignore: add .gcov pattern Date: Tue, 1 Feb 2022 18:20:29 +0000 Message-Id: <20220201182050.15087-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::62a (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::62a; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62a.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643755048486100003 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 Message-Id: <20220124201608.604599-5-alex.bennee@linaro.org> --- .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 Fri May 17 11:28:56 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 1643752502608656.6073900486107; Tue, 1 Feb 2022 13:55:02 -0800 (PST) Received: from localhost ([::1]:37180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF177-0000sa-8H for importer@patchew.org; Tue, 01 Feb 2022 16:55:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExnX-0008Cu-5X for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:22:36 -0500 Received: from [2a00:1450:4864:20::62a] (port=34574 helo=mail-ej1-x62a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExmZ-0000cn-IF for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:39 -0500 Received: by mail-ej1-x62a.google.com with SMTP id h7so56924032ejf.1 for ; Tue, 01 Feb 2022 10:21:03 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c14sm19901346edy.66.2022.02.01.10.20.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:20:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 204BA1FFBD; Tue, 1 Feb 2022 18:20:51 +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=NPKrcI0/I2FVrU5Z0FCwjKvMS6pS7fJ3mwu4LQOQL2E=; b=yBhLlkGY7mQxKYFu9RlznNjJpN6fW+qJrM/01qahI78K4kMYXd/VsfQZmGIGFSbAGz wgSTZ77GrSZVC9n+rQZJkL+G486f6FwJv50gor3oTuG9tSuXspYZ18EP/Xkzl6SQYkRd l9dix+OUxU5iqQbuVLzg+EslR2Z/jpCUUYAx0ZQ7a7rfASstQVdIgWpsh8Vo6i8rIaXT jD78q00Syd/QTweZ4uNoag0ZPOC7kXMT/tbqllUdqrkgoa9aWPP3va2RZPePq7aNSxGk f69cuWR9KOexrAHkOg+oQAoZynbNMDCywlso/VCKdh24ly8ohhIomN2sA2h2sIrUIHvn Cw/w== 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=NPKrcI0/I2FVrU5Z0FCwjKvMS6pS7fJ3mwu4LQOQL2E=; b=j77f77ABd4koHhPgzzUbaqcd4uVV978EnUZ5s5y663lFYijl7PXT+6jdv+ghtLrFD2 Fmf+7L94aqqncI0sXfYLp5/FMmUbHN5ORvg4U+fcy5UdGLbvld+JjUIEYTqMh1tDejXj coKhSPk3cIxI1k/fVDI4KGRNwgwUBhw5hLW+t21OrJSzGMAUkYDAU+AXtnpLr5FIAtDt Nf/09gWeeMKUbLSnRJdLa0KoZmGoMcUzTHeQjOu85AgLJGzRvKMBvTe03V556CB91pRi npOqanr2u7PLqKNqWsX85TLxc1hN1gCEhIhI2PUiKTI0RV9gaGG4HxKxJ9vp8Zb9adR/ wNOg== X-Gm-Message-State: AOAM532d0PqObfgnK+uYDP5PD3vnnBmqpAS4ISFd/S4jYPXjB8pmLclV ARDe7L3nNvHlhqZVqkoFn0jeiw== X-Google-Smtp-Source: ABdhPJyybyd6Foru63mS+KM25rggNuPF6woSEZi38bXjm4hBtbAnPK4dqon+Tv7vokZ5sFGPVFqBFA== X-Received: by 2002:a17:907:7241:: with SMTP id ds1mr22777926ejc.199.1643739662204; Tue, 01 Feb 2022 10:21:02 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/25] MAINTAINERS: Cover lcitool submodule with build test / automation Date: Tue, 1 Feb 2022 18:20:30 +0000 Message-Id: <20220201182050.15087-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::62a (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::62a; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62a.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, Thomas Huth , berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643752504295100001 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> Message-Id: <20220124201608.604599-6-alex.bennee@linaro.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9814580975..b0b845f445 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3585,6 +3585,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 Fri May 17 11:28:56 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 1643751408628242.4965775587566; Tue, 1 Feb 2022 13:36:48 -0800 (PST) Received: from localhost ([::1]:40882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF0pT-00008C-MU for importer@patchew.org; Tue, 01 Feb 2022 16:36:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExmZ-00087G-G3 for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:35 -0500 Received: from [2a00:1450:4864:20::62f] (port=34578 helo=mail-ej1-x62f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExmA-0000cb-7n for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:35 -0500 Received: by mail-ej1-x62f.google.com with SMTP id h7so56923681ejf.1 for ; Tue, 01 Feb 2022 10:21:00 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id bx18sm16482135edb.93.2022.02.01.10.20.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:20:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2C2EF1FFBE; Tue, 1 Feb 2022 18:20:51 +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=DaG3zQiQZ36ycjnydoAdWjsIMQZNyRhwpx1B2DtbdXE=; b=l5NFFYE3rqMiNlZDX/NOGMYTWkE2nudbkstZoXkI1EupAP9Qi/Y/llpHwJ0CDY/E/r 4fPr/KABBDpwAa+jdVNA7TjjNyP00ltj5DmLWr/2VBctgq32w1v/lyAEtg+7htr/4SKO hZhkgsjP1o6BB2gsKxUZM8HuS0L7REiTDsZ4WjuQvoD3EnHZNYnm0w0CKEaGmX/tnr5W MyoJW+BQEmLi48/N8qQY/L5zR6z0Aq0kQcmzcwKEo+U9SAIqADEVndB0ahDN7EzhHG5j u8HxmkrQyRO+pqx7L1nrdDU6k2jRpc5cITWE5O2AoWg5Y3EzWPhipQrPSnDORMNup37y 9Izw== 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=DaG3zQiQZ36ycjnydoAdWjsIMQZNyRhwpx1B2DtbdXE=; b=LQmBELBbUXgDvkFIHktGiiSyeUl5jqnjqLsiI3zT8j1s3ZE+G5hdF3cqPaMMqw9BhS 71u7qFy4rcwcDX+G4qTSOGcRnmZV5nhVD77R8HiQR3YECgjKgNt8k6YxbUIzkosseSs9 pFB07+QJP0uSj8CsR94OV1xZoL+pQXJj6ld5vv4RDOdYaU/JHowIv1+x8LPNCLxO3VIg qqhXv+SwoXs0SxyQlp1Ieb8KeZ6oo+sDVFSaAVwJk+plYHQ3Qht2jP8sJPNRpSNSEO5B 0qgb8HXemZejnLKHSmFqk3qbQuF3ajOZ50d00Ep6r5OgY8q8NnDbQMz+yfbC5wg4TJNJ xjYg== X-Gm-Message-State: AOAM530INkmipbokLn8HqZfsMVM/CZH9AhDSUU9NNnJgHYL2W3hLKZD5 7xjOEjL8xRK9scZbqDdLYer0dA== X-Google-Smtp-Source: ABdhPJypQ/CanFXjMyCW0fnB1o5t1SfGbwHWjgk1eQHhTrEAZLaL2ZxNdSFqCIs+f2fLYWiBTIG8tg== X-Received: by 2002:a17:907:a0c9:: with SMTP id hw9mr21766424ejc.421.1643739659734; Tue, 01 Feb 2022 10:20:59 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 06/25] gitmodules: Correct libvirt-ci submodule URL Date: Tue, 1 Feb 2022 18:20:31 +0000 Message-Id: <20220201182050.15087-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::62f (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::62f; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62f.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, Thomas Huth , berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643751410402100001 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> Message-Id: <20220124201608.604599-7-alex.bennee@linaro.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 Fri May 17 11:28:56 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 1643752037243615.263365311296; Tue, 1 Feb 2022 13:47:17 -0800 (PST) Received: from localhost ([::1]:56358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF0zc-00030Z-GV for importer@patchew.org; Tue, 01 Feb 2022 16:47:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExnX-0008Cr-5P for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:22:36 -0500 Received: from [2a00:1450:4864:20::635] (port=37455 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 1nExmZ-0000cj-2H for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:36 -0500 Received: by mail-ej1-x635.google.com with SMTP id ah7so56610273ejc.4 for ; Tue, 01 Feb 2022 10:21:02 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id lf16sm14734824ejc.25.2022.02.01.10.20.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:20:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 44E571FFBF; Tue, 1 Feb 2022 18:20:51 +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=2KHr0kxH9CLEWlHl0W4fK5P4+OBM1Yg1uq7/VVGxFQs=; b=NyqaRiTaluykHr/bVNHQ3/ehf/E5fDDkhjKu0Z2Z/2u9Q2cGxSFmS2lgAegGOOpJmY 40mMLQgeQIHlBGSHOBm4QNLM7SZHn6pgKHZxagOGzX/PYqeLYT+1u1ja+g5P23S4QOBz swVdWFJGAs+tk/L4vCnKAbUF67QPRaRDeNoCNl156wJ504wOSqRk3RACxCF5X72TdJ4h l+RDTmo+VVNS5vUdOaPdjx6tMKrrbpReij+4MgghdpR7gquu+/qE5ZEeJpJeoeK6nrmo W29YVlNqc38eVkwWYIDgmhZpVjcakeLMRQ7Od+38Mw8k38a702FOu3/k5SlYQpDYzpWK tNDQ== 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=2KHr0kxH9CLEWlHl0W4fK5P4+OBM1Yg1uq7/VVGxFQs=; b=qqOnTMjlFV41PlMnxpFiB6mBGvZ5RJ/yyHW4DXcdK4s56+NQ24gl3dz9AsOWs0v/TG GAe7t1rsybT2miwBFzEuKPv7fGuc1b9Txe22exErCM81Ty+Lpl3+saQx91sH2EbiA/Yp CZOIOz8m2hoCnjAYjt3bWZxIIJt3OHVI4LZlmt/ST8W7yqQBmmFMWuevgeJlFTh5RGYD g6cmFKFIqyFUaRp05KeS4w9QuVfPN3/tWv5796TmdBD66Tt3BkHDtJuxyxDIsBev/T2h Q+rzN1pdEk+O5njmA/NtJOt/LL/MrFMCMa4ihki/Suowcd7rrF4I7Wsa/X6BTOg41cOx zMXw== X-Gm-Message-State: AOAM530Bgxrgcz5TCi907YS/HPkQ2bhW/R2+taYujUHMEwY2zHE+d13c rDP5FndUIupf4OmH0I/tOiySog== X-Google-Smtp-Source: ABdhPJz46GkOA0RpGAg9SFyzZjazR3D2L3N8MLPyuUTETeUYUa/24R3tU+2HeuaYwS/+lTZiBGB5WA== X-Received: by 2002:a17:907:1c8e:: with SMTP id nb14mr22121757ejc.323.1643739661477; Tue, 01 Feb 2022 10:21:01 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/25] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Date: Tue, 1 Feb 2022 18:20:32 +0000 Message-Id: <20220201182050.15087-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, Thomas Huth , berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net, 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: 1643752039175100001 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> Message-Id: <20220124201608.604599-8-alex.bennee@linaro.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 Fri May 17 11:28:56 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 1643751604904827.8698641371179; Tue, 1 Feb 2022 13:40:04 -0800 (PST) Received: from localhost ([::1]:48170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF0se-0005D8-3A for importer@patchew.org; Tue, 01 Feb 2022 16:40:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExnX-0008Cs-5G for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:22:36 -0500 Received: from [2a00:1450:4864:20::632] (port=45617 helo=mail-ej1-x632.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExmZ-0000dA-F3 for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:38 -0500 Received: by mail-ej1-x632.google.com with SMTP id me13so56926406ejb.12 for ; Tue, 01 Feb 2022 10:21:07 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id gg4sm875953ejc.153.2022.02.01.10.20.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:20:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 64A9A1FFC0; Tue, 1 Feb 2022 18:20:51 +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=fzrsHIr2UBl/pseqKFbHnJlYZQrcZbG/aifIugk8tsI=; b=sQSLNu/68GC26rywKI50nXZjz54Y8UwBBE44nSR+MjKg5kj9XuuoWu1duzSD5abfGo 5VUOMn9D0bZVRg+bE5Atgb0CSXvU08M2k+4gRXodfwrns78tprHs91YX7ABzdgno2vEf jFBbDLBwKsRCGC+aeWbusosMWV6aPg1V52AFyZaKKCib7aFeElwrTBJI2Q13uVlyahsQ /Qvb5OsH0u5eTSyHEoMfxNY8vVL7xhiounSMhHWRaZf7GWsWpeipnfydZeBFMOPfNFIl BMv6d+KIjKrMGQODiCZetrhG59DxSiGkIMiTiBLS9sY+w//fRsp8S2wWNtAePvC3oJCL amMg== 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=fzrsHIr2UBl/pseqKFbHnJlYZQrcZbG/aifIugk8tsI=; b=u5t+Q6PJ/u2XwCXo0WBiJiimZu+1QiF2vxw5fZhEem24uVTZOqNYWVF6A1k7ULia3h 9WgHvMEYC7AIlckCBXqeCA3tvjCIWkBZRVX764REZnHDTFOtikQeUbQD592diyH+q2C7 lB66xH9KQozKT/2Ccr7i4YWfIW7rH1U6+JZP2lUxDHbXI1e/xU9HgvqLNH3zZA/XL1Rx NLCcfhO2FjqObo2TN8tsbg9tS0Y+7VmM5cI8mg0fJg14oDlkwrgJgx2ZDj3Z+uNlk06f T7BJZ1dBmE9ecddOXcHxUov5IuXbxf1DbeVD1FXh2qt2g78v9iK2JJyIyMaI/XqzeGw4 GEmw== X-Gm-Message-State: AOAM533TEO/9IzbPoDDlC5dbeRbEBapX1v41EVGnhheke1BVIl98TIiG l2WBE+W/5dQqK6oAIkUqpy9q8Q== X-Google-Smtp-Source: ABdhPJzmO3z49EkK1MKa6QP/CW0XBZbGpl5IrDTJyoffoAmE5BTkWkLdhdqHxcHN2XhVzOWPhXKXfQ== X-Received: by 2002:a17:906:7316:: with SMTP id di22mr22580895ejc.505.1643739666831; Tue, 01 Feb 2022 10:21:06 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 08/25] drop libxml2 checks since libxml is not actually used (for parallels) Date: Tue, 1 Feb 2022 18:20:33 +0000 Message-Id: <20220201182050.15087-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::632 (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::632; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x632.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, Peter Maydell , Luke.Craig@ll.mit.edu, Michael Tokarev , mahmoudabdalghany@outlook.com, "open list:Block layer core" , minyihh@uci.edu, Wainer dos Santos Moschetta , aaron@os.amperecomputing.com, cota@braap.org, Thomas Huth , stefanha@redhat.com, crosa@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Vladimir Sementsov-Ogievskiy , berrange@redhat.com, Beraldo Leal , f4bug@amsat.org, robhenry@microsoft.com, Hanna Reitz , pbonzini@redhat.com, ma.mandourr@gmail.com, aurelien@aurel32.net 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: 1643751608775100001 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 Message-Id: <20220124201608.604599-9-alex.bennee@linaro.org> --- 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 5f43355071..82db1e7e74 100644 --- a/meson.build +++ b/meson.build @@ -453,11 +453,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', @@ -3496,7 +3491,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 Fri May 17 11:28:56 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 1643754714333768.6661496996177; Tue, 1 Feb 2022 14:31:54 -0800 (PST) Received: from localhost ([::1]:39788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF1gn-0000o1-JN for importer@patchew.org; Tue, 01 Feb 2022 17:31:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExnX-0008Ct-6N for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:22:36 -0500 Received: from [2a00:1450:4864:20::62c] (port=43968 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 1nExmZ-0000dW-1C for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:37 -0500 Received: by mail-ej1-x62c.google.com with SMTP id d10so56833422eje.10 for ; Tue, 01 Feb 2022 10:21:09 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id jt17sm14766846ejb.161.2022.02.01.10.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:20:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 93DF11FFC1; Tue, 1 Feb 2022 18:20:51 +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=OwYtA2KKG+0bbq8x95tFKhT0n1BvnQylT/23Qq8x4yM=; b=al7Ig/VvxAl/uozViOnvTaKDP9AQphq1Ybm/qTdpEfCkRsIHh1qIJ4QwPVJ9TS/ZAp bElE/MnaJlbGsBOZsE5+GRXFOmbtzh5e8QBr/2s0YL0KXq3f4wuY2KRNcm1NiHbWvlMX maikoU4Kk3bhLn6AkPxEUw8HbsDqUqfxjcO4RB9LLiTDcyuisyqVaouo78CKLl77W+kM dwbIwNXlvTguHn6bg/GCtLMjsoSdPUrq4b9Yobj0Z4CixBDThM66Cv0HHw4vInwlE3yX zCkcbMNrNDNuxiVoBZo0yBAKcjXOytDFENi4/ZE3rnJKKz66MFMl5qX0uV91M/y8clJM e33w== 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=OwYtA2KKG+0bbq8x95tFKhT0n1BvnQylT/23Qq8x4yM=; b=mFIwU3gq9RQHY+4p3QmAZxL1Yq2DMqNIlNoHf+SyPkXOekq/tGvwMNrGSb3uyoYfaN o0uvYiez863AWrg8G8PmpNBNhmjkbZl6Li/gQ89jBL49W5ORO+dMEtq3MrSLe3RGiCj8 XwLSDkCeykmGi11Z5wy5tdDhym4HVbK6F/hTuqqkN1EPwwS80aN59wTUig+4ZLEbgxnT eSEiCh85rxPXmCH3w7B3310JvtrpCEyfPozzBfVGiMubpj6RlIcyx8SGogMAjXe192y6 5t2oAESXkssuVXMxeLY1g+Rv6SVxnf6iIINvpsOwbzFRkxxncZQjEnvCPZL1oCmokPJo /RBw== X-Gm-Message-State: AOAM531GUIdlHQ7YuHT/v+2fqrZUQ58V8VBkp5cXXkmtB6gyGs49VUPC 96SKqm9mdFfxOycgGDSZ1YMQdg== X-Google-Smtp-Source: ABdhPJwJEI14LRhA3QAEihbiN2Lkf2NTp/76OI+LmEHzB+HHfdQIlQ94S8akS5Yno6R+dhep78HKGA== X-Received: by 2002:a17:907:3d94:: with SMTP id he20mr22583130ejc.637.1643739667879; Tue, 01 Feb 2022 10:21:07 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/25] tests/lcitool: Refresh submodule and remove libxml2 Date: Tue, 1 Feb 2022 18:20:34 +0000 Message-Id: <20220201182050.15087-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, Thomas Huth , berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net, 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: 1643754717032100001 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> Message-Id: <20220124201608.604599-10-alex.bennee@linaro.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 Fri May 17 11:28:56 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 1643749387501653.9491986194421; Tue, 1 Feb 2022 13:03:07 -0800 (PST) Received: from localhost ([::1]:42876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF0Ir-000403-EJ for importer@patchew.org; Tue, 01 Feb 2022 16:03:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExtv-0002gz-Ev for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:11 -0500 Received: from [2a00:1450:4864:20::433] (port=35716 helo=mail-wr1-x433.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExtt-0001gQ-KO for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:11 -0500 Received: by mail-wr1-x433.google.com with SMTP id e2so33780380wra.2 for ; Tue, 01 Feb 2022 10:29:07 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g9sm10190954wri.95.2022.02.01.10.29.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:29:05 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AFC171FFC2; Tue, 1 Feb 2022 18:20:51 +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=7MhMTi1pxN3EWkNN5Z96EF/V4GjjGNATp/VG7QnEpIk=; b=AH3oCIZSNWi0zbnwYzFtbygBh0mGJkAN8rSo6XDUO3vXRG0zGOX6gEZHaejXsjv5Ex q10B+AKegCDVF1enK0GZXGA2aCkFuJP9qbVIoRQkNPoJt3lqhfJJJVlKAjumwHIV/qiq 3O1r6kEXvr0rf5kgKDrsEV1kLPZ5H9LpOC3A1eDNZ9wiE2HXjfOadomuHnzt7Rx/vTJp xVqF1RwubY9vWdQciAMgmmwcO46x3Aj6uf0kLRgzoM0ojSP2/puo25jCLzOisSQdDI2Q XscDfgbACrYsxlZvCXkjAtGlHtrWtL3Mh+Ll7naachbzi1G9h9nFwUT6C55z5XH/RL2l kdig== 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=7MhMTi1pxN3EWkNN5Z96EF/V4GjjGNATp/VG7QnEpIk=; b=eQGBtYIRxZY04oCAvyhSNPEfx8tvDw73fg9vU2dkZEW9fCjqcuaydc4dbWypZu2Dja vWStHDcDgewS52DiN3QtFiBPzdo5zO+4Er76ecPEZXRZ52wBZ32vsoDCd0tFJ0Puc53r BMXM/HJ5Q4wLpUbBEG+N+z7Pv8u4YwDtahqHdl/wpL5OzC1EaZgw9IG4ByZAoqREz7tQ MrQiORrsYGSQ8kh1fItvlh70O3dZfMjCv6AlgNtWkKUPQKDaoqjoxL9IE+IOXwDu2NwP 3mPiXb70hFOFH5R8ypqweMoBoCEneU3ItLbpvo6vn9wpc0W1MBn3yshT8Vuof+e5x4fl 2SYw== X-Gm-Message-State: AOAM533ushdaO1QqFTHdcKFVpEyqb3Gjma3ZG1Ehi16D9AUGr4Woxf8l WPfzJQ6hTpROGy/ClNw6aiTtnA== X-Google-Smtp-Source: ABdhPJxXXiuHb8pUVPWtDmjPH1gLxmVjJVogGUMtKVyp3s8nJfECtnpJtUzZ5kMutdO5ZJ4OVOxK5Q== X-Received: by 2002:a05:6000:11cb:: with SMTP id i11mr22498805wrx.19.1643740146991; Tue, 01 Feb 2022 10:29:06 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/25] tests: Manually remove libxml2 on MSYS2 runners Date: Tue, 1 Feb 2022 18:20:35 +0000 Message-Id: <20220201182050.15087-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::433 (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::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, Luke.Craig@ll.mit.edu, mahmoudabdalghany@outlook.com, minyihh@uci.edu, Wainer dos Santos Moschetta , aaron@os.amperecomputing.com, cota@braap.org, Thomas Huth , Ed Maste , stefanha@redhat.com, crosa@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Li-Wen Hsu , berrange@redhat.com, Beraldo Leal , f4bug@amsat.org, robhenry@microsoft.com, Yonggang Luo , pbonzini@redhat.com, ma.mandourr@gmail.com, aurelien@aurel32.net 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: 1643749389423100001 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> Message-Id: <20220124201608.604599-11-alex.bennee@linaro.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 Fri May 17 11:28:56 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 1643748101014741.5805234784519; Tue, 1 Feb 2022 12:41:41 -0800 (PST) Received: from localhost ([::1]:37296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEzy7-0007tj-Vn for importer@patchew.org; Tue, 01 Feb 2022 15:41:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExnX-0008Cp-6P for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:22:36 -0500 Received: from [2a00:1450:4864:20::535] (port=44711 helo=mail-ed1-x535.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExmZ-0000cx-Ab for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:37 -0500 Received: by mail-ed1-x535.google.com with SMTP id u24so35875998eds.11 for ; Tue, 01 Feb 2022 10:21:05 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id lt2sm14754692ejb.50.2022.02.01.10.20.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:20:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C7F941FFC3; Tue, 1 Feb 2022 18:20:51 +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=a3pYD4JYSVXhkyNJUs20bvFwaG/zT+sknHaI6CYVatE=; b=kcyxh01/gslM/0brNF9g2fsP1oIF8Tq96UUdztTset+YaQluNeyfOkr/a2M5tziU8Z AHjEHtQPHjqMNFVvriPkpRj/5wGs/YCel/Lt08x7vGc7EBkqyGlSqe2KWrGXSQeDtkWs iQxO8kFFqR5GBMqw5BMXrV86UiESlmbMkKzl9ERbhhmwjoA80D3Oyo5UvEhd2IyUw42J xrOkISobbZrRZL93CjLKrmhm1QbuWRUITvuK25VqrLyKmPvLLaffODIWbCahSG6PKxp1 oivsN7P6XNiVL+BgWHVQ6mqtm0fIyTOfU0Z7Iv3/Umagp8Rp4zIwKcw+39Ee8LONJsZN pPtg== 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=a3pYD4JYSVXhkyNJUs20bvFwaG/zT+sknHaI6CYVatE=; b=58gihMPJqa7O5++jIL0GJnX7gbxyVvYZdRWRkkMVLehRJF9yf149GW+S5myxSkBsek 5GJVBsH3Hj9FY47pyrQdSOVGrzlt0ubbarcuwakqlSnM5+YDBbSldXhbfrZ6KdGRo3he 000h1n/47fxc9eF4KzK85dqw9TYBPAbSmSQ0K5vtspXV7uopz0O05V6F8sYdy+qFCJSo zpNid12C8cF/nT5grHFeRFA6rXcfwiyKIKxTaPQjZoE3pGjFchybO0odmsHjiAv9Nbu1 MGAD850mXQDkBPuqff0COUWQy2SLScGo3vb3N7nYCeNLdmgcUjMDQAwHRtyplrEsPF5Z 5zqQ== X-Gm-Message-State: AOAM533Be48aYU9l9wc5XlCG0ygvb76aBUo9Y1VhkLm8tVjRm+ar1rzO Trr+AoxuSZdOlNpDkVLMVHcgCg== X-Google-Smtp-Source: ABdhPJzzSZCTtMoFAHg9wmIZx+akUTAIZhH70Rc1ucSWh9lupjxUsN4YWSTW1Z9kqnzkbFtBUqwOqQ== X-Received: by 2002:aa7:d949:: with SMTP id l9mr27060921eds.348.1643739664153; Tue, 01 Feb 2022 10:21:04 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 11/25] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Date: Tue, 1 Feb 2022 18:20:36 +0000 Message-Id: <20220201182050.15087-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::535 (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::535; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x535.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, Thomas Huth , berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net, 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: 1643748102840100001 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> Message-Id: <20220124201608.604599-12-alex.bennee@linaro.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 Fri May 17 11:28:56 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 1643748775329127.04709122613895; Tue, 1 Feb 2022 12:52:55 -0800 (PST) Received: from localhost ([::1]:53256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF090-00011O-JL for importer@patchew.org; Tue, 01 Feb 2022 15:52:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExnX-0008Co-2f for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:22:36 -0500 Received: from [2a00:1450:4864:20::52a] (port=42741 helo=mail-ed1-x52a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExmZ-0000d3-Uk for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:41 -0500 Received: by mail-ed1-x52a.google.com with SMTP id p12so36197010edq.9 for ; Tue, 01 Feb 2022 10:21:06 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id bl12sm14818947ejb.75.2022.02.01.10.20.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:20:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E2F3A1FFC4; Tue, 1 Feb 2022 18:20:51 +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=M6RNPmxjiFjo3NTc8G7waDVI2z0/bumKvAkX8vG0+kk=; b=oqxylzY2aPYDadhZmeTh7Z9ojeDPmg9xI/QfoDhs6+rHUHQh+of4kxzQGdoLcTIvN0 ofNi8sHlHXCPGHmGywuCGlseQ7ACq+j2ZErz+hSsrUtjqZEWuIAXjiS2Wum20ZeQjbzA NtYFbKu5uDmj1utip9YnIxDDw7gejaYYF3m/X9cM7580z9vVNY96ffCgDbeB8Ctrvt9c Zy982QqHM99dyxCYSnuySSZTVX9j1tgqxzShHYdOXGM0v1lOoOyWUNnxPy1vfL+DWTyh nbifsBP9t7mooXg85fbxrrh66dvkwyWgjvbxjU7ndFFdexNu/hgv644sXA+gpQoCsE9h OvqA== 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=M6RNPmxjiFjo3NTc8G7waDVI2z0/bumKvAkX8vG0+kk=; b=zNR7O3HAXYXTOMHFKoBWAQ8A5Ldtex04Nx9nubMQAx1olUFwydDcTVXmgPhTTGvokB +/hkwPp/fOYj4KKivhvg8rqlgcz9zRyo/mTm/hEaDDiVov1KuMbhe1jLr3UjeTrSg92a +ImflX22/mqEbgbqBdDZhzeVmeqsz8HITmsqkBPBiLDHDcATPnn2Ezz9lH9pHjGB5tlk CWBiqrfMl1jiVoOfr3+M3oH9rf3Lz7Y1IqxBv58XXYU2pNv06CgLZudcGBm4oJRC1FT6 PJVVOpKgXmER26EKpCrdPRKNYZ3mTzTlcrxq+xlPVojsRxiKUS5vmnuiLjI6d3jZzkpB YYZQ== X-Gm-Message-State: AOAM532OIyLOwyp0ZwzZNzgypk0QsFFxvqOgG5kfMVwuaUgHyVsflxYG F9F/+v0Hod9l1zEXI6hnrASXCw== X-Google-Smtp-Source: ABdhPJxt1qirJTcIs+uy3XCIBspEXDvPOWNQiAIFcZOrpsDBpsEmfJwhVISQKY9WzDjbwYEESFK9Eg== X-Received: by 2002:aa7:c30e:: with SMTP id l14mr5165098edq.452.1643739665135; Tue, 01 Feb 2022 10:21:05 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 12/25] docs/devel: mention our .editorconfig Date: Tue, 1 Feb 2022 18:20:37 +0000 Message-Id: <20220201182050.15087-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::52a (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::52a; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52a.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643748777110100001 Ideally we should keep all our automatic formatting gubins in here. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-Id: <20220127150159.1489286-1-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- docs/devel/style.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/devel/style.rst b/docs/devel/style.rst index 793a8d4280..9e66d133e1 100644 --- a/docs/devel/style.rst +++ b/docs/devel/style.rst @@ -12,6 +12,10 @@ patches before submitting. Formatting and style ******************** =20 +The repository includes a ``.editorconfig`` file which can help with +getting the right settings for your preferred $EDITOR. See +``_ for details. + Whitespace =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 --=20 2.30.2 From nobody Fri May 17 11:28:56 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 1643753238280274.804001074237; Tue, 1 Feb 2022 14:07:18 -0800 (PST) Received: from localhost ([::1]:54870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF1Iz-0005VS-Fv for importer@patchew.org; Tue, 01 Feb 2022 17:07:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExnX-0008Cw-6T for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:22:36 -0500 Received: from [2a00:1450:4864:20::62c] (port=44712 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 1nExmZ-0000ee-3W for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:40 -0500 Received: by mail-ej1-x62c.google.com with SMTP id ka4so56674495ejc.11 for ; Tue, 01 Feb 2022 10:21:10 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w26sm19735870edq.81.2022.02.01.10.20.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:21:02 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EF5D41FFC5; Tue, 1 Feb 2022 18:20:51 +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=PFUAsUoSTLSeQuqg2QwwUHrYnKbfkML1QApeyrZ65Rw=; b=zeN6W+lp1n2niGGHs8+E8n/QaxXCaIVFJbsXpAQOIMTkGloY7Pj5t8oy3gAYvycHmZ L0r/AM/J3W0YoUQuyfBzfL2wap1ZW9E0wgTi+9Ho5tJgJiv2UcffrruXNvX5ywJuzWIk 4hxgEGQi+4d+zW80tdTtc7rzn2lYJDNRS1XE+GCkmRIhVlTBZ/yrJOF1EIfWU9EGkeEg 0RLB7vIhGy1zwjTnHhKcutdTWtDiA9N9t3qPwdr9SvykpgdFtrgdz9jm1L1RI+SLHFov 4t8jFrlxgY807op+ZwjFuXi0jd8ZQC+nZSFW7UeR4H9clDvcK2dkch11UNmcAk5L4QH6 Nr8w== 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=PFUAsUoSTLSeQuqg2QwwUHrYnKbfkML1QApeyrZ65Rw=; b=DhNKZUPaF9/w7aSEMO+SCfKOeQd0X9gRCG+8oUrD6QyvdjIrovFNCcbTGcY2foLYv1 w6QGUBnY5JU8Ld3LiBM9/KLhBcYnnkTy578mJGRQqsIPO8nie3r5IFe4ICtjITG8/yf5 7OS8Pt8B0qFISrCWhLkF97ObnH2jcPUWfjl3Q9J63z5ibg8yRhbmMq2czURetR58ixS5 VrQRRx0Fz5a6jFblu5XObQR6oJ0xb6NI6s0xAIda7E9ROD2yxVj1+VKcOypJsk8Oih4G r8QqXJopawbBmyMdojiTRF0pMGmosSgJNOeMLoAuOLNLZvZGTqSjDArbb2NQNTBvSS9S BXxQ== X-Gm-Message-State: AOAM533G9Qsmv2JxA0zNzse9IQT4fYOOLcrzplNP+sHMdG/FE/3r9T4k Y/yi30eL45omaueqeEhN/dUUlQ== X-Google-Smtp-Source: ABdhPJxKtNGZZqCh+8f/Sqtbv4oCvF2vVrylj+gEiT5hn5drBLAZOMome4+hZiXQPPemIV1lm8Kegg== X-Received: by 2002:a17:907:1c8e:: with SMTP id nb14mr22122265ejc.323.1643739670081; Tue, 01 Feb 2022 10:21:10 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 13/25] gitlab: fall back to commit hash in qemu-setup filename Date: Tue, 1 Feb 2022 18:20:38 +0000 Message-Id: <20220201182050.15087-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, Luke.Craig@ll.mit.edu, mahmoudabdalghany@outlook.com, Gerd Hoffmann , minyihh@uci.edu, Wainer dos Santos Moschetta , aaron@os.amperecomputing.com, cota@braap.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Greg Kurz , stefanha@redhat.com, crosa@redhat.com, kuhn.chenqun@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , berrange@redhat.com, Beraldo Leal , f4bug@amsat.org, robhenry@microsoft.com, pbonzini@redhat.com, ma.mandourr@gmail.com, aurelien@aurel32.net 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: 1643753241329100001 From: Stefan Hajnoczi Personal repos may not have release tags (v6.0.0, v6.1.0, etc) and this causes cross_system_build_job to fail when pretty-printing a unique qemu-setup-*.exe name: version=3D"$(git describe --match v[0-9]*)"; ^^^^^^^^^^ fails ^^^^^^^^^^^ mv -v qemu-setup*.exe qemu-setup-${version}.exe; Fall back to the short commit hash if necessary. This fixes CI failures that Greg Kurz and I experienced in our personal repos. Cc: Greg Kurz Cc: Gerd Hoffmann Cc: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Stefan Hajnoczi Reviewed-by: Greg Kurz Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20220125173454.10381-1-stefanha@redhat.com> Signed-off-by: Alex Benn=C3=A9e --- .gitlab-ci.d/crossbuild-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild= -template.yml index 10d22dcf6c..29c3c2b826 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -14,7 +14,7 @@ - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS - if grep -q "EXESUF=3D.exe" config-host.mak; then make installer; - version=3D"$(git describe --match v[0-9]*)"; + version=3D"$(git describe --match v[0-9]* 2>/dev/null || git rev-par= se --short HEAD)"; mv -v qemu-setup*.exe qemu-setup-${version}.exe; fi =20 --=20 2.30.2 From nobody Fri May 17 11:28:56 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 1643755492472601.5603166516216; Tue, 1 Feb 2022 14:44:52 -0800 (PST) Received: from localhost ([::1]:35622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF1tL-0001QJ-AJ for importer@patchew.org; Tue, 01 Feb 2022 17:44:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExto-0002dq-2B for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:04 -0500 Received: from [2a00:1450:4864:20::42b] (port=41528 helo=mail-wr1-x42b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExtl-0001fm-PS for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:02 -0500 Received: by mail-wr1-x42b.google.com with SMTP id h21so33726823wrb.8 for ; Tue, 01 Feb 2022 10:29:01 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m12sm18228854wrp.61.2022.02.01.10.28.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:28:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 11DAF1FFC6; Tue, 1 Feb 2022 18:20:52 +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=4MsdlOLB+RpwIhJNUfsqaPM7K+H2r3p9BJR5FdDlpB4=; b=GUg1zxBZurmDdlfNfFihWAnGxXJZnyx2DPdr+4OJhGbNW0WxTRlH8zf+vBGge55VUf 5W5kkNzHrKfJfbPd69HYXV1qb65fK3SJNYcgWI1KyEQDXE4E79ec6Nkkc8l9WNmBXWln a63UcymMT6PWx01j9PnRBLMQ3h3NxIVunrFxWIATRXBv0UnKZEA1XE2V001F3xgzOVmH HtMd8AzYzMw3e6eX0kr/0VbrL5mUp+lv4aUbTgAypQNt/9a6g9tNEuhQwJ4fqFIcJsYp FxFKCWeCyvOwYchVGkrI9yywpiERvX5Y7DlCGiZwdv+COmH+6CVyM1Akvd8wlaTN2YWx kdXA== 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=4MsdlOLB+RpwIhJNUfsqaPM7K+H2r3p9BJR5FdDlpB4=; b=3bd9z+UgZnVnGTdciWAFaCv/iVaqsrWeGmC1dzZRoDD9H9Y9io+1GvuSSwdWa/tWs+ D650+RTVgSteuV3aR5lv/zeSOzN9HywhaTalZ7LxGVwIgZ31BMjA0DQDEw5ksvCo+AtK qjZ6kGDM3suppok2fWUW2qj0wVJ74Px3hIjG9Ia4T+IjSsl3ZIlGXWVygB1O5c+Q5knU L68jI0ocHPisghFW/Vu/q6jMYMk3gGC1mqndPa5WdDtpjchCuKo+cUlNSpXNOGMU11tU WyIiF0+ADtcAr/GvuaqwPYoa7G3VsF1P0gzeqguHZbrl95CCcwDOtztmkkelvNW8tQB1 HeYA== X-Gm-Message-State: AOAM532rHYlCmylJxFqm53ptvSBp0mRtFMlHXiAW6ed7dCfGeilk7Dy3 K0scPM1cWMY1deVqPCNL9WSscA== X-Google-Smtp-Source: ABdhPJyYoynhnghxg1SZj2Cgxqo3o4EdPpvMOKwAnUvbu+q4EkbZMM64Psk5aeoouAsms+uZ/iYc/Q== X-Received: by 2002:a5d:5988:: with SMTP id n8mr341147wri.81.1643740140363; Tue, 01 Feb 2022 10:29:00 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 14/25] tests/lcitool: Allow lcitool-refresh in out-of-tree builds, too Date: Tue, 1 Feb 2022 18:20:39 +0000 Message-Id: <20220201182050.15087-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::42b (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::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, Thomas Huth , berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net, 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: 1643755495698100001 From: Thomas Huth When running "make lcitool-refresh" in an out-of-tree build, it currently fails with an error message from git like this: fatal: not a git repository (or any parent up to mount point /) Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set). Fix it by changing to the source directory first before updating the submodule. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20220201085554.85733-1-thuth@redhat.com> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/lcitool/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lcitool/Makefile.include b/tests/lcitool/Makefile.include index cff7c0b814..6b215adcd1 100644 --- a/tests/lcitool/Makefile.include +++ b/tests/lcitool/Makefile.include @@ -13,5 +13,5 @@ lcitool: lcitool-help: lcitool =20 lcitool-refresh: - $(call quiet-command, git submodule update --init $(SRC_PATH)/tests/lcito= ol/libvirt-ci) + $(call quiet-command, cd $(SRC_PATH) && git submodule update --init tests= /lcitool/libvirt-ci) $(call quiet-command, $(LCITOOL_REFRESH)) --=20 2.30.2 From nobody Fri May 17 11:28:56 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 1643748406887202.48230961946933; Tue, 1 Feb 2022 12:46:46 -0800 (PST) Received: from localhost ([::1]:45024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF033-0004F3-PY for importer@patchew.org; Tue, 01 Feb 2022 15:46:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExnX-0008Cv-5Q for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:22:36 -0500 Received: from [2a00:1450:4864:20::636] (port=42868 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 1nExmZ-0000f1-Ui for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:41 -0500 Received: by mail-ej1-x636.google.com with SMTP id m4so56932296ejb.9 for ; Tue, 01 Feb 2022 10:21:12 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id bl12sm14818961ejb.75.2022.02.01.10.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:21:08 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1DEB31FFC7; Tue, 1 Feb 2022 18:20:52 +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=+TZjr7w9Hd6JZaVgTs5fEwS15BZhJQxhutquuynkbQQ=; b=phcxV2wVubU5kFqiurq0Cl29kCy0Kf/H4xeLkQSeoPvOt1i5PNHiicdhy3XuDqcMd/ Q51qtavyw8S6wMo6wE6L/ImzhFKFRlL3j1sGVlE2HDfeQRYuCcuYYgidUy4Eqh535q5I ls4j/PCzL1V4xaJmk7gXOvF7T+QCywM6wnvxBHFNqV3H0oXriulSjsKkOEAEPhWdHlg+ HG0bpAjUa+Z4yBZbE2cUwc6HTysBIGbxwFzX+9QU3ajHfipVCB+Hptu1obJYtutICkU4 u2MEaEe5Zm/wDzIC0POAVbs6ts+E6nsUPJ4Slaw6oMIFVfmsX3TvV9yL/m8UIbfbNUUU b8Iw== 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=+TZjr7w9Hd6JZaVgTs5fEwS15BZhJQxhutquuynkbQQ=; b=QqAYKfl75TCmr0wUYTeG/UOWf0Szvxx1yVbIvGV/2MtHtrHyqxzY9lvi0VXYqxbmFr 7N8UOr97y7nbwBu4Hah3h6/5e6Q+sqwvrPggx3Lbk9RvF7oY/iftLHx8SwfT55bg0+H4 tQs0cFix3I2PiaPlG6B90W2ccezOMNvTFnxdShF5ZevaKODn1UeYPV0uT/A5aSUKSy2s YBXwj9Oee3dpZiaLW70TSX2e//9ZgHJk0pfQOmcXZzoYkz3TR1zT9/MbO7AAFt93dVBW cDsqjvjTGVbIgidrU68efnNAlewBvtBLSUuRBI0eLN7/XJnhH3Zv6+Gq+j5z70JVH5n8 3S4A== X-Gm-Message-State: AOAM5323vtMBLjETV2i14d/Vo2iRcAveTw82z/Oa4Pdq+LmfQyQgWC5G 3tmjnN5uI0vFd+LM78nQyu+5LQ== X-Google-Smtp-Source: ABdhPJyvjMp9yF8GX/dweIl/zz71Du/rSTmdW4/i69/AWcrWs+SlBOxMZQb7kuaompVzRtbCnFBVnA== X-Received: by 2002:a17:907:72c6:: with SMTP id du6mr22862141ejc.224.1643739671914; Tue, 01 Feb 2022 10:21:11 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 15/25] block: fix FreeBSD build failure with fallocate Date: Tue, 1 Feb 2022 18:20:40 +0000 Message-Id: <20220201182050.15087-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, Hanna Reitz , berrange@redhat.com, stefanha@redhat.com, "open list:FUSE block device..." , crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, Kevin Wolf , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643748408585100001 We already use the CONFIG_FALLOCATE_PUNCH_HOLE symbol elsewhere in the code so use it here. Fixes: 4ca37a96a7 ("fuse: (Partially) implement fallocate()") Cc: Hanna Reitz Signed-off-by: Alex Benn=C3=A9e --- block/export/fuse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/export/fuse.c b/block/export/fuse.c index 6710d8aed8..7ed69c4a05 100644 --- a/block/export/fuse.c +++ b/block/export/fuse.c @@ -625,6 +625,7 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t i= node, int mode, return; } =20 +#ifdef CONFIG_FALLOCATE_PUNCH_HOLE if (mode & FALLOC_FL_KEEP_SIZE) { length =3D MIN(length, blk_len - offset); } @@ -643,6 +644,7 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t i= node, int mode, length -=3D size; } while (ret =3D=3D 0 && length > 0); } +#endif #ifdef CONFIG_FALLOCATE_ZERO_RANGE else if (mode & FALLOC_FL_ZERO_RANGE) { if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + length > blk_len) { --=20 2.30.2 From nobody Fri May 17 11:28:56 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 1643752947132480.2702978907313; Tue, 1 Feb 2022 14:02:27 -0800 (PST) Received: from localhost ([::1]:46094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF1EH-0007Wx-UL for importer@patchew.org; Tue, 01 Feb 2022 17:02:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExnX-0008Cq-4k for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:22:36 -0500 Received: from [2a00:1450:4864:20::62c] (port=44713 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 1nExmZ-0000fL-Pt for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:41 -0500 Received: by mail-ej1-x62c.google.com with SMTP id ka4so56675180ejc.11 for ; Tue, 01 Feb 2022 10:21:15 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id ry6sm6601713ejc.45.2022.02.01.10.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:21:08 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 391C01FFC8; Tue, 1 Feb 2022 18:20:52 +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=RF5y4dzhS8bG68f7NLy4ZRBD5ccx4mYs0zSlmwkW1WI=; b=xyxrSKhNUyh+NMnKYYa2suYiu4kaXxRCx32UlgYvL3T3D3YdmjYzC7bKujkhU/2nav DQQJjnFHAqPWKxCTR0O6LAGYx7VINMB4KA4TSszadOeb3ymeWwpLo+A7tEONbRQ33baU dQJrVvLNs6c4m4PgCrKDrIymQGljTThhgFYaHPKtfLxEBtCpVbpsZg1ABnRc3nk2LROs 3RqP88ZrZJ10KuchBsOtB465kPMFCsw9Q6EFC+a9QvwRsvsLuQj8raHjfr7CHktY2Txq n9hnjdhzuNIg/fsyvdRyJMsqzK5Z4lOUETMI2m5O2PFdh24Q4a2CLDXlp1QOXa0a1GFI 39eQ== 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=RF5y4dzhS8bG68f7NLy4ZRBD5ccx4mYs0zSlmwkW1WI=; b=ezNORb95UM/QVpkpi+uXbplvA4a1gKGPL392IxS7r2eQvSpNs6kyIUVewb2Dt4RIEP 3wmyJdRLbMMdqcsM5FGkYRpz86cDFdnMBPBArlpDE19qdry/Q0ZjkGr9AnAXuvsm9Rmk o0I356oPFd1X6K4tLsU3PyCrdo8M+3dcPWf7mI2rmiDsg4CpSai2aFvrYThTOYkyK5db 1BIGM5Pu6YwR/yoM8TwaJeMmU4SHYH/g5Ggw19oP+7+OjV0Hv7RMknHqxHN7Mn3+EZJB hCo46lRmFw+U9+ni9NifuRawKGZllvP9Pq/Mw1ks3NxZHgc0137KfPFLhaElVH44qLCJ ESVQ== X-Gm-Message-State: AOAM532DFIliWBeqK6OFINEK1llDWXAEzkYfXlNmB7d68GqiXNLzgJ/9 lPjJnUiUwpVkko+d+z4psH1evw== X-Google-Smtp-Source: ABdhPJzZgZlPVxalo/dypQeWv4Cwppyshto4X+oJyhUotLChHHAfc/2T7uQBH4Jll0VagBpYCxynwA== X-Received: by 2002:a17:907:1623:: with SMTP id hb35mr22011728ejc.209.1643739674758; Tue, 01 Feb 2022 10:21:14 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 16/25] docs: remove references to TCG tracing Date: Tue, 1 Feb 2022 18:20:41 +0000 Message-Id: <20220201182050.15087-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, Luis Vilanova , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643752950677100001 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 Message-Id: <20220124201608.604599-14-alex.bennee@linaro.org> --- 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 4290ac42ee..ec9a687cfd 100644 --- a/docs/devel/tracing.rst +++ b/docs/devel/tracing.rst @@ -413,88 +413,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 Fri May 17 11:28:56 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 1643756001637777.2328924852741; Tue, 1 Feb 2022 14:53:21 -0800 (PST) Received: from localhost ([::1]:52952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF21Y-0004uZ-Qd for importer@patchew.org; Tue, 01 Feb 2022 17:53:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExtt-0002gx-Tj for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:11 -0500 Received: from [2a00:1450:4864:20::430] (port=37882 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExtq-0001gC-M6 for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:08 -0500 Received: by mail-wr1-x430.google.com with SMTP id w11so33669778wra.4 for ; Tue, 01 Feb 2022 10:29:06 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v124sm2723182wme.30.2022.02.01.10.28.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:28:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5ED7E1FFC9; Tue, 1 Feb 2022 18:20:52 +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=o1JoCjdpm4Qor6Fl3CKDKbDr8nFRznjbGpAA21RdRCk=; b=zztVMUMEPAHePQQpF/X5UUi8iPPeyc3fCFoE0ZVIdVl3xxRLz3PjcehCJRhtJ1MCv8 TjAA3eASxSrFjwjITOw4DC5ezVfB7KSWzavORkGH99UaJo2rgEOoAJW4rFYivD+h8P5+ tfmKlEBXe6+8vMaADniWYkRcDzcyDwF80Q0VEUBrxi5miKgqibnlTt2fRy9V+5Yjhnvn aJ9yr+9lh2i3LB1cziwYmyvJJnQhpxPkIRGe0cezJzMOIwm5mVFOEoi88Mz92CpWlDs7 SdpuBuuGVMMb6hZMx8hsjyyFBmRwXMZHrriW4gft0pyBzx2m4U2UhfpxP3ej1WjA0vmw D/Wg== 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=o1JoCjdpm4Qor6Fl3CKDKbDr8nFRznjbGpAA21RdRCk=; b=2ZzPxeWvT2y+KvOUZC33v1YWvpaCn8zv5nwfJfr656ZtgOEuxjkITQPJpZ6WDIJelx cM+/FIB0umA4q2wG29LpXV0um+8rBAUBza46MqOBuv02MKZD5lPX7AirZXVDrpZSvj6n 0RYot3EEEqbvGlkd9Fu70tW/R0etFbTH8pqkm5ysRu6mm6qYrsfWET+Xh2oZJTf6OLpe 6lG4XorctZ88r9kgPB7QGLaaBQmZguUrRsxhCePCx+Eqpg3VKHjJmVqEGvpjYVwv6tva PMj5yz0wXavOetMI7k22UpIuuab7dAimVzXB4Rn3athvDn5r6wO9tR1aW/M0DzrQI0og xwmA== X-Gm-Message-State: AOAM530Gc16Hdph4ZRAELGWwi/j0bBSD0YyzIXdMNLnCRJRJ2cMBSzHR 88tJophQunr4cfZQUVtyLwO7fQ== X-Google-Smtp-Source: ABdhPJxq6/5M87/KsZDZiba30RITm7uTchcY07YEHcq1RfupwaP7omjkgyCRDHMrGStpuzVw18RUPw== X-Received: by 2002:adf:d0d1:: with SMTP id z17mr22724860wrh.301.1643740144874; Tue, 01 Feb 2022 10:29:04 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 17/25] tracing: remove TCG memory access tracing Date: Tue, 1 Feb 2022 18:20:42 +0000 Message-Id: <20220201182050.15087-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::430 (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::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, Riku Voipio , berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, Luis Vilanova , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643756004958100001 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 Message-Id: <20220124201608.604599-15-alex.bennee@linaro.org> --- 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 Fri May 17 11:28:56 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 1643756382130302.3858965441343; Tue, 1 Feb 2022 14:59:42 -0800 (PST) Received: from localhost ([::1]:42852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF27h-0000Rl-Ec for importer@patchew.org; Tue, 01 Feb 2022 17:59:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExtz-0002jn-HD for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:15 -0500 Received: from [2a00:1450:4864:20::42f] (port=36459 helo=mail-wr1-x42f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExtx-0001gr-1s for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:14 -0500 Received: by mail-wr1-x42f.google.com with SMTP id u15so33746429wrt.3 for ; Tue, 01 Feb 2022 10:29:11 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i6sm2628556wma.22.2022.02.01.10.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:29:06 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7523F1FFCA; Tue, 1 Feb 2022 18:20:52 +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=DJc74+RWn+7GCLpeFVdjhEK4yszN3h2ZPbtHnLLnDyQ=; b=rw/dCwDgUrA4CtxM0tDz1aWUGbDY5zTeZL/9B+5mdpYI/+O0chbL+jpMLdFIp7FVEO vwiXq1pmizMXBmdtj9xdT/0SyQGWwl/+vEZnA037/UmKCI9hmzaQ/f6BLnZKs7Kx+f4c 2d3AhoVCfE9DTREW+sfVr4KoXyGI+1HVbeYDyDkhBRgDSCmoCA960nM4MBlHRST/u3X4 1YM+XkSyhqCj6DPnERgXIEAatLu6OkwSXldG84wGT3lcZkyYJAlpA4CRH9WdldvdiwYa 6IkreutwwBmSixfn8l6er2lntdNRANxHnIHQBvPbqXfRdUqsr1NuUHMlZr3MdouJrRa2 LjMg== 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=DJc74+RWn+7GCLpeFVdjhEK4yszN3h2ZPbtHnLLnDyQ=; b=nGIqMtxXu71DYpbnnBGqcWNs3p/pgsRCO9ngO+w/U5gHd2ViLNmCt/2ybAjg2Q+qSW YihRy9kVPnoHwrZvwQrUhR4Xih8MrwYlrXEhsL/OiUK7oRwlI5ozBgBrM20WV6Ev39V9 Js6r9xiqRZ2dtdZcj7z4oY8RwRRSD6/fZJ6Ov+cPhLhk6a8dFF7N7R0/cNhR0KYgr1mV HBkFs+j//3oz98qcaUWQv6HssX3Q14GfvevfTBNA5B+LqTKvS9Lhrjk7409qxsM4y7h5 XIK6HQEKBRQLT36x1m+E9oFTTVWuYxllm8EBtQdcce/eYqlfTkfXhpHY6q4itJIffkCS pwXA== X-Gm-Message-State: AOAM533h5gF8H+VSQNfjoAOXLh1P5fNPh/NhpkZfQXyCVxd3za4anGoj OMQERx2z7Yn5AEvbe/AWBdqLtA== X-Google-Smtp-Source: ABdhPJwxTeDsIDGN9llEK63Q5XOp03wNHRNIoYOYu15sVwUynQ6dZPkFDtb8Tnf5AJxNuB3XG8EYpg== X-Received: by 2002:adf:dec3:: with SMTP id i3mr21656699wrn.691.1643740150389; Tue, 01 Feb 2022 10:29:10 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 18/25] tracing: remove the trace-tcg includes from the build Date: Tue, 1 Feb 2022 18:20:43 +0000 Message-Id: <20220201182050.15087-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::42f (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::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, Luis Vilanova , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643756384395100001 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Cc: Luis Vilanova Cc: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20220124201608.604599-16-alex.bennee@linaro.org> --- 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 c4794a1f2a..29f3bffd5a 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -67,7 +67,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 Fri May 17 11:28:56 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 164375383605930.129603732347164; Tue, 1 Feb 2022 14:17:16 -0800 (PST) Received: from localhost ([::1]:45506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF1Sc-0001oI-PH for importer@patchew.org; Tue, 01 Feb 2022 17:17:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExtt-0002gw-TS for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:11 -0500 Received: from [2a00:1450:4864:20::335] (port=38615 helo=mail-wm1-x335.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExtq-0001gH-Vg for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:08 -0500 Received: by mail-wm1-x335.google.com with SMTP id o30-20020a05600c511e00b0034f4c3186f4so2687829wms.3 for ; Tue, 01 Feb 2022 10:29:06 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i3sm14967209wru.33.2022.02.01.10.28.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:28:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9A6531FFCB; Tue, 1 Feb 2022 18:20:52 +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=8/rWurmul+sbv2Gj26JHhst6/kFendjAqbxz9LYeY1U=; b=B3tIZjm+lDAUq34M+dWrnKe17Bs6U54ahn9v3SAFNJ5IBf//MNNqVibezzHBTVzcYM e9ktVVbh3NIcMIKQRx6wP1s8Malnnc64rZD5YQmUA86/dAjlguscw54/XYXBLiZX936u Zn9n6VdoF9aG1f6d1CWCLabcnTmJMbzTj+Xp+NamENIfXw4gZFV50IQh9D0J7Qi22VFu UIjAO0D1zMJoU3syyJwK9jASSm8gmn9k+mCyG4LEpcSxJSSLE/6nkVyTHsSwJTtJVzKw 1w/SRP0p85QsW8eeKuEcBepkaOYjYOGLKtFQmJIy3SIyJ1tPAbkiD4xBBmVcQYSWbsAU zXLw== 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=8/rWurmul+sbv2Gj26JHhst6/kFendjAqbxz9LYeY1U=; b=Tzl1F5aPjSaKiQ5SL/R+MNHgD+rTrhriVkJiZaUidSt49c5PSTAjqTO7f4+Ps8fQKN YFbUFPbpcGfq8pKgWVANtkJt1yImuNCiv4MbrCtUb461cKq9Oy9RhCpj0WKjs24VUx8/ UEw8NjVspWEmYREC4FZJ8HlAjrD38/ec5ED5ZhEC0Z2LHl1UdBx244VoVWqvi+EeQfWj QOJfhAyeZC+x0rxTp95GY74AGEj1UqdtsYmxOHRzcB8+qp0N3StlOD1da7PHS0R6bzUE zUh+WXX7JJpl0fU/C8Sb6tEg66EUAjcLDjyz1kpz088ZPrJXM9QZoqbHoalpfdLucWLN yMZw== X-Gm-Message-State: AOAM530cFAx/MihzpZEzGNALLZd2jkiuQNu0ESYTBw7B11H6pwbdqCZ8 1ZF14ikg/xXn+VvbJUdDhb2g+A== X-Google-Smtp-Source: ABdhPJzB+GQmWLX0xCW1iQ8Hf/PoN4z65Zj44duMbtztEOIjAfI92nFyQF+4V3AUgMDMsxDph7Hg6Q== X-Received: by 2002:a05:600c:4f06:: with SMTP id l6mr2897826wmq.126.1643740143887; Tue, 01 Feb 2022 10:29:03 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 19/25] tracing: excise the tcg related from tracetool Date: Tue, 1 Feb 2022 18:20:44 +0000 Message-Id: <20220201182050.15087-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::335 (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::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, Luis Vilanova , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643753838102100001 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 Message-Id: <20220124201608.604599-17-alex.bennee@linaro.org> --- 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 82db1e7e74..ae5f7eec6e 100644 --- a/meson.build +++ b/meson.build @@ -2357,19 +2357,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 29f3bffd5a..26b54714d5 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -66,19 +66,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 Fri May 17 11:28:56 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 1643749722412374.94121363815077; Tue, 1 Feb 2022 13:08:42 -0800 (PST) Received: from localhost ([::1]:51420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF0OH-0001ks-7y for importer@patchew.org; Tue, 01 Feb 2022 16:08:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExtz-0002jM-H8 for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:15 -0500 Received: from [2a00:1450:4864:20::331] (port=33345 helo=mail-wm1-x331.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExtx-0001h9-Ol for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:15 -0500 Received: by mail-wm1-x331.google.com with SMTP id n12-20020a05600c3b8c00b0034eb13edb8eso1777499wms.0 for ; Tue, 01 Feb 2022 10:29:12 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p17sm15600796wrf.112.2022.02.01.10.29.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:29:06 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ADB4A1FFB8; Tue, 1 Feb 2022 18:20:52 +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=eYKuNqQWbQA6VLRyOfqmdoksIAggzecx1ac/yhIpgTM=; b=fL1H1kI8ftqFuOmJWZ03NTmcd6Ja5YYnqfsu8uq+yY1PWgaHpkuSRFC/kO3Jz6juxt aPXpb+FP7WXf+kY1Me1WlgmlSMKIKRSMppr3YxcPyczhhozk9pkiQE2pnk2nmVQTGRVa oTUX7rUooDL/i+9hpikSgEJOIPbnEMMGKk1fFPg4lwG+8wXq7k6qA3lDeuXsKUb3oHGz LI4znghd9/ZbVk/SgDYRucuK+B6D+Aav84OMbM/T06DBG9VwshfJvzcVnNzufDm3gH7m xHQvBsEKxKCHqOi8m4m2olY4NgDyty0Iow/ud9AKMQMUSkQurmnP3dRIII72hS/6LHE7 ZOig== 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=eYKuNqQWbQA6VLRyOfqmdoksIAggzecx1ac/yhIpgTM=; b=xJI2C+o7p7GKfhVhNb39Qhj0L38t6AwjjIRk1k5oKNg1pVPIFzeJJdDv+9WpS8tcZO Q84GJXhQ2qcWBd6ukxtZtAK6D1kCKUS0E2NPPK0KdADOx59df8kB3nC2UDT9kZxSC3fG iQ7UU9g0KLki5EQmmE9MydV4S6VGBcWfM7aX96U+4sNFViLuy3T/HI0hTMku1MeZa6s8 do+9KPOk/Ev2m+1TOq2faGkyN3xiuTz0440hE37F6sVrI1VJFP72pRj1umfmTKwwjjqZ doWiK/a9v//8crZMk35QB3hobugZAQy9lowWQ35n4Oo6hPebMAZ8FTXk7OWRmC3UYVxm mEKQ== X-Gm-Message-State: AOAM532OqzMisEc71+ixG5zruXDSxAfcKXg234FwJ0Rf50QE04Hsa0qF Oh+M5EHv9GF4lJjbH2EF5zhaZYOri9rCIg== X-Google-Smtp-Source: ABdhPJzfkHfjOmUFqmlyw5JtOSL2YLZwBlu6B/AoXSwu4fCLJlnwNyntLP75qeCKOTC/L/+K6445Ng== X-Received: by 2002:a05:600c:3583:: with SMTP id p3mr2954025wmq.172.1643740151785; Tue, 01 Feb 2022 10:29:11 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 20/25] plugins: add helper functions for coverage plugins Date: Tue, 1 Feb 2022 18:20:45 +0000 Message-Id: <20220201182050.15087-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::331 (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::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Ivanov Arkady , Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643749726106100001 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 Message-Id: <20220124201608.604599-18-alex.bennee@linaro.org> --- 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 Fri May 17 11:28:56 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 1643754237347413.0131788145502; Tue, 1 Feb 2022 14:23:57 -0800 (PST) Received: from localhost ([::1]:54956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF1Z6-0008Ue-GE for importer@patchew.org; Tue, 01 Feb 2022 17:23:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExtw-0002hz-Pe for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:13 -0500 Received: from [2a00:1450:4864:20::329] (port=46663 helo=mail-wm1-x329.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExtv-0001gm-0l for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:12 -0500 Received: by mail-wm1-x329.google.com with SMTP id m13-20020a05600c3b0d00b00353951c3f62so2117602wms.5 for ; Tue, 01 Feb 2022 10:29:10 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m187sm2638932wme.25.2022.02.01.10.29.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:29:05 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C77521FFCC; Tue, 1 Feb 2022 18:20:52 +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=WxxlAQjFne43H7oMKEwUdOkD0mNmEgn9CffHZbyJIkk=; b=nd8QUAMnm+0zrxX0OSCClF36hE6wFpaUH1E69YhCdbUc3rEQcnFFgL12cgMmOv8VYB +y+hZ9zzazLr0dR6V4QRRWNEAFpdvlvAJBdnPW3codauR5K/pB7stLk56dyIaJWcH1ML uKL9rwL+c0ws9vARtlaYSzmfelA2FdNbc+AH37RoEh848cgboCx/oiXLTXTpNIPWvfM3 XdOxDBguOSrjaMjn7ucBNQg4yzbvp/nouS+giQfaOU0JZM1ppyW8c587taLaj9nsnIHg rinDToXFqvlGf2l4P+Z8ko8b2PyYGU/HazEzJHyjwEe7rElYJGxEOeKJnpEUoPGrd/Xr Rq8g== 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=WxxlAQjFne43H7oMKEwUdOkD0mNmEgn9CffHZbyJIkk=; b=tiDoqx59+8wMiwvwoqHs3zUeH5NspMOrzvAu/E6yD6wHXZQZpbb88AYB91ooUn7YET Ginbs+JkGbYbvCFdQb0QQNU2c4jC2bP3dYhO8Cxshn0J+3ffkwWKVGiFQ/AkNTNBt7SV GsMq08QAGG7Z9iulTzr8PxSGSj55JZTJzy/uart0dAQThcfGX2mZf84pFO0WIlmmOW81 i8VdXboFI3qnaTrt224bObqnFvifoAm6uDxzkPe5K57NGnOi7ikMe8Cw2c8zlbZgrOWB upgUnyW3T6OoVJffgclFwMsQfptZxiJgnLiUbMGOvA+iDujQ5MCJxfL1VBCzFuuK0viQ umxw== X-Gm-Message-State: AOAM531080XqRzIb+KNDMiM93xk+3QBhuIlgVcHYkffSvgB2nFzyrAxi H+dNfr1T83P0clSQQSE0NCYpmw== X-Google-Smtp-Source: ABdhPJw7Ktkdh8AuoQXan2xWZ4IyrFiA+svUyuYHGFuf5JNhS+1ow3fhhdF1/X2qHmcAucPccA1FSQ== X-Received: by 2002:a05:600c:4f4e:: with SMTP id m14mr2871591wmq.155.1643740149666; Tue, 01 Feb 2022 10:29:09 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 21/25] contrib/plugins: add a drcov plugin Date: Tue, 1 Feb 2022 18:20:46 +0000 Message-Id: <20220201182050.15087-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::329 (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::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Ivanov Arkady , Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643754239686100001 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 Message-Id: <20220124201608.604599-19-alex.bennee@linaro.org> --- 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 54ac5ccd9f..df3499f4f2 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 drcov =20 SONAMES :=3D $(addsuffix .so,$(addprefix lib,$(NAMES))) =20 --=20 2.30.2 From nobody Fri May 17 11:28:56 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 1643749070547251.23263772569692; Tue, 1 Feb 2022 12:57:50 -0800 (PST) Received: from localhost ([::1]:34080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF0Dl-0006Tj-9f for importer@patchew.org; Tue, 01 Feb 2022 15:57:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExtp-0002eb-B1 for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:06 -0500 Received: from [2a00:1450:4864:20::430] (port=34617 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExtn-0001fp-PO for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:05 -0500 Received: by mail-wr1-x430.google.com with SMTP id f17so33735597wrx.1 for ; Tue, 01 Feb 2022 10:29:02 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a14sm18934359wri.25.2022.02.01.10.28.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:28:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D4E5B1FFCD; Tue, 1 Feb 2022 18:20:52 +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=LLRQf+EGiKb17sWi1iAuAKfuIJINjiQ+nmXe1hdPRTE=; b=kh1TMFQ6zXetHOCEPO4H7Dkh1BtqHIKUXOCEKtJobQx2p+B9T8gvT7x0Qhwfa7WuY8 d2w6Rckn6istlNODQqG0JfrICtoYuQaHhaF4V3MnW5fDzsqgmOcqIZhNJZy8NAM7LlI8 rUfFyfyVDXr9KlrsX/0E6Y9RayTNbhCwRAd6xIIKCmoBQ6ew/9ObCXJ7+C3bO3wmbP/K iptiEPE0pOxI0D+qNwjiCSpCXZVeD7Jp3ZLkgyJ2wHgRZ2Pw9K7eNvLCCJSKl1aTlWXB XcvBvV/MfomnHQqMB/L4qnnxN8J5Kvogpjw5mv5GZoRY3CBpIDwsZlhe+4RS9IpppuhL aTIA== 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=LLRQf+EGiKb17sWi1iAuAKfuIJINjiQ+nmXe1hdPRTE=; b=aJv6PsGkCPfezLhxRcG1LyEhb/nH2hLaKosbiv5u4FsMEwhUd9Son8CI5IWgCNqQ+x BPZF+iTod1hYrtuu6OFPcouUiaaDma7lmg43Vt80qB1j3oqgGm8QJSHbspc45d8+CcEU a+fwm/YTGxiFGFaRN1kLIgSsn51vo+1c4DtoUQAg360QEA5DoGSU9S5Z3oGNqfDKNqvE Fa0FDiTh3y0lj4Scz3gCwKDqcJdKuFV/iKYjMyvseg0SJ3FMa5Z5nohWK80AjS2d9A1m tcOZC3u9YZm3FxFRkSQW7FZTwktVQ7Ownog9tMBfCbbhfSZpuKIC1cOeSRu94syr2Ozq FWkQ== X-Gm-Message-State: AOAM533igYyHKv02u2TD3AmXnJBXsa30Ppw0SU3QuvZb5UiGUG6c4ISK wnDgN2Vx5sONrnqMPhJTvtgNog== X-Google-Smtp-Source: ABdhPJxwStiajxw62nwanf61eTE6upWAj3eIHVHU7uXcsRm1JbiuGTGWKxONZwjfYahmYtueYOYI8w== X-Received: by 2002:adf:dbcb:: with SMTP id e11mr22195928wrj.175.1643740141117; Tue, 01 Feb 2022 10:29:01 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 22/25] tests/plugin: allow libinsn.so per-CPU counts Date: Tue, 1 Feb 2022 18:20:47 +0000 Message-Id: <20220201182050.15087-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::430 (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::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643749073876100001 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 Message-Id: <20220124201608.604599-20-alex.bennee@linaro.org> --- 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 Fri May 17 11:28:56 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 1643756251897824.900959494018; Tue, 1 Feb 2022 14:57:31 -0800 (PST) Received: from localhost ([::1]:35408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF25a-0003n1-V9 for importer@patchew.org; Tue, 01 Feb 2022 17:57:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExtw-0002hy-Pe for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:13 -0500 Received: from [2a00:1450:4864:20::42c] (port=35710 helo=mail-wr1-x42c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExtt-0001gU-Km for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:12 -0500 Received: by mail-wr1-x42c.google.com with SMTP id e2so33780449wra.2 for ; Tue, 01 Feb 2022 10:29:09 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l4sm16455596wrs.6.2022.02.01.10.29.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:29:05 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EEE771FFCE; Tue, 1 Feb 2022 18:20:52 +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=JEfEtb4g9JFuRdRoJCsBM6RTHKvLT1onRYy1y1hxc1E=; b=pFYrMkLt8aEnVePiXk0u9sOxHED7W+NQDhYAGI7s3R+mOk1QE6i6mL6OKD1SgVIzwm t0crJOYhKoNX7/iz96bQLMkIAb32bfQt16fnrDspsAVubtth1ykL2uKhpluO39tz2Bko rZXodGMu1YQhIKuQXscpbuip6hcDYwY28YYAL2uX06F4n3r0I58tmpDmov8j2n2q1CXT NtQR3kOS+ue7UoA4qTTyITieNo4i0vaUShB8gUOKR5KS0SphZEFPRgCVn2h/4NJcENX0 H4gv/FFGSZ+uSqt7037KcUPPaLx/kqHnbKuYo0FztuFpAEi9OZ1Gd4ADjWJ7ozDsykSG ZQvA== 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=JEfEtb4g9JFuRdRoJCsBM6RTHKvLT1onRYy1y1hxc1E=; b=x/0dhz64ImwvyjINVUCE8l7qxWPGJQfOcx7CnWOFsaV4ww0io30j8Wi8VRee3U8m9x tlWt++k1TzdtkmZpdxvQ7oSZbk1t1zffiHRPaoHedgUGJNBVhmhDsFVpQ3VpCmpblQV8 3EA0i/tPSYMYOXE8cgGSXv6Af+E7dhZa8Oll63ysoF1p7Pk4gm0nVPjt2tRSaMCshZHa VCR/cAJKKZtnpjNwZ5n++7YAZGt9JBzmO6o5PU7JhflCqAPLqqPkhB7EDQEa18sRssw2 gniFmWBSdh8LlnPsI7kEOEYG+8stZjfxLDA0PKQEgjKWS50ZP03S0jiKpD5jm4j7WEov ElGw== X-Gm-Message-State: AOAM532NexPp8CN3vz8VzxEcd6rWTAQ44SnbUCMDzonzYs5dJb+keh6E mb0E9I23uY8iWd03znbMHTof3Q== X-Google-Smtp-Source: ABdhPJwrW2sxUQRFocmCQxbzVJy8GOzGqlGIcOR3V7qiIARSXXDDJX2nsM0qEmaGr9KQ24+JV3s3OA== X-Received: by 2002:a05:6000:1545:: with SMTP id 5mr22926134wry.61.1643740147942; Tue, 01 Feb 2022 10:29:07 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 23/25] tests/plugins: add instruction matching to libinsn.so Date: Tue, 1 Feb 2022 18:20:48 +0000 Message-Id: <20220201182050.15087-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::42c (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::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, berrange@redhat.com, stefanha@redhat.com, Vasilev Oleg , crosa@redhat.com, Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643756255398100001 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: 0xffffffc01019a918, 'tlbi vale1is, x1', 5702 hits, 31825 match hits, =CE= =94+8112 since last match, 68859 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5703 hits, 56593 match hits, =CE= =94+17712125 since last match, 33455 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5704 hits, 56594 match hits, =CE= =94+12689 since last match, 33454 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5705 hits, 56595 match hits, =CE= =94+12585 since last match, 33454 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5706 hits, 56596 match hits, =CE= =94+10491 since last match, 33454 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5707 hits, 56597 match hits, =CE= =94+4721 since last match, 33453 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5708 hits, 56598 match hits, =CE= =94+10733 since last match, 33453 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5709 hits, 56599 match hits, =CE= =94+61959 since last match, 33453 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5710 hits, 56600 match hits, =CE= =94+55235 since last match, 33454 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5711 hits, 56601 match hits, =CE= =94+54373 since last match, 33454 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5712 hits, 56602 match hits, =CE= =94+2705 since last match, 33453 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5713 hits, 56603 match hits, =CE= =94+17262 since last match, 33453 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5714 hits, 56604 match hits, =CE= =94+17206 since last match, 33453 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5715 hits, 56605 match hits, =CE= =94+28940 since last match, 33453 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5716 hits, 56606 match hits, =CE= =94+7370 since last match, 33452 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5717 hits, 56607 match hits, =CE= =94+7066 since last match, 33452 avg insns/match showing we do some sort of TLBI invalidation every 33 thousand instructions. Cc: Vasilev Oleg Cc: Richard Henderson Cc: Emilio Cota Signed-off-by: Alex Benn=C3=A9e Message-Id: <20220124201608.604599-21-alex.bennee@linaro.org> --- v2 - quote disassembly - try and improve formatting --- tests/plugin/insn.c | 89 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/tests/plugin/insn.c b/tests/plugin/insn.c index d5a0a08cb4..cd5ea5d4ae 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,37 @@ 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 " hits", + 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, " + "=CE=94+%"PRId64 " since last match," + " %"PRId64 " avg insns/match\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 +118,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 +175,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 +207,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 Fri May 17 11:28:56 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 1643755760735555.2193974544102; Tue, 1 Feb 2022 14:49:20 -0800 (PST) Received: from localhost ([::1]:44270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF1xf-0007Mg-V7 for importer@patchew.org; Tue, 01 Feb 2022 17:49:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExtp-0002ec-Ku for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:06 -0500 Received: from [2a00:1450:4864:20::42b] (port=44732 helo=mail-wr1-x42b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExto-0001fx-7F for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:29:05 -0500 Received: by mail-wr1-x42b.google.com with SMTP id k18so33752829wrg.11 for ; Tue, 01 Feb 2022 10:29:03 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m187sm2638848wme.25.2022.02.01.10.28.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:28:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 081001FFCF; Tue, 1 Feb 2022 18:20:53 +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=CJ53Uj6U+FB2fJ+hgAKxvbRBEP4EFyNBAoP2qiY8QbM=; b=ZUxlQqqJBA4YDmIN2zLVlwC4UKygiy2t2beEmVZ02ZxY7Es5asPCi3Y35WY9Mrvhbu bgSeR89UKFtYHHlimv80FoPtOGepd2EmwVDNIg1DqmgOqJJE/Z9ZRByTiZI6UWqHsZ8Z 54NF0SY8eg1QYvWiMnTmWXAyx3ltMmUOiKrpTe2GAF1BZAUvo4vQbGZFfiHKIao8QXBk GJXu/MOtgjgSr9y3qrki7zSg/9H5y8jAqCenMF9m0yRvryLJOaSZHKL2xsB6IX95H07M Yi7uhj6g8c5n08d1o+gwM6/bwZLVpM+imMjhcx0oZ2jFSeZhzQHNjwGqqd+bW9r4HaqI Ojcw== 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=CJ53Uj6U+FB2fJ+hgAKxvbRBEP4EFyNBAoP2qiY8QbM=; b=p5Hzj/egMGyx779hxpFXrxcvpEFxLyGgpedfDOWmfMelRuQMbxNAt+n/536Y2JRYoP 9d29gnWz0FO39pk1HImd4Zg/6q1/p+u1FZxa5yM+K+/zPvmGzeCZtwyG9MHfhtJ1Ryan xecOeL+VwsiaBUEidfOWkwATBxusZPCr44svGGMN8kW7+1Ui2OGTzclb1OEGxsF/Adkj 7iniQKY+GP1Q4Z09zUWmSlY9o24xpylZ5BvxjydKxGTc2SYXP/1S9ext2UvDwMJVNmLx auKpisIVPw0/uC9cWkYWHOKa8MgTUHfLvT9SbSednRdw7YvYcqeqByvpF/iZaVU2P07i 2zrw== X-Gm-Message-State: AOAM533M68cINXktp7J11aRNx6jYStf1dSsaYz1mgP0pZ8atG5nkcN1g fj3jAcRWlv3E5vwefac+JJVDnA== X-Google-Smtp-Source: ABdhPJwLg8W6Vh8xKPx8y6k3D4snqNrE41q3f6EluakJ309SH9RbdKqcF4zjh8wGPi9zMo1FHRVNpg== X-Received: by 2002:a05:6000:1568:: with SMTP id 8mr21317434wrz.583.1643740142915; Tue, 01 Feb 2022 10:29:02 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 24/25] target/i386: use CPU_LOG_INT for IRQ servicing Date: Tue, 1 Feb 2022 18:20:49 +0000 Message-Id: <20220201182050.15087-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::42b (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::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, Eduardo Habkost , berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643755762476100001 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 Message-Id: <20220124201608.604599-22-alex.bennee@linaro.org> --- 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 Fri May 17 11:28:56 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 1643755657914782.7929820118248; Tue, 1 Feb 2022 14:47:37 -0800 (PST) Received: from localhost ([::1]:38012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF1w1-00033R-80 for importer@patchew.org; Tue, 01 Feb 2022 17:47:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExnX-0008Cx-6V for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:22:36 -0500 Received: from [2a00:1450:4864:20::62a] (port=41506 helo=mail-ej1-x62a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExmY-0000fA-U7 for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:36 -0500 Received: by mail-ej1-x62a.google.com with SMTP id a8so56641389ejc.8 for ; Tue, 01 Feb 2022 10:21:13 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c14sm19901454edy.66.2022.02.01.10.20.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:21:08 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1F2121FFD0; Tue, 1 Feb 2022 18:20:53 +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=EhmXOO/6q9XmPV09312oaXBgVpi24xyzc4IO4oCe4TQ=; b=FGjGSEwRA1Ne87wtvz84S0Rjl1HDNlOM+Bj29reXxtQFIJZ5npsQsG1jevq8jd+vUG tZWWL717PAfB3pXProq7nNg/2h4ysF7XtWV8WKq2egbUhqhUikcuePb6beaY3Cr5SJVV 92LJxZ/2bnc0lfNN+oRqT46ZmCAXONOgVJKLt2azwQBKAnPUvLS8QwlZyooE0US6xDSV hK5/hZaQRAuVpiAKgUmHAGp+PnbXuMcj2y8sWEdIrTNgf3acF6wIO/De6tG3+dA/D/zV 8oIUFLj65Y03R6ij0CVU9mAngYhIZJUxTp1nfQr2suLZsx0QJwrHFCbCCuacnZDT6NfS qxhw== 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=EhmXOO/6q9XmPV09312oaXBgVpi24xyzc4IO4oCe4TQ=; b=v+puPUNOtnclcyhJb0KpsCd7TZ2NkvWa5WGLFR7q2Zzyk2e3layKM7g1d8KgBI4iHr R50CGb3+zVptq0a42A2GnmGLPnebgC/KRfu1Y7qux0kDJTBMrKa+WPZoSIOwnKsICqaB c3x/0pdy1YceFNC90plT0upDOa00p8GUHS6fAHUkvl4jiOIgYSegunZSjJtPFP+oEehg bJQ+il9JHhgEvVrNrpjdnhIsgLOBAexYSLBV4NMp6HSr2QcAL+aaiut6z5Elkjxo1eO7 5rUtb/TyABmVhe5H/QWrQpGWBmgqnYyy8kujsEKc6qJEPCzd4u4/V+g7XwyBYg4ZrtG1 xqnw== X-Gm-Message-State: AOAM533ii5Mj4eycVg4pT6Ys31PbCP8o16UXqJPtr1uDK8Ii8SOrFSXc RSMIFg0MrboQtg0aatICn752RQ== X-Google-Smtp-Source: ABdhPJy9olTmBKMbnXr6s8x5GBSObLQxWr//5z/4YIrE6OKuyxN0kdyFNBU4G5TpaKBEZPIgfgm6iw== X-Received: by 2002:a17:906:a250:: with SMTP id bi16mr22474672ejb.732.1643739672770; Tue, 01 Feb 2022 10:21:12 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 25/25] plugins: move reset of plugin data to tb_start Date: Tue, 1 Feb 2022 18:20:50 +0000 Message-Id: <20220201182050.15087-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-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::62a (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::62a; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62a.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, T_SCC_BODY_TEXT_LINE=-0.01 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: fam@euphon.net, berrange@redhat.com, stefanha@redhat.com, crosa@redhat.com, Richard Henderson , aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net 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: 1643755660895100001 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 Message-Id: <20220124201608.604599-23-alex.bennee@linaro.org> --- 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