From patchwork Wed Feb 9 14:15:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541096 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1393826imo; Wed, 9 Feb 2022 06:36:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJyCYYNqlRKAIi0ZSPDVoAD3XFZmlrJwRRZoXKd2BU+4dZm9jub86kk67LRalvGDgu6s2QQH X-Received: by 2002:a25:84cc:: with SMTP id x12mr2422106ybm.320.1644417411316; Wed, 09 Feb 2022 06:36:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644417411; cv=none; d=google.com; s=arc-20160816; b=Uhz+B5OdoPbeQBnVjq9wCFD5HOPE/M3okswJqujF++TpRepYN8KMG6IQr52qpoy+Sc +sjyCSlyMnUo6MvpCryrT30FB121AODYD6sWyuUpYFjwKT4ULMhxmh10iWk5fXgwPlRw gs5u2VSyXnVkz1cnijsYeskF/KII22rOolebXzcN0bNCR81kGQTszo4+eAnBouE3gIng ZjSqE0YMcA2QT7OPINkKabjoeJ18uYbDLlYZXLMUidLJmwt0uldCE+zf1HoHOfyw+fKS U8aKajCxxUMGCXtLKojalmwJwaC1kkyo1yCiJ4+D5IHfYQNplQhSXK/3bGzdXzr/ox25 4h4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=kD1cWlFlp5tq13wTXKHmTXaLhYBWNXYav+yptAqplQE=; b=vDBLnEjyupimVl9LLWeffQIjdny201zRIVNEXMigEWr90xomGqiO0Y7nA5ppcBFZIU tS+ib8joAtu/acFEvKWWpVbu4lBKbWoJ9i+sNH7wjz4q8AgTeXw0Q4L7zt3tAiNNIOb6 i+czPhZ5NYD5mE6wm7N7jNPKes2GjINSsJixfXGNc1K3JMGvGQF85zgLGdkNg/imXk0X V2Fg3kPVRVXOQ6SFELvcav8Q/rWjK005J9WEiCE9z9TZZt5YNcdAd9uFYx50BDtrNtuw LKzW63+Urmv4AMekcCLSGYai1/KQKMZLnRRKnprhpTTTgIAQnuyMgOBojKFMcijivpoK I5tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SPjzRfSS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z12si8074352ywz.417.2022.02.09.06.36.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 06:36:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SPjzRfSS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHo5S-0002zt-KN for patch@linaro.org; Wed, 09 Feb 2022 09:36:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnlP-0002cS-Bv for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:07 -0500 Received: from [2a00:1450:4864:20::52f] (port=34358 helo=mail-ed1-x52f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnlJ-0007q2-15 for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:06 -0500 Received: by mail-ed1-x52f.google.com with SMTP id co28so5440681edb.1 for ; Wed, 09 Feb 2022 06:15:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kD1cWlFlp5tq13wTXKHmTXaLhYBWNXYav+yptAqplQE=; b=SPjzRfSSywEzMCLvIaMi5dBIfU2c5C/phOmj033INDeor91+DROnErwva99/cjKFyC q1RaYfZcmiNj9nUTIvjKjRseCK5bvWQ/ZYNuNcMz+OJZQPyTyYHgkKNJpDcH215AwZhJ Z2PVRgpFWNtFSTCNmBprVEmz34zj3BXM6o+7VuRDV+nyoDTeGRUup6fSaOzC6pqOK6xh vhEf/tGm5nymioTUojy/3ZM7mrX6U2hXRx/OvwXmQ9PDLhGA0gJ76w1yRhNQ4UXHzh2h of/2Pg/swqqRwLbB5rnQxC0zxiFLIYYQQYYLeRiXI02ma6dGTCh0yr1B30ZGzy2vN5Vw T6CQ== 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=kD1cWlFlp5tq13wTXKHmTXaLhYBWNXYav+yptAqplQE=; b=tvXYFNtrua0+K9QaC58sQWmLXhfMROQilILC3tJ31Xu6vC4hfsiRSeYRkZLW1BROf+ QNk4f4GbVu5s6fMha4udXuaMPRD+iasfJ2Iawnpt05Xg9bn5VPSuzldfK9ql9v0wYytf J30OW9H9l72OZA2aeGVl4CLRAk1Re5U2bM1sFpX8C/D/j5vuninieps1vgx+EvZf+xt4 zZJGB9zACjqwaE8394XtDQZf5sMW4gNfzn/JD/Vc1GTyy/pkm4o53Em3HgaUcvlzudPB aB/TEoiMp1qBD5jnf9DBo5nMI29frEoQFUchd/rxA+N2/8GsGynbfiZFtFpXGoYQIDJx lmxQ== X-Gm-Message-State: AOAM533PT5XRLbXjiQw9WqeQ49KyrvfRUkxOwJASkmLiYm40iXlCespL hZhgtC3G/JFooFXXge+zlNdsSQ== X-Received: by 2002:a05:6402:40c1:: with SMTP id z1mr2659881edb.23.1644416131097; Wed, 09 Feb 2022 06:15:31 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n25sm4848300eds.89.2022.02.09.06.15.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5D7371FFB8; Wed, 9 Feb 2022 14:15:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 01/28] tests/Makefile.include: clean-up old code Date: Wed, 9 Feb 2022 14:15:02 +0000 Message-Id: <20220209141529.3418384-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52f (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52f.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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is no longer needed since a2ce7dbd91 ("meson: convert tests/qtest to meson", 2020-08-21) Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220204204335.1689602-2-alex.bennee@linaro.org> 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 -# Get the list of all supported sysemu targets -SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \ - $(wildcard $(SRC_PATH)/configs/*-softmmu.mak))) - SPEED = quick # Build up our target list from the filtered list of ninja targets From patchwork Wed Feb 9 14:15:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541099 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1399476imo; Wed, 9 Feb 2022 06:44:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJxidl49qz94JtvFfqsbO3oHBmg1Lr7no23sSM4re3/03OVT2d0IIe6cIaMWKgd06XNoqM4E X-Received: by 2002:a25:1583:: with SMTP id 125mr2442201ybv.216.1644417882570; Wed, 09 Feb 2022 06:44:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644417882; cv=none; d=google.com; s=arc-20160816; b=GP5brRPLkQmGb9RhECTk9b8jQdQeyPwvNWWRL9TMiWLAjLMTFyeEGw3svrql24am02 eSBrRsyloFFLHRY3Go/DkSAxALYk75PEmhZckjvz1vHFFvxH2ItkxlosUqgXg6wVvhn4 Jzgs9GONFRzPSKax6abQLG0LGKEx/SWI2cSvcu8V5Kr+IjNiiR0JiFowXJWWTyAFmB8L ZfruhyhkPNh/1WjkxBWsJTGGsqSPYVPTD6RvDghviAuRAVJEy0fjrRRihPJSBxPQnQhl No316KPsctsCdrJfmpkLYVUsOIeyRXn4obaVL5x12WIJE2HJFuSvoCJXThONC5/yOlxI CvqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=5fBV+KIdUFmQ3pIeT1jmWEUfUNk8eoCOUO8KAhKTuwg=; b=tWHOlY+Avdy7YS7YTg5b0VsJik9IzAVuWANvRuz2M0fyqt8m3tuDeInGcSb2QLr+0P vGUbNv+qR5l41xBIhoaPtNKhXejDBTat39P5nf1mOiIq5p5tRqfYJlPikD5j0LK8oTZh MVmqzDdScyXQ96F0FgeXiVzp1t8fEdGSZ0hpH3TdGLUyDQ/raIfpleCv/xXi+Zmxb8+d n6fyihgqv+zJ59uUK6+GBcmt6u0RpTcH8SuhtWJDxAp1sfwOY+NsPhHPPL9XBaZBqJ9f 8UnXsIPaZUGiQ0TxMGs4bLEvLMj2LMNcq7gMWmtXv77uk8Je+AvP3gekBMu2iuycRj5D pESQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="mL/dGOps"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z125si4488432ywz.496.2022.02.09.06.44.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 06:44:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="mL/dGOps"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHoD4-0001ha-2o for patch@linaro.org; Wed, 09 Feb 2022 09:44:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnlk-0002zk-6b for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:29 -0500 Received: from [2a00:1450:4864:20::632] (port=42528 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 1nHnlJ-0007qU-6t for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:07 -0500 Received: by mail-ej1-x632.google.com with SMTP id m4so7691050ejb.9 for ; Wed, 09 Feb 2022 06:15:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5fBV+KIdUFmQ3pIeT1jmWEUfUNk8eoCOUO8KAhKTuwg=; b=mL/dGOpslCk9qJ6OJyn3Oaq+aM9QDuTnCLY0oe/Mg4Vg9hThnzSAIgryLmOdbslld9 wBfqfhHqlQIzut8mrKJ43+J+MfN3385Nvl9CRbdE96AE5Ecpwl7VXik3VUNroA3vzqvq jWw5QUpJHnusRlXq18xdNBglGjCuYlOJ0nVTOyHzK6yvtJzx2cb3zwqjnmNa4iIzOfu/ agxz2ufFQUU718TtvuA+bXsGgkTZSs9UVSXdw8Ourk8QZqmzZ7z+9fyF2GQ98lQWFSnx PXj3hWFC51CyksaVlPiMP3anwf22tycI4uUM+gCalzLCUQxhLQzHZy6i0AJxX/K4j2Wv UJHA== 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=5fBV+KIdUFmQ3pIeT1jmWEUfUNk8eoCOUO8KAhKTuwg=; b=0J0XjgWsJWPolmGhkRNmrorAW7TMNqdNaxMPqFBZWuXm+dUFJdP7upNVE2XnT0Stq7 1p922IoZoh8bQLc+qAULlRilWa1EdVBc3QsXif4QPtXX7WRrvYZhvvWub4IxnfE5DupS U/PBZMf/+8oPihAHEWdfl3J8xjDHlw9n8y+Kdqu7v4yq6SEnPuODTpc4l5sYkOuM/y+y iYg05/voxF1QAIUxqBHJBX1hWgSApHR6GZuNcZaMvwjYHFMT/5B3rh3eh6rSJbCO401+ S+OvQGUP35K6h/Z4SP3uFdBd6f9N7KJcEJO/RuNYcUxj4f0JiBrSZNMxw5yPjrPOEmMf crVw== X-Gm-Message-State: AOAM531x1jvg5MjibSk3kfIKqxGtbhY+KHL1bdvLS+GNqVbf5myXyRU4 8yLmyhPmBdshhuoPc8lG44beFA== X-Received: by 2002:a17:906:5d16:: with SMTP id g22mr2153820ejt.753.1644416134023; Wed, 09 Feb 2022 06:15:34 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g2sm8311159edt.44.2022.02.09.06.15.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:30 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 73FE01FFBA; Wed, 9 Feb 2022 14:15:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 02/28] tests/qtest: enable more vhost-user tests by default Date: Wed, 9 Feb 2022 14:15:03 +0000 Message-Id: <20220209141529.3418384-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::632 (failed) 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: Laurent Vivier , Paolo Bonzini , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" If this starts causing failures again we should probably fix that. Signed-off-by: Alex Bennée Tested-by: Thomas Huth Message-Id: <20220204204335.1689602-3-alex.bennee@linaro.org> diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c index 3d6337fb5c..2a4568cd7d 100644 --- a/tests/qtest/vhost-user-test.c +++ b/tests/qtest/vhost-user-test.c @@ -995,20 +995,17 @@ static void register_vhost_user_test(void) "virtio-net", test_migrate, &opts); - /* keeps failing on build-system since Aug 15 2017 */ - if (getenv("QTEST_VHOST_USER_FIXME")) { - opts.before = vhost_user_test_setup_reconnect; - qos_add_test("vhost-user/reconnect", "virtio-net", - test_reconnect, &opts); + opts.before = vhost_user_test_setup_reconnect; + qos_add_test("vhost-user/reconnect", "virtio-net", + test_reconnect, &opts); - opts.before = vhost_user_test_setup_connect_fail; - qos_add_test("vhost-user/connect-fail", "virtio-net", - test_vhost_user_started, &opts); + opts.before = vhost_user_test_setup_connect_fail; + qos_add_test("vhost-user/connect-fail", "virtio-net", + test_vhost_user_started, &opts); - opts.before = vhost_user_test_setup_flags_mismatch; - qos_add_test("vhost-user/flags-mismatch", "virtio-net", - test_vhost_user_started, &opts); - } + opts.before = vhost_user_test_setup_flags_mismatch; + qos_add_test("vhost-user/flags-mismatch", "virtio-net", + test_vhost_user_started, &opts); opts.before = vhost_user_test_setup_multiqueue; opts.edge.extra_device_opts = "mq=on"; From patchwork Wed Feb 9 14:15:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541103 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1409136imo; Wed, 9 Feb 2022 06:57:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGCJ9x3BtBOYqZh8ZJHBONMMVqn1/C2CJFXDLXZHoBdX7+SrfYmP5IDJbwQdakBVlUZuVk X-Received: by 2002:a05:690c:93:: with SMTP id be19mr2580468ywb.285.1644418671620; Wed, 09 Feb 2022 06:57:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644418671; cv=none; d=google.com; s=arc-20160816; b=vBWzXalJkZD/UZM2BJKVz2AuSgaEgGSsvdFZHt3Pq2j3NPhjfuMqQr8mVdBw9qPu42 C+/flPeEpMh/30YgMdwXVGcMPbSyf7Fy1hb9nhBPMB+KTyRgM+WJsbmdeusUwfYqF4YC YxViZpRvaIRW55vRNQuRlSXvXFsQFlSLOF5MP+zWlVi3LlT0RZnR4kYOp/UJZjMb0V5G 24jLEo9aarRcLrqytFOuwLc0RdzEIWN3WEb5r+9A+7e8m/NYsrqcuFv0KdYj/Bm/Repp 0zx7+0GfakVwxtF+3jLWY23zeRa8UrF+lOJX5+pkVjZsRQrzYy/uH0BxVkbs9DVq8YSA s49w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=87HcQPKX55O5gBg8zHpB1mv+YHA8UaRm2nWImo48Fuk=; b=hQxiWpLGiSx+2+NBN3v1KHV6rDG4trhhD18sqkjdydVscg6DFImbrXm1iGS75zEelv RSSubXqyAz54CQq7sMhn64cNlTXqUOYUH0mTD2bszq1HEv0PXvT4BI2glqTr/OFnq1Ds X8ja2EOIAd8T6DNpIpL5FnEn6Q/DA+89gYs7CF6+zejQg6cF6aKJYeTxsCQbWWwJ0EaX Xtb3aY/QnIUnRKuthBwJ0bKn4E9QSWpRUjEU23dcGMx+ijx2oMXvq9TexdYws47qR+1+ MY6MDQNmcUyjIEx1HeuQPGZ6IKloT/mEmPhHO67y2+iRMkXewbqi6K7iPX0Uoc4F0CE7 tNAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=K7Oy5kfi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u139si10307745ywu.379.2022.02.09.06.57.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 06:57:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=K7Oy5kfi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHoPn-00067C-3e for patch@linaro.org; Wed, 09 Feb 2022 09:57:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnll-00030Q-H0 for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:30 -0500 Received: from [2a00:1450:4864:20::631] (port=44943 helo=mail-ej1-x631.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnlK-0007qi-Ef for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:12 -0500 Received: by mail-ej1-x631.google.com with SMTP id ka4so7653405ejc.11 for ; Wed, 09 Feb 2022 06:15:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=87HcQPKX55O5gBg8zHpB1mv+YHA8UaRm2nWImo48Fuk=; b=K7Oy5kfiYfrTkOjygQrKiXGuJ8S2ByBM+rQjArulgoyGluWDCsjfisw4XTvxaPqGF5 pZ3nC2wrLCpAYKJtDGJvKmyqHGvno3mamgQapTk+GeuXEUiwNsqfAjIvqEbtfcw9hxqY j2aW07N40yPKhzw1j+hIxDXxa1CNGDbfSQj+tBKKreD4T+soT0jKCtz0ln+Byb2fpW55 yd+zmHMCqYv6khOEymfFvNowlc0RAndMcunj+Z46G8IT2UnmjEqtlumGj8dvzBCXB14V ewPuEOjBfH6XpPY82qZ+pCjjggC30eu4rsbLnig0mO5x6H5FCjgsIXao/b0hxIqdQV8A 9jlA== 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=87HcQPKX55O5gBg8zHpB1mv+YHA8UaRm2nWImo48Fuk=; b=weK5hRf9f7faoHxoLxKVFPoLEAYED2MfSzWgdEFcGtAvmrjNwBZpWFrXONGE/V0vs/ A+zR1ksaCA6OVJ60F3YMW7PlpoAoLeJAVvB7y3zIWAfk0itCWR1kQx+/voJpP3K4n0O/ MUMqacmfgwev66NoFhH+7lvJ/riSmY75mJeX8XD1UYQciPPJmEy7jzedrGKC41wNzHfv rU3dPOkz/RuA7Y43GcrBpfiSHwu3Ls6k7Hr5vTDPFiBLYP8KYfL3RnAZX9rbu9V3X++h mNiJI5bIpMhGr91SMIki9UFAMgxACRiWmV01RPIgbPyMyo0J6dVPbQcLgKHZQrdOZWaR K5lA== X-Gm-Message-State: AOAM532BnZabcB3ttrboLl1K1n75zUpsFBBH7JIztGnD9DOukEsJN6J2 6gLUkzABbUNWAyd4uybdqC8eZA== X-Received: by 2002:a17:907:da3:: with SMTP id go35mr2161293ejc.456.1644416134708; Wed, 09 Feb 2022 06:15:34 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c10sm3926355edr.6.2022.02.09.06.15.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:31 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7EF1E1FFBB; Wed, 9 Feb 2022 14:15:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 03/28] Makefile: also remove .gcno files when cleaning Date: Wed, 9 Feb 2022 14:15:04 +0000 Message-Id: <20220209141529.3418384-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::631 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x631.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Left over .gcno files from old builds can really confuse gcov and the user expects a clean slate after "make clean". Make clean mean clean. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220204204335.1689602-4-alex.bennee@linaro.org> 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 {} + From patchwork Wed Feb 9 14:15:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541110 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1433144imo; Wed, 9 Feb 2022 07:24:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJwsYSwBeLwwdkV2bjeYb4mxr5eYwsqZfMEr3dR8BRjPzHYvYm/FiJgp8ypVtpPoPoq3kJcD X-Received: by 2002:a81:a989:: with SMTP id g131mr2674877ywh.228.1644420259018; Wed, 09 Feb 2022 07:24:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644420259; cv=none; d=google.com; s=arc-20160816; b=xw/W5k0SvlboUCLxsK+KoXB/RJTnRhk4XTlBWx2xtKr2CCL/6ajxD9baCYyt8PG8j9 TcJ9OgSZIHYS813/70EJ7VSwvOkx7xccuifMQgRVdahy96xbNUrIgLMUSc48C4Z+P/3y 3Tl2G0PJIwR2wkKkMF50B7JWNF8n5LnmxpmUIgalCKlK/cAjPh2R/RBcOuGovGQ5pycw ds9ot5O9BF66EvdRqUzw2UmkZpzW7hLZ7dJ15PXlJoi+6KzUqY9wKNZOQIYBXemMThe1 r2vXh/Z7touAt8HHJMz0laMVziSpXr7UApOCSc/Yr6H/16byNBliweCumljk0BKfobV+ J7AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=uMYb17GyxsrP+NkgdmFVAjR5IMWfK9SZozLUtY0td2o=; b=Fc3e6DhkX8RdRAawcw6RPSPNm5RX0jGbjI4IEPBSz+Dgd/Jwq3Hm7kvm0ORB4SjK7Z Hz/HdQOqcXpNTVgITqrm0taaPojqusIzytgqBduhOK4Ja64P8MDR0Xv/zWyJl/VaLLZT AF+XpNNM8qZZzSoHJcjdbyuONXM6JnzxeWKTbDu3jXFBzGdg1pIpD3AsBTvFSJWtoxkC MUXj/mzyV1J8CKWiQFfz5omJOh/haWGlP9CGtYUryi6eIv/nUjTSbTkWEA13R8xklr14 oo5ConkdzoNgouifG4uaInGIgx2E4V9Ww8wQHO6yJWLAcXW/Zb0XDfh1KMvNW/lBELvz RCIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fBDTEGcN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z72si7962638ywz.384.2022.02.09.07.24.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:24:19 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fBDTEGcN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHopO-0005c3-8s for patch@linaro.org; Wed, 09 Feb 2022 10:24:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnll-00030S-Le for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:30 -0500 Received: from [2a00:1450:4864:20::62d] (port=41950 helo=mail-ej1-x62d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnlK-0007r8-9K for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:10 -0500 Received: by mail-ej1-x62d.google.com with SMTP id a8so7707351ejc.8 for ; Wed, 09 Feb 2022 06:15:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uMYb17GyxsrP+NkgdmFVAjR5IMWfK9SZozLUtY0td2o=; b=fBDTEGcNTzysdcGSGcKAZmwKKwK6DK+btEFAU9GoujH3vypwoAP+eBuVTCgbUX/Mpk cnbfptGUa+fsdsbUVNgxwEC0kFt1GZ3JXCb7EvM/di/FEFGWwu7KqLk8cD2NNffCepKY XygyXhsTO37uxrRLwC1atvrUDob3Angex+NAHo7/N4ZArdJNYOATT+YQERFTDV51kL5z tcXj8QDve5ZCO630ieMpn4CM+/5iPTIbyPi+dsTrmytqrUr6l6NqW5afH+yMsylvjCgl F3aa0mT7ktH9EXuE1qukFUCIbmpQUtix6VkPR+nieEYsWWLB12Aoew5a+9JzEEGR4DHU ATEw== 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=uMYb17GyxsrP+NkgdmFVAjR5IMWfK9SZozLUtY0td2o=; b=lagq2D/TsvUeFD2WU4FS3K4U8F8ErS3o2GXqBiIoThfFADxCcigiU4qEdRPPy2HrCN ogoduHPymPH5dpA1tSSwoWlneU3ixDCwlxmbD1Ldmh5orTtY0HqiSupvjE+Y2xM6tAVp DTtcCBb046AGMFs98fJjldgxO6VOpqnIDVBIFWt74JM9Ht32xhaTuPA81+yAPgCcIEWy yNbJqLlfnjtUoHs3eAOY4gxIDCVP8QjKW1ZUpfvGSKw7aoinG/WLpGRdT9xvm43DpeQq NLNcTWoxeeha4YfbjowY7GgS7cM5QF6cGDRRLkP+s7//NO7AYkzZXqn7WirBFYwRViJQ fFcg== X-Gm-Message-State: AOAM531AJRad0Iq4zJq8JAXu27b+pR+i4a0RZ+762hAqeXK8Mq4hTood ysNjloNBsCdxE8JsLnkpkBEr5WMHp7xn/A== X-Received: by 2002:a17:907:1c02:: with SMTP id nc2mr2276653ejc.661.1644416136844; Wed, 09 Feb 2022 06:15:36 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d23sm6537897edv.79.2022.02.09.06.15.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:31 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 945461FFBC; Wed, 9 Feb 2022 14:15:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 04/28] .gitignore: add .gcov pattern Date: Wed, 9 Feb 2022 14:15:05 +0000 Message-Id: <20220209141529.3418384-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The gcovr tool is very messy and can leave a lot of crap in the source tree even when using build directories. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20220204204335.1689602-5-alex.bennee@linaro.org> diff --git a/.gitignore b/.gitignore index eb2553026c..9726a778b3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ GTAGS *.depend_raw *.swp *.patch +*.gcov From patchwork Wed Feb 9 14:15:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541118 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1457774imo; Wed, 9 Feb 2022 07:57:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJydIvPx8bQafYWMfnCiLBDnDd6I8gw6DTxAffYf12xLDEHMv5QFk9Vjbk0AkMGHCzLgTLVa X-Received: by 2002:a81:a9c6:: with SMTP id g189mr2920343ywh.274.1644422275811; Wed, 09 Feb 2022 07:57:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644422275; cv=none; d=google.com; s=arc-20160816; b=GYihEtvkvm9w8YblKc/jAoSZSuJeLb8lmTwpLSS2n+X4/Xs78wWuI+ALL64lupHlQ/ WjpxJa4/Y15WcGPnhEXMNQfNSrLxqbYz/fw+ZmebcTRu6h7Nls4uJ8sSbDOGCz8drUDo 2OHyowH3jAo28JnLB6ODgcA7on4CTk1XYxHoJxk0+D0agSHqqH4nFa1v0s+3e1h2nGVo 5IY5ZOyKXM8nkvlxV86eHMCVWdofpAxJ+wiPHdnuC3+5oOO3RFWgEn3O1OlX/vNN9VCd dlBuyFMMZpIlCfCAA/yWXhfVMkrduUziSysNKunp/nI6PXhfkJR550cIv4pBHNDYmfKK pXvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=k1fwnv0lJtUDhO6TOwyQLpcKEghGQfqMke/Cqw90EnE=; b=UnGldlKrlzV1B3OjWzoH90LUWtAHWNtkUDqhryWQSAY6+JjGqPe3Mbn2ohLtu1BJZU NNmz7LZJSd/9KOZ+/Xmlypt8xpURCT9+homMGin2u980nC6N8DgDPwUy+jktIzc17cjy +0vJpInDt9F+d1XbPtBNSBtw5Bo/iwcFpapxFjF9KMtlWASbPNrTnWKE399Pa15n774s QCZSCq5LjNmzw3MyomotKRYcriOCDS2BjiItzVZB/v+oZ97xD6WownOVmU41peXbEZaL lCDGUhcWWAlfKYLpn92Ew35+ezfqnR0uXQnHSluPE1zGbbwBEYKtzoSPyjpVIsfaUPdf IB3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MzWXzUr1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g126si12691521ywg.345.2022.02.09.07.57.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:57:55 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MzWXzUr1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHpLv-00044C-AM for patch@linaro.org; Wed, 09 Feb 2022 10:57:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnll-00030F-7D for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:29 -0500 Received: from [2a00:1450:4864:20::631] (port=34704 helo=mail-ej1-x631.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnlK-0007rG-9e for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:09 -0500 Received: by mail-ej1-x631.google.com with SMTP id p24so7810569ejo.1 for ; Wed, 09 Feb 2022 06:15:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k1fwnv0lJtUDhO6TOwyQLpcKEghGQfqMke/Cqw90EnE=; b=MzWXzUr1Zwyr/9hvh5W4y28yti4RZtTUg48WkjFPsvfIZsK6VVaXb760GFUCbCSlOA PNdiOABr7ND0Sdg56BkprrTo4w/LspkGM2owwkV4XtowQFxuTaFTNGf2vQ1n35jIH+Ia q0DqAfxCOGWL0bkK7D9AfafYVb+M72MVWM3tALBGO+NlgTjBarR5t3VReiNk3u1f9lxW vAJpmSoBmEABTbkYo3RQcQ+/N1Ra6zbPAF0QmHRrnG28QCQKS0YhalUbF/tl5ElAvmuN kuah9QQ+nXwtCSrtaJ4izFbQcVRyZsfkY3HPK++8opOMBbPEG9vH6aDB7esAcwWHb3Ql 2d2w== 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=k1fwnv0lJtUDhO6TOwyQLpcKEghGQfqMke/Cqw90EnE=; b=iHq47O2JgTcB7i97whyrC/dLBGulvAwXc4dfjkw9FpUTjSrMc7oZ8Z/YKGv2MLS62z bgLxIDPo87aeRapIozte+9HlHrEt4jR9ghbfhXvxdp8RWX1rGfcdU90r6lSyBOT6fyZ9 rZMFr/RyZdYZwjws4cxPcfW4TM9xy0Cua20568HJhvA/8CG2ApKw2SYE4rIN+gyUxq4k CPntTzEaJoRZliKIRE8BjppC1F+mKIlj2gN0SATTgzY7RqNAdsViUem4knTTUiSOlGeF qAGN30fYafr1OIlC5BYixpR3GA5fpMxQyrloHJg15dD7rW3pH2RSU4MlzV0Jl5GdVk59 MRoA== X-Gm-Message-State: AOAM531OjBIbOAV44Qj3/UCdCnEH2ipkPMtIl+ITN+h32vCKNQ0CveJq Pv5QG34Dova2texjyjqsaTMefw== X-Received: by 2002:a17:907:990c:: with SMTP id ka12mr2121199ejc.146.1644416140437; Wed, 09 Feb 2022 06:15:40 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y23sm194721ejp.116.2022.02.09.06.15.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:37 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A18761FFBD; Wed, 9 Feb 2022 14:15:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 05/28] MAINTAINERS: Cover lcitool submodule with build test / automation Date: Wed, 9 Feb 2022 14:15:06 +0000 Message-Id: <20220209141529.3418384-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::631 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x631.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé lcitool is used by build test / automation, we want maintainers to get notified if the submodule is updated. Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-2-f4bug@amsat.org> Message-Id: <20220204204335.1689602-6-alex.bennee@linaro.org> 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 From patchwork Wed Feb 9 14:15:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541101 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1405822imo; Wed, 9 Feb 2022 06:52:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJwVu7JKC//6YG5LzmEbVkxnrDLllfktVRxcFtYxtDGfEvM6N+dWyg6D8vsx7SN8zZ2QyS9C X-Received: by 2002:a81:c948:: with SMTP id c8mr2411068ywl.456.1644418377615; Wed, 09 Feb 2022 06:52:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644418377; cv=none; d=google.com; s=arc-20160816; b=UqKH98JX7ATY2eZOyDEN2eZdqGXnVbA4OiF8WiRkPaPCKPsKKJIzPMHKXeUVwAekRh fj5KgL10DEZlo962x0nqUO4TamQJ/RkSYqKw0MiS0fE9FcXdiR99/uHsZ63vz1AaJvTZ tSTiK27A19trzxlZJIyuSG2gw3DfeCEEnTrcgCoOCGf5Imhd5GRBSKREPiQWQOjlM/03 5AwXZ2Ghyd8CBOuX5wW64MNgwgjVVHa49TxiiJVX1EmDtYOt+nlT6lObJx4Mt1blsKKS NMyb2wBluBl2Sm58iYS4EspLodC9mb/32hcL3u1V1nzBXQ+UFtiLM3m5adtgk4Tfwvjd L1ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=bdScUadce3PB5EhVejsK4WtSulqO9m2KlFgdBHMRJyU=; b=RpyVVv2Vs1QfUqIEuDzdU9YLG5lgGyqhXa8HA3d/YdWAk9ETlG2RPWzs4YBuYvfSpp uPgfwUI32ekTGD9nPefQ7YRXwfU5KZd+TE6Mp2cXuAPMgNxiOqazRP8Ia6r5pvAB5eRa CcVMGxNceij+0+jKBIDb+g3Iu3XRe9WXyxp+/SgC95gK1N2EgMb44QKopsZ3lhIlyawv Xf4K5nLdVs0TK645rBAQZYRSqX91sLk7IYu/fwarMljfH2OaIF82WUbyGFIfccVMSgI2 Uf/J2TyMpnfEjuGfgF9GV17cjhD3Lir4JJ9hXnA+LglUByc3rIOk4OSC7a1KMQ1xLbTA SUpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sdINQ8pa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v191si11564484ywv.494.2022.02.09.06.52.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 06:52:57 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sdINQ8pa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHoL3-0007xv-4W for patch@linaro.org; Wed, 09 Feb 2022 09:52:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnll-00030V-P9 for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:30 -0500 Received: from [2a00:1450:4864:20::535] (port=44616 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 1nHnlK-0007rC-Bx for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:13 -0500 Received: by mail-ed1-x535.google.com with SMTP id bx2so5324305edb.11 for ; Wed, 09 Feb 2022 06:15:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bdScUadce3PB5EhVejsK4WtSulqO9m2KlFgdBHMRJyU=; b=sdINQ8pavGSjrvUMbkUm5vQ6WO7D8v/TR7Iy0lRGyAR2ATwN+lEH+PXa06tchBF/Tb sSwWtVRVoq7So2bDHCWO77nBBkHbq2U1gvfXTkNeVl9ODnR9rvEn1tLCUtAazh15tssX Tj+xjXzTp/fF5t2fRn236TCtdEG6jt4kD3Utg4MJNXhZpcJtWtiB5Ub2EMb1Wsvs57CS qqoPDyM+150IIVyDqiecjNJaJLw9xT0BxkcUuPjJhuqDFOvAepEkhcc9qIb3UM+/G4DW oWYXAe/hUEOtCVnWTsYyoUX2h3qAywNHdP0H0xkYDpNlezm5dM2I+wUr0ynrlTSR9s2q CpCA== 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=bdScUadce3PB5EhVejsK4WtSulqO9m2KlFgdBHMRJyU=; b=OsLEJMUtH6suCO9OCT1Lr0gmAXgn+qpVjeYY769VPG/zekpRR3I+KKn9tqYx+omsB/ WaJ9eIsL6g3FIcDcS5X1n6wOc0e2BMCIt9k7zdygM7AK338HcEcZyL6zppLyXbYO/GV5 dQEUYeqWd+oN1Y+w15sJNQtEG/VFklshIeLNplql4GleyRdx+jELOmEf95+gccevxT2m 4ImTa0Mn/1bq5mGZRUSLJooTQf7c7/LBWgAqOXLy4wS9PGNfjU/ANZYWOzK5XhkuRw3r vC1cAGAXPQlYyztJUp0RRbK59/11RMu1iWZBd7j42nGMfgLi7HyeNmGhlv+FNXvFqRqO aMSg== X-Gm-Message-State: AOAM530FTh+cpgZV3kpQX9MlOow4iMHP9UIuBAQriKfSnuGNp8s+rngc T+vbjOWspb+MvoUM3xgfDsq5Qg== X-Received: by 2002:a05:6402:b3b:: with SMTP id bo27mr2697794edb.76.1644416138715; Wed, 09 Feb 2022 06:15:38 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id ju26sm4647246ejc.97.2022.02.09.06.15.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:37 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B64371FFBE; Wed, 9 Feb 2022 14:15:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 06/28] gitmodules: Correct libvirt-ci submodule URL Date: Wed, 9 Feb 2022 14:15:07 +0000 Message-Id: <20220209141529.3418384-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::535 (failed) 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, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=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: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Correct the libvirt-ci repository URL to avoid this warning when cloning / refreshing the submodule: warning: redirecting to https://gitlab.com/libvirt/libvirt-ci.git/ Fixes: 4ebb040f1fd ("tests: integrate lcitool for generating build env manifests") Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-3-f4bug@amsat.org> Message-Id: <20220204204335.1689602-7-alex.bennee@linaro.org> diff --git a/.gitmodules b/.gitmodules index 84425d87e2..f4b6a9b401 100644 --- a/.gitmodules +++ b/.gitmodules @@ -66,4 +66,4 @@ url = https://gitlab.com/qemu-project/vbootrom.git [submodule "tests/lcitool/libvirt-ci"] path = tests/lcitool/libvirt-ci - url = http://gitlab.com/libvirt/libvirt-ci + url = https://gitlab.com/libvirt/libvirt-ci.git From patchwork Wed Feb 9 14:15:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541106 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1421744imo; Wed, 9 Feb 2022 07:11:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJyA3sJcBy6guGwMJUVmdxlreliEqdFiecg0F27wpvdZIJj5WyJfleq4A3IDUu7ISRBYnyS8 X-Received: by 2002:a05:6e02:15c4:: with SMTP id q4mr1260045ilu.281.1644419474093; Wed, 09 Feb 2022 07:11:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644419474; cv=none; d=google.com; s=arc-20160816; b=DnVzBQGfWIlDk6vJFumPC9d8P8tdwz5JElt7dv5xEqU8x9m1JUFWMC22Womvtc3PGG c64RddCZTP2mI95HPcjnQ/wNf+L00s3fX61nwTRyDXoAM6IJTJRTJb2mW9H6sjGcGGex zy9OSX9ZTXa2mOzNaAvQYgoX41rgOKqTafyOJ/OV64IWddrkLZy7VfwunXmwr2Ls7a9o GNL8yA6mwJKfmjmasgyKUuRVJpJcc9XJImXfoPgztZQhgOCB6DIBtc82uD9lYsNaj2JI DDNMRSPEViMcq8r2v1XEphVApDMqpnoPmNBB8trLkUMLyH3Z+04yWGmJE9bd2w1NmyuW t1tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=kqkbAl6efy51OiBrv3WLzvOb75kYmitY6qJV4uBajjs=; b=Hw8+PryQvFNkMnIap3CQOpraAFM1FcMwfjrJfEAtDWcaXq8RqUbZaT9VEwmop0Sg5H Bs+KAB5uxisiBW1tDSWh5Duz+cFfTV6bv5XpQmeMMrVlcCtvlnLwGBRAeA+sF9cjtJQz 20G2b9VvGAFaX6aCY1geknmP3pDOZkqxxFM846ELYn8PuIhjwIWjLKMfhNTWqPETLLwD e65ynIRGFML8J4MDqL7guRMim12CX5TY7lFSdG2H4QDXDFueW8gmmV2zTwn4ADC2H7lI X5wFXB5LR2nVbT8f97uJLJm9vK19IHEUFM/iAQkK1QS23GpmroPF7US8bonYhDdu58Za SOGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pmeTUP26; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a5si7195624ilc.50.2022.02.09.07.11.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:11:14 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pmeTUP26; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHocj-0001Pq-Kc for patch@linaro.org; Wed, 09 Feb 2022 10:11:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnll-00030L-Bu for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:30 -0500 Received: from [2a00:1450:4864:20::633] (port=43638 helo=mail-ej1-x633.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnlK-0007rg-Ct for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:11 -0500 Received: by mail-ej1-x633.google.com with SMTP id d10so7669140eje.10 for ; Wed, 09 Feb 2022 06:15:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kqkbAl6efy51OiBrv3WLzvOb75kYmitY6qJV4uBajjs=; b=pmeTUP262jhh+2EMh3IhZRbzqPK3ruoBfspP7ShI7NcSTv8aUHlsMR/KqLFNkdCk8F Melc1UjRHVltSRCADCu5X3AWYG1GAyknSKJ94eyFQR//fd2RKJD1cS4lTpS5+rfqXl0h 9zWuCfpI1zErVTpXUO06R5Amfng3cgXoa42K0rj3d6axi+V5iQQMHYyu7MscbM3cQAIv j0wjHWW8hFWIIFiC8FZY6nz7yCsTc67+T5jEoQZXt2rPO5DrhNZAyGUZuJUm0xIQNyrv DTK+WRQ6grPkuxkYZqMBmCS8mhV8CpnKZ/IGDuZyMT6+U8GzekLhvywz3CqE8f2dxgaI XTXQ== 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=kqkbAl6efy51OiBrv3WLzvOb75kYmitY6qJV4uBajjs=; b=SnAq694lnav3ka+9wvIQ8ce6laGEmImwyOvVVGf+Q3CPQE6vhs8asO8Cyy3FqTUFCK jJFSM/0XBqiMicjOwfsGsG5UN8Ox+BgK8uezMf5QMM56rJycMA4eIY51/YYke4y73LB9 QWhvFIVJCjlrdP3WSeEhE4gTf4NyIkK6gbokmKEnrlkUd8Z8NU0Jd0ye2u7zVRK3fi/s 1TmaJ4Bx9FEkHpFV6jZIGdMZ5eB/auZyghR9Gx5h3xSRp5eOt2gPekZlvlVDb2FO8zol z8mOCG8KyPdDRxeZHvq9KQ86AjUTIE9TfEZIC78vkd716lMydUFXz5xV1XyiQ8POXRg9 3q6A== X-Gm-Message-State: AOAM533nNCrow5abvcv9NQzP8FKk10Vl0x/IlIAlBMhfwjv1MjuT21Tm vR7Hsk1nm6Kf8v6Oq2aMA2fZPw== X-Received: by 2002:a17:906:5d0e:: with SMTP id g14mr2194650ejt.211.1644416142918; Wed, 09 Feb 2022 06:15:42 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k13sm3365640ejz.167.2022.02.09.06.15.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:37 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CDDDB1FFBF; Wed, 9 Feb 2022 14:15:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 07/28] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Date: Wed, 9 Feb 2022 14:15:08 +0000 Message-Id: <20220209141529.3418384-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::633 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x633.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: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Beraldo Leal , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The script only include the local qemu.yml for Dockerfiles. Since we want to keep the Cirrus-CI generated files in sync, also use the --data-dir option in generate_cirrus(). Fixes: c45a540f4bd (".gitlab-ci.d/cirrus: auto-generate variables with lcitool") Reported-by: Daniel P. Berrangé Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-4-f4bug@amsat.org> Message-Id: <20220204204335.1689602-8-alex.bennee@linaro.org> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 033120e223..25301f2ef0 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -62,7 +62,7 @@ def generate_dockerfile(host, target, cross=None, trailer=None): def generate_cirrus(target, trailer=None): filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars") - cmd = [lcitool_path, "variables", target, "qemu"] + cmd = lcitool_cmd + ["variables", target, "qemu"] generate(filename, cmd, trailer) ubuntu1804_skipssh = [ From patchwork Wed Feb 9 14:15:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541098 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1398707imo; Wed, 9 Feb 2022 06:43:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJz8bGhdArlHD/hiZkHvEScPLOQrk4X0dw02pGXev6sBYJIV7x9tsGvdjTzc28Mi5vJrAQ6z X-Received: by 2002:a25:6809:: with SMTP id d9mr2292945ybc.690.1644417822111; Wed, 09 Feb 2022 06:43:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644417822; cv=none; d=google.com; s=arc-20160816; b=otOx9Ykp5hrMbH1S7LOJJGL2E4gKzpXzBRdAfocae4jnWxG8TGWXNK0ohZNdocd2oT akOLgi6SUBBkrFl4V+CSPRowtQEx0QivaeoLh2wTvCq7OW/DHNmCkluZPm81aNhdElxL 2RnGUR0shrexIAjxlJ0Nmt9ADV8kgDMBZVGHZDu2uKOkTE+RE/yzKOkSeFPNBFvtCUsA pSGOS3/jiHBkOTp/Qyqa7lV6SXnqdtExSTFpBX4gRoovg9mkfuTvjDrLvv0hh5APSJmW pJ3RoJ/SdcubjJTxisng6IuLl0E16EPG9zgAQzyMi7kYcWx6Oek1RL3tBQdU5dd7wFvo bWlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=xVg00yMIJwdpqhnWMuf3gNCiNHok2dMC5Smr25iXBBg=; b=S5IA0LLbsIxqCotZCSYmmy/rUJg1RCRZDO2BW9s3zayYydqFn0ZHHxWX1g8TWbnakS KRtfArgqlXyyWV3ECeb8RNkKCwYjp9hZG7mZlFqy3G+Yz/T1DeNX3U8LW+MdY/NcbSr2 EQJtu+/4bkvGl7GUmwem4EhOYBrxEuQzXcaTJ566oHoCefWi9CX6QWqghFlbLIhVT/xf os+KG9YUt7V1PICyvYqhnEK7U/fvuosF7YydcXQK5E30YV+DGs04uwKIjUVs7ekYPHy0 MUtAv6IUDwDZ493vLlLln6RVGudMwFr72b0hhGReBz7VEzoOKadh6DvHloLOlG2pEERB gd1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bKrQhkjS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n205si14906569ywc.127.2022.02.09.06.43.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 06:43:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bKrQhkjS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHoC5-0000rG-Ii for patch@linaro.org; Wed, 09 Feb 2022 09:43:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnll-00030G-7Y for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:29 -0500 Received: from [2a00:1450:4864:20::52d] (port=38640 helo=mail-ed1-x52d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnlK-0007rV-Av for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:10 -0500 Received: by mail-ed1-x52d.google.com with SMTP id cn6so5351165edb.5 for ; Wed, 09 Feb 2022 06:15:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xVg00yMIJwdpqhnWMuf3gNCiNHok2dMC5Smr25iXBBg=; b=bKrQhkjS3TbF2u80YQLoo0KBG0vrPwcQBhOfEboaXpc42Vo3QP7xiH3d6wwfhIGnzN 3WhZi1NjcdZghnsA0Lpy+cof2rcT218riOdCkOI2w28LlLiH8Bpdq9kBNf9Y411UIEeA KiUEpsA1Fb3HGqzvLhkvCgDvvAiFPvbd1agM4l/EQj16NCRKDz3aGV7x0BHHv7NXEfw8 K1Yz00g5omYd8Yx/FnRXCty6b6dGSr2CFHAWG1deln5SN8bnn/Tf3WVG5h4rsDWAuVwR dIFVlVIJwIV82TFf/l7c/aVi9geukUcu8piLvVUBm66XXZ+nvHh4ENRi0YTG2oaX+NgI /RRg== 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=xVg00yMIJwdpqhnWMuf3gNCiNHok2dMC5Smr25iXBBg=; b=bCdPGkQ7zXdlatvNM5wxVKSRjRNDwJN9ToG9o4j/5MiM+nZC2rvSuUGLnZdlv0xTui 5I+aydCvxok6oponwv7wqktjDkU74lcjWkyFGmqob7xjxtmOpifPVPiIQ7/XRqzHWPbJ jaGpbFc7Y55Us0PvZ6g55nc5H+vkBU+xS7yOqNYvoaTLTRrXTFlSXk6ibNp2etDIDOT+ isk2K9qpqtdza5VP67jbp7rwPhdsk7A6OyYn7+HWhgrKM2EpkSAUfuGQZVN8daSPIhXF vyf3K7Aum4P5UXlcS3+PfzLvuDWAaR1IZe5MvJ+ubuWNpzXwvxjRu5jzHJB1Vus97Dj8 wbwQ== X-Gm-Message-State: AOAM532wI+sv7EBV+ZjLcUaEE7ahGNfL09VIP3cD92e4bzWepYm9j5z6 G8sGBoYp0n22GHxhKFs1xfskPw== X-Received: by 2002:a50:ee04:: with SMTP id g4mr2706404eds.297.1644416142029; Wed, 09 Feb 2022 06:15:42 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id ss14sm3852688ejb.199.2022.02.09.06.15.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:37 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EE8FE1FFC0; Wed, 9 Feb 2022 14:15:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 08/28] drop libxml2 checks since libxml is not actually used (for parallels) Date: Wed, 9 Feb 2022 14:15:09 +0000 Message-Id: <20220209141529.3418384-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: Kevin Wolf , Thomas Huth , Vladimir Sementsov-Ogievskiy , Beraldo Leal , "open list:Block layer core" , Michael Tokarev , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Hanna Reitz , Stefan Hajnoczi , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Michael Tokarev For a long time, we assumed that libxml2 is necessary for parallels block format support (block/parallels*). However, this format actually does not use libxml [*]. Since this is the only user of libxml2 in whole QEMU tree, we can drop all libxml2 checks and dependencies too. It is even more: --enable-parallels configure option was the only option which was silently ignored when it's (fake) dependency (libxml2) isn't installed. Drop all mentions of libxml2. [*] Actually the basis for libxml use were introduced in commit ed279a06c53 ("configure: add dependency") but the implementation was never merged: https://lore.kernel.org/qemu-devel/70227bbd-a517-70e9-714f-e6e0ec431be9@openvz.org/ Signed-off-by: Michael Tokarev Reviewed-by: Stefan Hajnoczi Message-Id: <20220119090423.149315-1-mjt@msgid.tls.msk.ru> Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé [PMD: Updated description and adapted to use lcitool] Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-5-f4bug@amsat.org> Reviewed-by: Vladimir Sementsov-Ogievskiy Message-Id: <20220204204335.1689602-9-alex.bennee@linaro.org> 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_block required: get_option('linux_io_uring'), method: 'pkg-config', kwargs: static_kwargs) endif -libxml2 = not_found -if not get_option('libxml2').auto() or have_block - libxml2 = dependency('libxml-2.0', required: get_option('libxml2'), - method: 'pkg-config', kwargs: static_kwargs) -endif libnfs = not_found if not get_option('libnfs').auto() or have_block libnfs = dependency('libnfs', version: '>=1.9.3', @@ -3496,7 +3491,6 @@ summary_info += {'bzip2 support': libbzip2} summary_info += {'lzfse support': liblzfse} summary_info += {'zstd support': zstd} summary_info += {'NUMA host support': config_host.has_key('CONFIG_NUMA')} -summary_info += {'libxml2': libxml2} summary_info += {'capstone': capstone_opt == 'internal' ? capstone_opt : capstone} summary_info += {'libpmem support': libpmem} summary_info += {'libdaxctl support': libdaxctl} diff --git a/block/meson.build b/block/meson.build index deb73ca389..90dc9983e5 100644 --- a/block/meson.build +++ b/block/meson.build @@ -58,8 +58,7 @@ block_ss.add(when: 'CONFIG_QED', if_true: files( 'qed-table.c', 'qed.c', )) -block_ss.add(when: [libxml2, 'CONFIG_PARALLELS'], - if_true: files('parallels.c', 'parallels-ext.c')) +block_ss.add(when: 'CONFIG_PARALLELS', if_true: files('parallels.c', 'parallels-ext.c')) block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-aio.c')) block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref, iokit]) block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c')) diff --git a/meson_options.txt b/meson_options.txt index 921967eddb..95d527f773 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -113,8 +113,6 @@ option('libudev', type : 'feature', value : 'auto', description: 'Use libudev to enumerate host devices') option('libusb', type : 'feature', value : 'auto', description: 'libusb support for USB passthrough') -option('libxml2', type : 'feature', value : 'auto', - description: 'libxml2 support for Parallels image format') option('linux_aio', type : 'feature', value : 'auto', description: 'Linux AIO support') option('linux_io_uring', type : 'feature', value : 'auto', diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 5caa739db4..5e50111060 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -307,7 +307,6 @@ our @typeList = ( qr{target_(?:u)?long}, qr{hwaddr}, # external libraries - qr{xml${Ident}}, qr{xen\w+_handle}, # Glib definitions qr{gchar}, diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure index e05f2fddcc..9850dd4444 100755 --- a/scripts/ci/org.centos/stream/8/x86_64/configure +++ b/scripts/ci/org.centos/stream/8/x86_64/configure @@ -81,7 +81,6 @@ --disable-libssh \ --disable-libudev \ --disable-libusb \ ---disable-libxml2 \ --disable-linux-aio \ --disable-linux-io-uring \ --disable-linux-user \ diff --git a/scripts/coverity-scan/coverity-scan.docker b/scripts/coverity-scan/coverity-scan.docker index ecff6ac5b4..6f60a52d23 100644 --- a/scripts/coverity-scan/coverity-scan.docker +++ b/scripts/coverity-scan/coverity-scan.docker @@ -59,7 +59,6 @@ ENV PACKAGES \ libubsan \ libudev-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lzo-devel \ diff --git a/scripts/coverity-scan/run-coverity-scan b/scripts/coverity-scan/run-coverity-scan index 6d443250a9..181bdcb263 100755 --- a/scripts/coverity-scan/run-coverity-scan +++ b/scripts/coverity-scan/run-coverity-scan @@ -402,7 +402,7 @@ echo "Configuring..." --enable-libiscsi --enable-libnfs --enable-seccomp \ --enable-tpm --enable-libssh --enable-lzo --enable-snappy --enable-bzip2 \ --enable-numa --enable-rdma --enable-smartcard --enable-virglrenderer \ - --enable-mpath --enable-libxml2 --enable-glusterfs \ + --enable-mpath --enable-glusterfs \ --enable-virtfs --enable-zstd echo "Running cov-build..." diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index a4af02c527..48a454cece 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -58,7 +58,6 @@ meson_options_help() { printf "%s\n" ' libssh ssh block device support' printf "%s\n" ' libudev Use libudev to enumerate host devices' printf "%s\n" ' libusb libusb support for USB passthrough' - printf "%s\n" ' libxml2 libxml2 support for Parallels image format' printf "%s\n" ' linux-aio Linux AIO support' printf "%s\n" ' linux-io-uring Linux io_uring support' printf "%s\n" ' lzfse lzfse support for DMG images' @@ -188,8 +187,6 @@ _meson_option_parse() { --disable-libudev) printf "%s" -Dlibudev=disabled ;; --enable-libusb) printf "%s" -Dlibusb=enabled ;; --disable-libusb) printf "%s" -Dlibusb=disabled ;; - --enable-libxml2) printf "%s" -Dlibxml2=enabled ;; - --disable-libxml2) printf "%s" -Dlibxml2=disabled ;; --enable-linux-aio) printf "%s" -Dlinux_aio=enabled ;; --disable-linux-aio) printf "%s" -Dlinux_aio=disabled ;; --enable-linux-io-uring) printf "%s" -Dlinux_io_uring=enabled ;; From patchwork Wed Feb 9 14:15:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541114 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1449797imo; Wed, 9 Feb 2022 07:46:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJwsUtG1+2KcKpN4bU0avtJeNUgBxkZ3Lh04OVmdtqdfsVrgzu6sOcQbKMDkcVYsVfVBKy31 X-Received: by 2002:a25:cf03:: with SMTP id f3mr2571229ybg.56.1644421591462; Wed, 09 Feb 2022 07:46:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644421591; cv=none; d=google.com; s=arc-20160816; b=fi6RdQGH/wsCsJk8izBsH0jqToaSHcxs5CB57t82VXSthrl8BkrdePiADw2fdjg3oq DeKT2JK4p2KXEB7in5TNt/ysJFBPAd6bWQ6z+KsFEX4oLWXn2NkziY3P1ievWx8Re6Fb PSOSi9HFbU8CsE7I0fHcHn5s0iGo4xAQ2w2MjhhHvz9IGPBJVqjfoVdVhm8GGC9a1WN+ GgmiHapp/GgA8QzM6btR1M25287mRfpvuTbx3TB9XraTGjWQJpo2KnjNIWEIotfL5t3I ae3s5arnlCIwnCtsJg0E/Z6YhUJaBXsOcGLr2v0fasSYoAdaaEcCkZeOBkcGq29o5Htw fMMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=DqEJ8Nqdw7SmCv38bzKVDlH6wnwlEXfSxhNBDqv7J1c=; b=YNb4k2lU8K0/GMLmvx7HDzFnxnSbu3S46eTQuScCmx9j95KDEUxeQ5R/rNUpWT/umo sloWe3SNVuEWLltRDoUvHU0GoZqzxnW7jYW9Efc6XY0VH5HruX1xR3n8irfl1y83M9h1 G/MLAHtm3xABploGVsckrBLpXcMdrRTZlykuLyCHUPE7Yyiz1KpfSQgAtTjkRbyPzIS/ iFzxIzC7+tV3TXPOckdXAi69+n8M8m6A1ylNsnCK8H6LC5oD5qWFg5Es4qdYU2RbMOKY IcG+2ZXy2URMn53Q4Yi8GCxIM1L2sQBxgEHzFgJaVR8J3waQ6yKkP3lpKqj8id18Vf3K FBkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="vc/TJjV/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p4si14727124ybu.652.2022.02.09.07.46.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:46:31 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="vc/TJjV/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHpAs-000274-Kr for patch@linaro.org; Wed, 09 Feb 2022 10:46:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnlc-0002x8-4K for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:22 -0500 Received: from [2a00:1450:4864:20::62f] (port=40673 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 1nHnlK-0007sE-8J for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:08 -0500 Received: by mail-ej1-x62f.google.com with SMTP id p15so7709741ejc.7 for ; Wed, 09 Feb 2022 06:15:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DqEJ8Nqdw7SmCv38bzKVDlH6wnwlEXfSxhNBDqv7J1c=; b=vc/TJjV/s+AEhbGkxI8P3E9pz1iTEOVX3CdXcx+ORjxOTltEcxjVV4rR+oXB1HF7up UCSnuQdBrQ5b44cV/1QRBmEgoR/IhmVNV2SR0nwRw6/W1pSBX9swUyzgPkPVUWbv9Mkq Fg8bEyMNKY6BYaQViGTk9ou1QA+Qz+wnqqspu8ApmMfTBZ3qtCrWhcaUhu30MngWVpJ8 bYlpa2lqMxdnK1W3bqBLO0DmAfttZ540lWRmHnaSErOB66uC0ShKxVtFImivoP7SW/9S 9Ws5Bk/WQ5B/SpyjkYMf8tiTY5cHQmR6sXAqKbQ2i/fcrAElAMatGmewZBeUIPTpoinx NyAA== 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=DqEJ8Nqdw7SmCv38bzKVDlH6wnwlEXfSxhNBDqv7J1c=; b=BfWX3n6PwLRFidDnGOdZV16C+xw27RqsJ9XeDW/B+QZ3nR+mqbwRDnGytWnzeoNWmK SbG7GKcg/8SRf3X3Vx3Rj2STRwbXR7dBmzXmPo1CqfQYmpehX1ImgUWZqiOdhsU95Kbb e9qQLbTQYFeYoTeIQrkpskANT0Ze2CQJaxzt96WlIizsCCtLi5agIdfVn1HBPIcyE6YE 4pSpSEEi4yddGBlI9eAKl21rT5tdUgLtGTRuClJaGVGlkiS4RWYDJv6e9b0VWHmhG0gY wHnNt8sOb32hjRIvmSzbuQjcYpTpZuDOrUQtK4T2XzkVWtGbbRrVJKqg1j6vDLpBw2Yi hBUw== X-Gm-Message-State: AOAM530Zbe/+BoXZpxIZnp4uILiRuM+Dmnldlh6B6lFToKh/IEOaQ0tW /3wMoU/SWc5efyESUcFPOKQIiQ== X-Received: by 2002:a17:907:e86:: with SMTP id ho6mr2134247ejc.61.1644416147324; Wed, 09 Feb 2022 06:15:47 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id cz12sm3285827edb.30.2022.02.09.06.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:37 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 283A21FFC1; Wed, 9 Feb 2022 14:15:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 09/28] tests/lcitool: Refresh submodule and remove libxml2 Date: Wed, 9 Feb 2022 14:15:10 +0000 Message-Id: <20220209141529.3418384-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62f (failed) 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: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Beraldo Leal , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The previous commit removed all uses of libxml2. Refresh lcitool submodule, update qemu.yml and refresh the generated files by running: $ make lcitool-refresh Note: This refreshment also removes libudev dependency on Fedora and CentOS due to libvirt-ci commit 18bfaee ("mappings: Improve mapping for libudev"), since "The udev project has been absorbed by the systemd project", and lttng-ust on FreeBSD runners due to libvirt-ci commit 6dd9b6f ("guests: drop lttng-ust from FreeBSD platform"). Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-6-f4bug@amsat.org> Message-Id: <20220204204335.1689602-10-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index 9c52266811..07f313aa3a 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars index 7b44dba324..8a648dda1e 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-11.vars index 613d1373c2..08183f8793 100644 --- a/.gitlab-ci.d/cirrus/macos-11.vars +++ b/.gitlab-ci.d/cirrus/macos-11.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/usr/local/bin/pip3' -PKGS='bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb libxml2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' +PKGS='bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv' PYTHON='/usr/local/bin/python3' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index eb2251c81c..591af43d60 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile alpine-edge qemu +# $ lcitool dockerfile --layers all alpine-edge qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -56,7 +56,6 @@ RUN apk update && \ libtasn1-dev \ liburing-dev \ libusb-dev \ - libxml2-dev \ linux-pam-dev \ llvm11 \ lttng-ust-dev \ @@ -109,6 +108,7 @@ RUN apk update && \ zlib-dev \ zlib-static \ zstd-dev && \ + apk list | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index cbb909d02b..3abac7a8b1 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile centos-8 qemu +# $ lcitool dockerfile --layers all centos-8 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -69,10 +69,8 @@ RUN dnf update -y && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ liburing-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 60207f3da3..1d01cd9440 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile fedora-35 qemu +# $ lcitool dockerfile --layers all fedora-35 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -77,10 +77,8 @@ exec "$@"' > /usr/bin/nosync && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ liburing-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index f57d8cfb29..1b78d8369a 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile opensuse-leap-152 qemu +# $ lcitool dockerfile --layers all opensuse-leap-152 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -71,7 +71,6 @@ RUN zypper update -y && \ libudev-devel \ liburing-devel \ libusb-1_0-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 0ffa3c4d4b..003ee2cfed 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-1804 qemu +# $ lcitool dockerfile --layers all ubuntu-1804 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -89,7 +89,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libvirglrenderer-dev \ libvte-2.91-dev \ libxen-dev \ - libxml2-dev \ libzstd-dev \ llvm \ locales \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 4e562dfdcd..8993d2d9e0 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-2004 qemu +# $ lcitool dockerfile --layers all ubuntu-2004 qemu # # https://gitlab.com/libvirt/libvirt-ci @@ -91,7 +91,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libvirglrenderer-dev \ libvte-2.91-dev \ libxen-dev \ - libxml2-dev \ libzstd-dev \ llvm \ locales \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 29cec2153b..6dd9b6fab1 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 29cec2153b9a4dbb2e66f1cbc9866a4eff519cfd +Subproject commit 6dd9b6fab1fe081b16bc975485d7a02c81ba5fbe diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index ed5ab1407a..de51a2f1dd 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -63,7 +63,6 @@ packages: - liburing - libusbx - libvdeplug - - libxml2 - libzstd - llvm - lttng-ust From patchwork Wed Feb 9 14:15:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541115 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1451663imo; Wed, 9 Feb 2022 07:49:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmGTnpR+sQ5QgqMn5l+QZJ4qDZyYxCBBJhQ60E1a5LA1T5U51mhEFUBOKUg3imiOpYeOO4 X-Received: by 2002:a25:7288:: with SMTP id n130mr2755363ybc.52.1644421755063; Wed, 09 Feb 2022 07:49:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644421755; cv=none; d=google.com; s=arc-20160816; b=BM+Ha/mDe9M3ZROUZ2RtmX9vX/200qulVql1rgjsUHQMWTEMYi3nc9E6Tm0n820OJr sTPGq4bAz2H4UkOqe+Y6J3RB1RSXGuKMNNj9tXoIp769MhLkWKUI0ymlPFsRKmaqH/Dh PG2O7xQ8st7lEr7xnfR4BgisajVpqqVxHj/egpLbBcfMgRrw3J0vzR9kxb6l+sojsVKi Wp08uDoSTkKW7t8xsFvUlS9BkWX/1SjsmmJsHbvWDGYjnoqBGAnIlT5pkPKTETWJdxJ3 VoMfm6Monwd7iirNSFE4Q5p73D5wtr/lx9BquDWxGItGbnnrni0Sj+nMykYOmNfA/ToA TbPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=cejMymT5qp+YN89i5F2QmBkgBmNSCMmO1G7UbfovVP0=; b=BTvMLR1Z6vZH2RuWr4dLTe9rJYMreYNQDChnRIAXJJj89vTx1Aq7/2i6E88uYH1Gat zGssmJ032jLww8a6rOAsETTTdliEpnrukmFmP5SikXI9ZexfnegnY9mJXO8szP1TISpG Gn6xIjSK+mWIE8tKhz7S65LwRHi+rHDZia2n7L8VkJ7VApdkYVo6J1Dx5X3GQGUm5J/0 8xy2CypmHxY/RoCIvtnAQX5t8n8C6qISJQOLTX87YH8dsOAeh9nYXVv7IbjUkY4v8p4Y iLE3TxhWD56t5SUx8VzX9M4ivMe0FdDJOFV0onoxyX2MTXSwFVwg7vgLq/DgsJMjwRuQ YhdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=k1eIuBse; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v78si9031068ywv.455.2022.02.09.07.49.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:49:15 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=k1eIuBse; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHpDW-0005aQ-Im for patch@linaro.org; Wed, 09 Feb 2022 10:49:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHntv-0000Az-7w for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:24:55 -0500 Received: from [2a00:1450:4864:20::329] (port=35328 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 1nHntt-0001Kk-ND for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:24:54 -0500 Received: by mail-wm1-x329.google.com with SMTP id l123-20020a1c2581000000b0037b9d960079so3332508wml.0 for ; Wed, 09 Feb 2022 06:24:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cejMymT5qp+YN89i5F2QmBkgBmNSCMmO1G7UbfovVP0=; b=k1eIuBseKvFST9GUEOS1XvhcffkZnI7j4B367F933k/Lnu94wIFiO4w576S4G5de2x fFl8KRyTTI6Uoh7P0MsIBBeKJ9VZR+WKpeJVlpva7E8tIBO7jaX66av2b/1k6nFTDAmq Rj9FuPh3KVEAnSMZLErS6IYFebI4344aiNylAw9CDWKEdeP2RrKWfx+LcM76r0Gu1HWa nNhXRx1YUuKKRWpN2rDS3GQXfVC9pU/jiwCfBAUWWFDiWCapDb/xTrGfKO9qMXRpHAZJ r4BhwaZnL8mQdGBXjjAy44U424uR+ELY67ktz5uJlOmh3uTLsIDylQY/6apzAQrNUSnp Ub2w== 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=cejMymT5qp+YN89i5F2QmBkgBmNSCMmO1G7UbfovVP0=; b=OifQVHYHV2T17YVaSsanpcfKAURZHumwcxP/6XQe6Jk/9ec03egmo3e5VhTE4j5JXd w5jrlOY8pMg2velC3kSBHIfp8TE51AZk748v9Uy3Woxx1DOM8jndLcJ0TK9WknQuKny3 GRorKw4RujOrT2+gvlZJ0BdJSg4fmCWSOAbNZZl/A/CzK+ft2UlFTtt2Ts9z0MdqdF+2 2soLGjHuRLbxDlbJY60/aIe0zksW58b5H78cU+qjB+iegf0Mdt4hHlj4CjKjApraqaMc yjC+ht+yU0Xsg2cnS5lNXcY2psNF02wEoTYi72DpOTVhq/gdbVg/T1prt0uf9+sQKiVv 44xA== X-Gm-Message-State: AOAM533AvIY7NkUAJJkEFrEeZRksE6k8CY+tjqIwkvBgFNLoYvNStqNg SbfXXlucP53+IZt5Cv03FC9B2T+tpN+0zw== X-Received: by 2002:a05:600c:b50:: with SMTP id k16mr2804510wmr.63.1644416691913; Wed, 09 Feb 2022 06:24:51 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n7sm2789775wra.5.2022.02.09.06.24.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:24:49 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 373661FFC2; Wed, 9 Feb 2022 14:15:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 10/28] tests: Manually remove libxml2 on MSYS2 runners Date: Wed, 9 Feb 2022 14:15:11 +0000 Message-Id: <20220209141529.3418384-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::329 (failed) 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: Thomas Huth , Ed Maste , Beraldo Leal , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Yonggang Luo , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , Li-Wen Hsu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé lcitool doesn't support MSYS2 targets, so manually remove this now unnecessary library. Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-7-f4bug@amsat.org> Message-Id: <20220204204335.1689602-11-alex.bennee@linaro.org> diff --git a/.cirrus.yml b/.cirrus.yml index 02c43a074a..7552d70974 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -32,7 +32,6 @@ windows_msys2_task: mingw-w64-x86_64-libgcrypt mingw-w64-x86_64-libpng mingw-w64-x86_64-libssh - mingw-w64-x86_64-libxml2 mingw-w64-x86_64-snappy mingw-w64-x86_64-libusb mingw-w64-x86_64-usbredir diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 62dd9ed832..1df1630349 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -44,7 +44,6 @@ msys2-64bit: mingw-w64-x86_64-libssh mingw-w64-x86_64-libtasn1 mingw-w64-x86_64-libusb - mingw-w64-x86_64-libxml2 mingw-w64-x86_64-nettle mingw-w64-x86_64-ninja mingw-w64-x86_64-pixman @@ -80,7 +79,6 @@ msys2-32bit: mingw-w64-i686-libssh mingw-w64-i686-libtasn1 mingw-w64-i686-libusb - mingw-w64-i686-libxml2 mingw-w64-i686-lzo2 mingw-w64-i686-ninja mingw-w64-i686-pixman From patchwork Wed Feb 9 14:15:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541107 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1422416imo; Wed, 9 Feb 2022 07:11:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1wUt8v67gd+H8aZDSq2s5g8R/MmWkAonaw+ZldZC2+4Ms+lfS7+rK/BOpTYSyiX/oVQtY X-Received: by 2002:a05:6e02:1686:: with SMTP id f6mr1290771ila.275.1644419513528; Wed, 09 Feb 2022 07:11:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644419513; cv=none; d=google.com; s=arc-20160816; b=vmlVgb3qntIeVjdTBO0GNjwEPrlnSa/NZ+3wE5kSlKDK2CILM5zYVuBsLsyYGkYUKI WtvhLpIR2pz/u+m5bk6mNF7cHtXY8y98WUj2jX/+lPN2F5Xwxc6K3JXJTuzuKI6M58lr fzgEDz9B8Jj0qtqGt87CsdWLdodNcannoDPcrArg6alebevbjfddEx4+AlImd0vTKWeM X669XpNAAx4ai/RBbQP9TiPMY8vVCfBx5NqC84zrFj6+EqR+XVvI7vDBHP8mZLj6OnSD g/PwaAAlxLEno9UJq9ecQrY2C0yB/ezEAvdOnQ07EmCV1ZxrXWNDqV2ZUjeY7/n6LTtD gNww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=QZ790G2I3UeySFzK6yKCGZIct4D0K3V4i48HVFMMPoI=; b=mCIvss8BFHf0vc1Y3ZOHU8djzF9XcxriNeCxPAUOQb1ZsghOMkaWKPQEYX7yfQtq/w FkTDJMr9ivxsywoLUYq8bLWABS5Em06uig+WrhCu9BazMQT6cymdVyXwdZiwSp1J4nBJ NeaJP/ZmncK7ZJf6Y1vFQG9DFXC8pKJbiQZJra8Ba2Xa8XXimkyjNbb1K4SRi1E7R7Id n8CLrdeLgOeRI2/8FIQ5yKd0OE1qYi3LwHFulRJKjQ8ylvSIy1cTmo/835hHNnbDc7n6 fqTiOdIgnYFxHXmNwfcLFfI7P04COBZ3X3rMu/pfBW6SMf76eIDwdk/idKi4t2r2s4Bo VlgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Y2mAi9KC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s8si8227035ild.147.2022.02.09.07.11.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:11:53 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Y2mAi9KC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHodM-0002bA-VQ for patch@linaro.org; Wed, 09 Feb 2022 10:11:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHntu-00008e-KE for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:24:54 -0500 Received: from [2a00:1450:4864:20::336] (port=39895 helo=mail-wm1-x336.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnts-0001Ki-RM for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:24:54 -0500 Received: by mail-wm1-x336.google.com with SMTP id o1-20020a1c4d01000000b0034d95625e1fso3274667wmh.4 for ; Wed, 09 Feb 2022 06:24:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QZ790G2I3UeySFzK6yKCGZIct4D0K3V4i48HVFMMPoI=; b=Y2mAi9KCIaDep0o/UElhIVbUe/0bLB57BkeI1MOSgR5jE1jGAwS5dyK2LbSXTnRRGs 1uHIdYJ0e95x+4YZ4dzi5Ankwfcl7GkEW2dv1P+lOK74NxcrDtfjEHCPcA9WcukHqs7u 16aEC1FrJpJkcsJhV3s8vSH1WmgMe9PfwpoZJBuwDH/bQ+C4S2uAdYVN/N0yPHpUtAx8 jsv90t9POTQVqB0wo8MDtNpaqco2QqNo1qW8n0LgC4A6YlO8XrXzf1dmMgzSgFdbk8lz 6uwErDE3v3MwJOkChchq5F0CFB8ItKCVnR6pR9PdUqSue92WIDs4nNWywGFOlkXZFRIM qlJQ== 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=QZ790G2I3UeySFzK6yKCGZIct4D0K3V4i48HVFMMPoI=; b=jvdCEKshYp4rgaMUp4qtCJvMDEHLNzYKeurbk2Daw9XIG7Ka1m8/4ieq9GlXCntKYA fhGQiHigVHTTMP/uT+hVL+upM3VRVnTLIO/GQhz2pY9dvGWucHYBA9bgThOhHs0yAggS 2zbFBDylwqVrr/YrEvj0+g6racG+w7P+EjZWlYCZEhXZbjV0x2eMSJcLT8h7iIb6zXMT Pnz4fuT4/km3zLwlk2bHHlLzN0ugyg2mq284ZpS8/v/kD6+OMWVP23mcMMKxoqZwDwv0 ZV1jqExnHmjG9TUSHOX6kmnL8cT/lPAtbjesfjk3PnKQcn+q5axPqvuVuolt7Tzr5Lu2 QV7A== X-Gm-Message-State: AOAM531NJy16z4FVXYO8386CTytCStsb4CnEo1ku4Pa5cq/3zC678gVq Af7npXWj2eMyO6UEpK4+v7ZggA== X-Received: by 2002:a05:600c:3641:: with SMTP id y1mr2268805wmq.53.1644416691158; Wed, 09 Feb 2022 06:24:51 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w3sm16466912wra.67.2022.02.09.06.24.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:24:49 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 52B761FFC3; Wed, 9 Feb 2022 14:15:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 11/28] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Date: Wed, 9 Feb 2022 14:15:12 +0000 Message-Id: <20220209141529.3418384-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::336 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.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: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Beraldo Leal , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé On Debian we also need libibumad to enable RDMA: $ ../configure --enable-rdma ERROR: OpenFabrics librdmacm/libibverbs/libibumad not present. Your options: (1) Fast: Install infiniband packages (devel) from your distro. (2) Cleanest: Install libraries from www.openfabrics.org (3) Also: Install softiwarp if you don't have RDMA hardware Add the dependency to lcitool's qemu.yml (where librdmacm and libibverbs are already listed) and refresh the generated files by running: $ make lcitool-refresh Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20220121154134.315047-8-f4bug@amsat.org> Message-Id: <20220204204335.1689602-12-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 003ee2cfed..699f2dfc6a 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libglib2.0-dev \ libgnutls28-dev \ libgtk-3-dev \ + libibumad-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 8993d2d9e0..87513125b8 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -53,6 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libglusterfs-dev \ libgnutls28-dev \ libgtk-3-dev \ + libibumad-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index de51a2f1dd..958868a6ee 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -43,6 +43,7 @@ packages: - libfdt - libffi - libgcrypt + - libibumad - libibverbs - libiscsi - libjemalloc From patchwork Wed Feb 9 14:15:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541119 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1462332imo; Wed, 9 Feb 2022 08:03:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJz6gsDMyeSZGif9qAS55Ls/xCc6vM+/OGI5fmgnaQDcPbYzAEVC4EmzHdg2se8rkdsAU32z X-Received: by 2002:a25:db42:: with SMTP id g63mr2755537ybf.25.1644422595553; Wed, 09 Feb 2022 08:03:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644422595; cv=none; d=google.com; s=arc-20160816; b=sJNu90HJ6oEHLnitwVb2CXAI4+xQALw6tvdJ9YgRwSea6U8FdhODSf+zz8CiHTKZ7H uzF22qWnkB2nJKVg9UWo4op4kZbDFEFIO8PLoKAXM6yze/Oqc4M5xIyqXfX6b+PCKpA9 nfUVYjCXNpiLqmD4bZ6M/lrc7Qn8ICg6DCSdHtyOT1jhGU6Qh/otTdCRg/dxNRk9Doka MbUz8/FLSXxMqNC/XNfsc3JG3FE+BnQZxyGO17tbP6Gcxv3a53Kqsuf98ZnaTR6UPpGi 3eq8RAoXVMKvFHJjz0OIeRAIAPN8zEBrpCcTk14eaW+5dEhTcSVM3/hbo9roOaKszZb/ sE8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Vf9iTlTyab3aq8/aOgAjLPkNDIjXIy+BHgS2c00FPUI=; b=SHdzYOuNwV8jLuU4e2gJdlR9ygr6dsjvYI6aROdJsNBuf5YK6P/TzqWd8xEVkLKNL7 RTgzCjIkkrU50rOIvR1nKmFvhSEBXnggasX2JLeuca2VnVpzm5IDzegGVna3dVBi+r06 q4+CIVmkjfxvVyb2s5d/g+W+hw9LS7Z3AGWfJb3hQkt9eejmEQipRzbJ0Aopwuvqx+IW Oo+1tlVxv8FAlepDgwiF1HoDyLwd0+A5hXfSwzY16aa2Rzm5OQSGaqCeKVgIKl35+I8S pdRJCOVe+pPpAF0cbSPAKS1rqPjEollAPo/mQCwxj67HfIZcQczXU0bIr6rITRiRY2/R R4zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NKehSxMJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c9si11612936ywa.220.2022.02.09.08.03.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 08:03:15 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NKehSxMJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHpR3-0000Lj-PB for patch@linaro.org; Wed, 09 Feb 2022 11:03:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnll-00030P-E6 for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:30 -0500 Received: from [2a00:1450:4864:20::62b] (port=36591 helo=mail-ej1-x62b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnlK-0007s0-Cc for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:18 -0500 Received: by mail-ej1-x62b.google.com with SMTP id u20so3442054ejx.3 for ; Wed, 09 Feb 2022 06:15:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Vf9iTlTyab3aq8/aOgAjLPkNDIjXIy+BHgS2c00FPUI=; b=NKehSxMJ8BRqpMuqTRhX7kh1DfAXSkZSQFbGKjiFZyhDU97mdnAwcXomCSOPEipUw4 aQwyOQRoe6Eiun2+WaaCfOFMUI6jDuDJ4mn9dBfkNnnV0y21MIobVb1/PKSFXNJTEdom Hfavo1u2W6Z5WSzDGIyTPQlOVko3MPOcx9koxhjYYlJQ2sNIzt5CWTmbgHC4XotX5jt5 LvflX1ZTfMV/XCxm8pVb4qI4hSz5EwSRhsby8tT7XCuSW4urYMLgSJTaNURmRp/+b2yt P2gTLCTwkwmxCnrgvRWaWHEcYX57CRVftiqgokNbkWedHOTn5XDdrYVYqq+BXwY2cwvh BMYw== 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=Vf9iTlTyab3aq8/aOgAjLPkNDIjXIy+BHgS2c00FPUI=; b=F4kI2goemo/aipUdfJdLOOKcsHWWpo2TP7TppJsM4TBgYTLmyNLtt1kgCCCcAdGnnb xulobLfBHcRZDZ002oXAmwFqXQTY0CQw6cdLF6QWv32y8I8usSjxx6Y6j1x9CQH6r3u2 tiW8VnKzP4EwOtTIHMYGtsF9cYqKpTO633QcZFjFzGthLVlGg0eyB6cArkmKR8cQuyxU btExVrPpI6j6rvs+ndPQHBPMa1fBKfs9BQQDNCSl0fpfyJKgTXFXCLG32Qe0hN9cUt4J e4qBS9JUvs2tZ4c+Oi1CtqZWIzsMnBR/yQtMVEJOGGa7BdLAcUvlTaXBs9ZbxcOhXL4r N18Q== X-Gm-Message-State: AOAM532jJsJXa3MUt4gg9B0PeSgyrse8KmHzkvl3wtHJzlFXOJ6rZ4ZS ykAMGyopRqxazNyJnyZpJzjbkA== X-Received: by 2002:a17:906:3c18:: with SMTP id h24mr2199654ejg.403.1644416144739; Wed, 09 Feb 2022 06:15:44 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d4sm3353229eje.21.2022.02.09.06.15.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:37 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 686AB1FFC4; Wed, 9 Feb 2022 14:15:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 12/28] docs/devel: mention our .editorconfig Date: Wed, 9 Feb 2022 14:15:13 +0000 Message-Id: <20220209141529.3418384-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62b.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01, T_SPF_TEMPERROR=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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Ideally we should keep all our automatic formatting gubins in here. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220204204335.1689602-13-alex.bennee@linaro.org> 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 ******************** +The repository includes a ``.editorconfig`` file which can help with +getting the right settings for your preferred $EDITOR. See +``_ for details. + Whitespace ========== From patchwork Wed Feb 9 14:15:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541104 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1414597imo; Wed, 9 Feb 2022 07:04:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJxwqlPg6lCseFsUIVrtts3WtquHTEPD+fe3NBT4lRmJWF8+a/vppiOgCAltPvgXdZBkoCp1 X-Received: by 2002:a5b:e83:: with SMTP id z3mr1519050ybr.318.1644419041420; Wed, 09 Feb 2022 07:04:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644419041; cv=none; d=google.com; s=arc-20160816; b=g+0keCvoLgnSCZUUoDiHRTJozeWnBAy3FybxtY+6WYYGYHTwshaGrywxnfGoO+E4zw LPgHuhUUc5pqn0OHa7YQDMuPd4vh42wSuLuPL4dBpYQAQn+zUHsOqIObUlTmF+UDR9z3 QfNFLjYvLnYx+0rAsvJ64n1ui1cr9NiVqI3qcuWpN3LoHJhREsbGs3zxPUe4dAW6c3bb HBYvJvkhjjtUszShcTHsR3sn+/NCoidWewhqRcRxeN5HRZm3OS+g7W9aJQKbyAFNzYM4 Dvw/VQ1XoHldrowpRvrDToUexTvMVnSUp/CK4JioPdln1ywcnYkwL1Gd5YzvURmXHB9C LSCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=CVpYJY8/v7LNfM9dUETq5TipA+OkYAaNIcnr10j39ms=; b=yiWfkQmIxNdcDuztkBw/3DDYcKh2L4VbRrruROLcgFCqoHL4FehzVzYrHJTqQizgfL WjFdR9bsXQeu2y5XWrWcrCohEjWY6GpFw0MCph0KxLGHFqtzchWIm1SSvtbhIZouDtRt C7KfsEIFBx1jYIN/FZntvk0WGpaGjUlZkHpYwJLtTtdBKXGh5rh6Mn9rM1jQwCwlg0zY msw/2ouXi2z9mWKhcIu8xQ3e9NbYG96QJMHzqd5lR7y2Pi1UsdXV0H6KPg57I7cspsNR LYLCcnxMDSGo7YP3B+aUG1OYU3T55FE/zRu7c4APVxUzvjgna/YXb4ET+MAT2cl7eNEY 9jxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cbE7LVLc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o70si4626114ybg.455.2022.02.09.07.04.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:04:01 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cbE7LVLc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHoVk-0003Pe-QM for patch@linaro.org; Wed, 09 Feb 2022 10:04:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnuC-0000jf-4l for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:12 -0500 Received: from [2a00:1450:4864:20::330] (port=52817 helo=mail-wm1-x330.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnu8-0001NN-Ss for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:10 -0500 Received: by mail-wm1-x330.google.com with SMTP id v129so1592083wme.2 for ; Wed, 09 Feb 2022 06:25:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CVpYJY8/v7LNfM9dUETq5TipA+OkYAaNIcnr10j39ms=; b=cbE7LVLcdfW7eKfR/wPWVWl7KFudveAWtBAnc0BEVRvNjmHq7b7UeP8T5gxdK+xNz3 NAi7jIfPWiFtsFLSrkOd/h1enbp+DR6eDpsm5YiopLDlSkZQUVE4zFg01fuAu1LoYmCp vu9NQrgcPdXPxL91X9B5C3WYSyO0GP/Uj3TqArRUDgnh/l0wwkC7dHB+2cph2BRiLDAd KR/40dDnwysVtRNP1tZgQH1SZgfv9CwSBXCnE6ihufzpS8ZsIOHxfTlsoNBplrF0vbMr LN25zD99j37zUQjrh1Rv3DbG4OG53uEy8TnXBj4jtIn9hNEybt9ZxwYMxqEPH20FWkPV eUrg== 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=CVpYJY8/v7LNfM9dUETq5TipA+OkYAaNIcnr10j39ms=; b=ULdAFFR7bnW7AfyMhwtcvM46KwzNBN2lr/OQ9u8if4Mji3YFd0PlwzqKBPbXzyWzm1 PKZrEm9bZz/+MVwPTAYYptN69fXpCYoK4DQnggRLFa8ehw1zkMCFGb8tNTxjMUSra+sz l2pZGsmnw3EO3lnD20XljvrHybp+2Gt2/CgBo2S9Ql6bBf/qkvv7PZeHJxFgmJbCXzYZ 8Bc4M8cdi1gUfzqcmnICmtNyTYMruU1RK8MAau4tsXANGW87HVlBcbs6aZXA4F4cTeOp dtDdrdTgx0j7CJWYWTjmRYHyhhRZDbFWYbcKfU2//VnkCYSCfcZ83LloNgQ0CNJwhCuz 37/w== X-Gm-Message-State: AOAM533Ljg6Ibas1lEyfnl5ERooVNyNfTR81HUSptlIFNQY0+pNV79oE eyBopLB/KgzttcCNH7lkCPOAIA== X-Received: by 2002:a05:600c:1e0e:: with SMTP id ay14mr2767515wmb.118.1644416705011; Wed, 09 Feb 2022 06:25:05 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o3sm8989473wrc.41.2022.02.09.06.24.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:24:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7471F1FFC5; Wed, 9 Feb 2022 14:15:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 13/28] gitlab: fall back to commit hash in qemu-setup filename Date: Wed, 9 Feb 2022 14:15:14 +0000 Message-Id: <20220209141529.3418384-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::330 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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: Thomas Huth , Beraldo Leal , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Greg Kurz , Gerd Hoffmann , Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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="$(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é Signed-off-by: Stefan Hajnoczi Reviewed-by: Greg Kurz Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220125173454.10381-1-stefanha@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220204204335.1689602-14-alex.bennee@linaro.org> 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=.exe" config-host.mak; then make installer; - version="$(git describe --match v[0-9]*)"; + version="$(git describe --match v[0-9]* 2>/dev/null || git rev-parse --short HEAD)"; mv -v qemu-setup*.exe qemu-setup-${version}.exe; fi From patchwork Wed Feb 9 14:15:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541116 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1454158imo; Wed, 9 Feb 2022 07:52:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJza/5/guY0XlAy5As5j1j7ikclJZBsJ+5OBBg5ZvytBcUXE3M1wMyiSpjFM2XshLdB1ISPO X-Received: by 2002:a25:cb90:: with SMTP id b138mr2733340ybg.33.1644421967107; Wed, 09 Feb 2022 07:52:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644421967; cv=none; d=google.com; s=arc-20160816; b=Y0zm0HL+6Wa9+7Gm6UZD7EPKeGyUUVuPHiL5e2KNFsL9fMJu11hXmenbH6k7dfP9df y+TZWfOt/+9rTpHVQ4qeHtxIVd7Eo7QbdJAFQ9ARPDQwZLiVWpKqnBUeuyKH2bg4c3U2 8YoNgrTpy88t1i+GbRpq5ohftmKvckE7WvI1XVpWPSSNlRZ50puKIU3fmgcWvpJQjHnk u2fvDSklNN00LzBdrVm3Q7rXOXH4U2kTC36RkZ2DlJyM/aV4DFJMrfNXYkutZr08ZJ9A fw1mxkfOuTse/MA94iDro+3Q/DxHaXwuZVsX7QzhOpu4CVi17+gLrc9RgeKqHkI61vJt o3sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ZTK/dwJYHU5b0Z0hIpEUNs5Gx8mM9m+sAjjUk0LWGbw=; b=WUx97mMxqdieyG7AwiCsKIabpIL8elElBy9s/L9zQVSFWO621KiwGA13cUtCBTIvcB UBeWzvbu8uKyZf3OwLHge7Sm5Nim6Wvnfe4uMoin8dmW6l8a+gj6Xw13O+PUD81qOJpB 5TMxPW33Q22c0XgYt9OobkXvnat2f/m2yJmvwPppzxc0LdJcua72is8IrGZYP4m9pOls s7xkDp6u/bVgUQc/joh3fd3WXmducEkuAJ+cyJ21dY6fjHcnA8Fvp8STeKN41AQaR7l4 31fXtrqKoAaEVoiqWxgzAE1uIPGZT8jhwmFFYPF0c3z3R0uEmUaNi4ks6uC/Cpw0m/Pf R6DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BCL2G44q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c7si9316870ywa.67.2022.02.09.07.52.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:52:47 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BCL2G44q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHpGv-0007aQ-7V for patch@linaro.org; Wed, 09 Feb 2022 10:52:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnlk-0002zu-8d for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:28 -0500 Received: from [2a00:1450:4864:20::630] (port=42530 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 1nHnlJ-0007sA-2w for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:08 -0500 Received: by mail-ej1-x630.google.com with SMTP id m4so7692832ejb.9 for ; Wed, 09 Feb 2022 06:15:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZTK/dwJYHU5b0Z0hIpEUNs5Gx8mM9m+sAjjUk0LWGbw=; b=BCL2G44qwj0s/w88k87ad+VB8sv8zMjhEmcIPKCA7r33DfYGNlVAYzMFLcyKk698A3 ZR89T4Ppr81egcZFNzydqnnqQrlKnrdsCOFT39lCiJx+yfFcnHFowGTJ5lBQv6ML5G9d ABvlapDSZosizkYMS/zxzNoFx0LAJfaVFyIovRoTMpQk9b3JaPmJxSk46QtLMTHWorHx 6h+nyUb9ohk4OgkLlUAts2FdbDBdlBlYROlxoZZ3JpN8Uj196bS4SX0oTWlzQDW3P5+F oQuOOYQMUcCQdMWHnLBr1RswBHLz35NWpcskSvI95qbjW7xcH11FJZatwSzSs7ibCP3J Y56Q== 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=ZTK/dwJYHU5b0Z0hIpEUNs5Gx8mM9m+sAjjUk0LWGbw=; b=p9L/C0AvZ5su/PYQRNTuQotSP/h3E9OqVxtUZCldvBdKWm/JW0+XLHkFVaRtQw2TKk a2PauUktgdY2uz/UYWg84P46xAW1bXZsBj99j/bbuWu5fWGiHN9g/L9bp5h3B42AnQnQ OivUwkcXYF0jkahNcJv0WBwxlX9AVWQ68wLatVAsBXNj4Fe7VLYLizaRlGHLzb2Iw3yp cSKT+Enm61eVf1pqVJM/geTE6uxdxjQRaNXqc4iCXvpekK5U+CuAeNT2ZDydL5nGxmyc 3EvKK7inMFyN4HpI/pxv63tt46HH9GYgIGMX+7hrgY18gDmW4RA43cxK/dCirTnVUgNQ e+Xw== X-Gm-Message-State: AOAM532staiqlZTCFtKEvXEwwXbM8WmG2VDQ3xAfEDD2WpJHAUN8Bxn7 ph8NUQT4Izo7QXDa+PVXyC4BEA== X-Received: by 2002:a17:907:7294:: with SMTP id dt20mr2161296ejc.535.1644416146293; Wed, 09 Feb 2022 06:15:46 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id yr3sm4359270ejb.166.2022.02.09.06.15.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:37 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8A4D91FFC6; Wed, 9 Feb 2022 14:15:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 14/28] tests/lcitool: Allow lcitool-refresh in out-of-tree builds, too Date: Wed, 9 Feb 2022 14:15:15 +0000 Message-Id: <20220209141529.3418384-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::630 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x630.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=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: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Beraldo Leal , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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é Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220201085554.85733-1-thuth@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220204204335.1689602-15-alex.bennee@linaro.org> 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 lcitool-refresh: - $(call quiet-command, git submodule update --init $(SRC_PATH)/tests/lcitool/libvirt-ci) + $(call quiet-command, cd $(SRC_PATH) && git submodule update --init tests/lcitool/libvirt-ci) $(call quiet-command, $(LCITOOL_REFRESH)) From patchwork Wed Feb 9 14:15:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541117 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1455804imo; Wed, 9 Feb 2022 07:55:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwRKXlyohqT0HKVQ8vmHVTz1dCOeRR5e3gKJPsi9xxs+OL779X+Bb+cimncfR5PQOggIZF1 X-Received: by 2002:a25:4146:: with SMTP id o67mr1554390yba.51.1644422106078; Wed, 09 Feb 2022 07:55:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644422106; cv=none; d=google.com; s=arc-20160816; b=cnVD2yytDEJ+JPfI2t2R/z3/MQfOw8eHwHhjIekWXMalb3kP6pN0Fjts5xDJeARIy9 pVhTfnCEhwgxBKsptRKOeELACJSzXcLNwfNnAB8E/sT9DcsAa12mRJAPs1jx4FxK/Lir gcdy8qOgzoTsRKEBSUT5c1eg+mUG3zfjxCrtKkRW6brmV38XiwI+ARX9WxzE5CG7+4vm KJlAnQaFasGQuxqlNbcjoSV9w+AY0XnOI+rUCBjZGBlEJLNgeGV9D2gh+rHYkrnEJjXo tKryias4e5r7wfALp8EIMPtgPZaek+xTfLZwFCIHSFUKGou/LPvApbplX5s/8tI3sekj SfGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=v8UfyzWf3r+2lPwCD7ItMY00LnQ/yK7iXTXYLE56BSA=; b=uY2xgpDNyuWe5VM54wceUm3yRv32PE8MM2DBa2bj4X9ZWPoyobX1YRrOO52uZXqmvd rkD/LTEZYTzpV+nPmd8oLSFEgbLvHbyTpZ3CGah72FXEr9kI3J3ysCDsSjoUOJdxZGBv UQP7BLwRwih0zzfDgPIJf1ZZwO0fZwa0uWLbD9V92eaEp3Lv1ASUdRnZCnMcWjv5ZNMV AHySAq00iwZYcH8W5gXEACdcYtz7GwRTDWoLbeZnR4Y1bd2QIrRh/T0scVfSlApaYpS7 CmDOIjkz5WjoTiBhD3iKLkqg+qq2W88SecPnAXmBqF+TwwjaxNuv9s8GyloHFFbETFhK 9NvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Kv6WwqFq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 16si3666070ybx.680.2022.02.09.07.55.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:55:06 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Kv6WwqFq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHpJB-0001dx-EY for patch@linaro.org; Wed, 09 Feb 2022 10:55:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnu0-0000Tx-Gv for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:00 -0500 Received: from [2a00:1450:4864:20::329] (port=42835 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 1nHnty-0001LT-C7 for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:00 -0500 Received: by mail-wm1-x329.google.com with SMTP id k3-20020a1ca103000000b0037bdea84f9cso1712545wme.1 for ; Wed, 09 Feb 2022 06:24:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v8UfyzWf3r+2lPwCD7ItMY00LnQ/yK7iXTXYLE56BSA=; b=Kv6WwqFqeEj0JenTJ9U5MY+rmmTxQmqGqDxOGFOx0H4htBUJWjGJvuov3dkHuWGmjC nB+gl5ikF5dRXgQi6PSY1SEyuQcSjFWtfpzUNqbUDJ49bMcsNL3nY1FiaM3N9vA2tIfY WmAmhwzOO2WvTUPFKduw7nEoNAXG2niVk3tC15GDS4FUge2bxsFgd+BhHmq03E7jEmO1 47znQ1Jx/VWaszoNfLwsZMGBocqW+v06362BonHi5A5cFj2fEsyjIeM/c/ePbSUjR2pp dncNW4DnjL25WvdHgREBvQOQOoejy6AOguS8u4SrmZNaV72MWNmsk/Rbc0cA0Qp0utGT 9YLQ== 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=v8UfyzWf3r+2lPwCD7ItMY00LnQ/yK7iXTXYLE56BSA=; b=bvDp51Hnrd31mcu1x6iK7MSFyMXd3ARMf6bAmT49rlLSb6O3X3VGXraArfi9gL4+Z8 yf5o4XpqzExzpeMVRpk0r1sDozOLCw1SCSB8eZ3F2YqgObijvHTN9+lKjY+WJYR9kBQG oZZzIv0t2GytFaqLCqhMgs2q8Eg+9gs1jjiAlLoSajMQKxD4yz1fVRDWqTnEYhwO+vTA xZpo5S7PegbM9c6B2EkFaYH5+4IS9S4cvI8HFTTpNCog7WyqbQiEviUC2Bb/2v4z5X12 8+XWybMbHt+5aqqnx3sVG/9yKCKbQvTp7QWKYNV3ztB0mzFVW4dgRwNXMQiqmpaeHoJv eFRw== X-Gm-Message-State: AOAM5339nmy7zok7Htc4c1xD2kHA6BLcftFyS9tlCfd5CSz0797aDyXL vU57m14cmONxlza2yFw7qT172w== X-Received: by 2002:a05:600c:600f:: with SMTP id az15mr2310588wmb.27.1644416697102; Wed, 09 Feb 2022 06:24:57 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f13sm5583596wmq.29.2022.02.09.06.24.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:24:50 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9888D1FFC7; Wed, 9 Feb 2022 14:15:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 15/28] tests: Update CentOS 8 container to CentOS Stream 8 Date: Wed, 9 Feb 2022 14:15:16 +0000 Message-Id: <20220209141529.3418384-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::329 (failed) 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: Thomas Huth , Beraldo Leal , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_B?= =?utf-8?q?enn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Support for CentOS 8 has stopped at the end of 2021, so let's switch to the Stream variant instead. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20220201101911.97900-1-thuth@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220204204335.1689602-16-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index 3abac7a8b1..3ede55d09b 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all centos-8 qemu +# $ lcitool dockerfile --layers all centos-stream-8 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/centos:8 +FROM quay.io/centos/centos:stream8 RUN dnf update -y && \ dnf install 'dnf-command(config-manager)' -y && \ diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 25301f2ef0..4ab90a310a 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -77,7 +77,7 @@ ubuntu2004_tsanhack = [ ] try: - generate_dockerfile("centos8", "centos-8") + generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("fedora", "fedora-35") generate_dockerfile("ubuntu1804", "ubuntu-1804", trailer="".join(ubuntu1804_skipssh)) From patchwork Wed Feb 9 14:15:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541109 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1428103imo; Wed, 9 Feb 2022 07:18:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJxtJRDAI2QNdidztfdYwX+dCtooWws+aSFV2kZAGY4lx3SXgt3Jq1A1BFJNnP2Sgs9do/DP X-Received: by 2002:a25:cb02:: with SMTP id b2mr2616723ybg.243.1644419880822; Wed, 09 Feb 2022 07:18:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644419880; cv=none; d=google.com; s=arc-20160816; b=1H/fE3qs3pBpxD9dcNp6NPsK/AvBEFZLlCWitcRnNuzAvlrAF2EHYC+drHH+Fzw3Ft aVM0aO422PAGo6u1Y27rJQ68DoJteu9XGsDDRkAQFjUz+witWFOzbjmWU1rlhuAkqoKd arqXPTgMi35D4jqGYT1THQDWY6t+8B/k1oPU2SFJkpBvgKUYlibJOzjzM9T774XCxARH UP6hVasB+EK8oFPg8CcHwZRB2bjoyUM396vmMqyRsyJYPCDruKT5fW9mBpP51H1AGTGq yiUI/NMa5/uyxQy1BpU3aHxK1m57SisVPCIuYP4jJ1p/lsLRGd1lKM9+kNuIpelQSzZ6 1YAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=lukOH5svd/Hz95RpuYVLFtn5Xg6Jr0xu+vp1sdClrfw=; b=gsdvcxxcmAssf5sbdVr56jCiAKbVQ7sf13lksSaRkYNIlfcrGrsdpt2i3WyEDKfRQ3 mMmoWDhraR801D1d1osdtxCA0tKUAfT2CQLoHaP1hXICzD/JD20i+iutF0qVC9LqfOs9 MBLN4MhbXLV3stUnw/eW8VS1s7bcjkgd0oqu27dXT5JLmkJq5dM/tvUnWV8HblUqOyU6 CvpJ+RnUQrMOdrWJ1pQTFbmxw+6SAtJoMok3X4R4C3CSARVEDuUCQ9nzEAwO9YAyVZG3 xBaYEv6bDk+o6SVgCOYv8QabGD2JTqbGvO8tcJLC0uvgjD5LU8dG3RpNRsc3xhJbgCBn SPlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VJPDQ7xN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h131si9354423ywh.273.2022.02.09.07.18.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:18:00 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VJPDQ7xN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHojH-0000RI-BG for patch@linaro.org; Wed, 09 Feb 2022 10:18:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnu9-0000dv-7W for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:09 -0500 Received: from [2a00:1450:4864:20::434] (port=43668 helo=mail-wr1-x434.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnu4-0001N7-Cd for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:06 -0500 Received: by mail-wr1-x434.google.com with SMTP id i14so4307378wrc.10 for ; Wed, 09 Feb 2022 06:25:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lukOH5svd/Hz95RpuYVLFtn5Xg6Jr0xu+vp1sdClrfw=; b=VJPDQ7xNckzeDBnCtxEHJlyqlyYYMz2q3dTEhViRjAcde0AKaqLKqX2Zg46kJbjOlq oflkNJ2AEIgyCIFOTHd7TXH83LZHHY3YNhN7zTfRynJbd/io1CfgsD6aJZyNprEMDzOi bMqxQP4CTItOv1GwlzUa063D3UYStQxkgi2E2Lhuv1mCh6IB5msqkwzhvW5dj5ERAZvG 1y12udDlxzYqkXhO1qZHt6vRsBLH6hmGyTrD0W4B+Fe5GldbaTx3G9CqtcUeP84ELYrS edOLbhny+iBJl/rTGNdrnku6Wu9vd+RcC+I+lZKDG/HZiVcITL2mE74tFwCYwYfeWzKL G1EQ== 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=lukOH5svd/Hz95RpuYVLFtn5Xg6Jr0xu+vp1sdClrfw=; b=QZS/tf0Pee8Nm/9GTtWDHsZTuCAwQytqJbUQIeHhDOnEt+ztNCY823FlLkVSwfQBXp qLHG6+taTpWAKKguV/w06VKyIS/EqqSYzhMSuNeRiWP6rPLdefmbqX3eIUvjd5nIVZvK 5yme896V+DBaUXXu6RdKzRE19+FqNuyS3swu515389jOdy+ByO+0QwfDaW4tWnJDZp65 fMUUBO9IjIzKnw1x+wHQUZdYi3KlBFHdfbsS9qD4GBa4Qfhio+sV3bBy4UsrRw1o7VgA LjRY9CgvbsBy+t+VOte4AzSAny0giiMRILxPzpYQwohG2zcyVddd0/ClLWjLEjg1okR1 c9FQ== X-Gm-Message-State: AOAM533iMXZbq35VMjLjv1DyqiqhaF5tcW6veAr4wGNFWF1OHqAgWP1g 8AIGtwrpNBPFntW8UfW8ld4juXdbejdy5g== X-Received: by 2002:a05:6000:2ad:: with SMTP id l13mr2299189wry.174.1644416703004; Wed, 09 Feb 2022 06:25:03 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a22sm5062979wmq.45.2022.02.09.06.24.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:24:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ADDCD1FFC8; Wed, 9 Feb 2022 14:15:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 16/28] tests/tcg/sh4: disable another unreliable test Date: Wed, 9 Feb 2022 14:15:17 +0000 Message-Id: <20220209141529.3418384-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::434 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , qemu-devel@nongnu.org, Yoshinori Sato , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Given the other failures it looks like general thread handling on sh4 is sketchy. It fails more often on CI than on my developer machine though. See https://gitlab.com/qemu-project/qemu/-/issues/856 for more details. Signed-off-by: Alex Bennée Cc: Yoshinori Sato Cc: Laurent Vivier Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220204204335.1689602-17-alex.bennee@linaro.org> diff --git a/tests/tcg/sh4/Makefile.target b/tests/tcg/sh4/Makefile.target index 0e96aeff16..620ccc23c1 100644 --- a/tests/tcg/sh4/Makefile.target +++ b/tests/tcg/sh4/Makefile.target @@ -18,3 +18,7 @@ run-linux-test: linux-test $(call skip-test, $<, "BROKEN") run-plugin-linux-test-with-%: $(call skip-test, $<, "BROKEN") + +# This test is currently unreliable: https://gitlab.com/qemu-project/qemu/-/issues/856 +run-plugin-threadcount-with-%: + $(call skip-test, $<, "BROKEN") From patchwork Wed Feb 9 14:15:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541108 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1426989imo; Wed, 9 Feb 2022 07:16:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJz8VrzZJ5VqXkx41gM7/v+K/n8jYX2gdX+zsslDml7NI1w0AcBZM4O0bkzSZDUnBEQ6oL6/ X-Received: by 2002:a81:bc47:: with SMTP id b7mr2540441ywl.47.1644419801553; Wed, 09 Feb 2022 07:16:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644419801; cv=none; d=google.com; s=arc-20160816; b=xkUdsjB9wcQg+5Y9pBCa78/lruSDd6CLb3Mlzx3yIgkjwx+g0G7+38BNxDbOhAhxc4 Snobp8WXZZbK+sF4RBnjJkpAcbHrM4/WpS2ssPFbq3877tTziy/I2MFts+48jUs4KlUy xu8na3POHltUqgEXjbPUpCj7bJHYeAsmRiS19tAdA+neX0yLyiQNPNeWz+uSgs9Yqdug rFTjfS+nJkwTmqUJ3Nvo90w7ftbP+PbLZeFz+wZsXSt7p6Ji4yINlFwltPPVlvXX852w DNp6hh+f1CeAp5vO8xMe3qo6+zj2/geJfS6HpcmM/PHwsybInoBNkSI7qzAw+YfJO9nU 6zOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=KDjVKJAvjmvSznZtB3TgaDfSp2HabalO4ovxbecKq1g=; b=wqz4OjYBEdPlNSpKhuB3EpkZYHf5x8Mfm0QvKlIK15ao+4i6FFzDM+y3/SAU9sWkbZ iOvcfxN5B9X5RCwxZos1KIBOacPkiHja4ZdvYnP4mXxH7XCr5dnt+do1ar3bxokSNlho g73sr6oU5tJd0vHftHhWA3oCQw8ctjQBOTmLGeKwBEars33h8l5WsimK7txDYtn1PFaT ckLv7oGkPJyANQB1cOpO10/NB7hpTIO1A1mZnfOQB/XX5EHD+R+1llKLwFwXWSh3DvtA 4+uGnVjC4k9i1DUmJrgFWkFh0W2u56xzn4TnIN/7OWIQKTCLfOjNFJ5e9r7uDcVmIFta W1UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kWiRrUgG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h60si13236385ybi.573.2022.02.09.07.16.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:16:41 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kWiRrUgG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHoi1-0007Ql-0W for patch@linaro.org; Wed, 09 Feb 2022 10:16:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnll-00030I-CF for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:30 -0500 Received: from [2a00:1450:4864:20::630] (port=45770 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 1nHnlK-0007sk-Bb for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:10 -0500 Received: by mail-ej1-x630.google.com with SMTP id s21so7625463ejx.12 for ; Wed, 09 Feb 2022 06:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KDjVKJAvjmvSznZtB3TgaDfSp2HabalO4ovxbecKq1g=; b=kWiRrUgGJT7MHrlhNPpe/4aZnXVe8cyDWrDk0qSC/diTi66p45HG78nr4WPiOpgp7b LcBovlBXzOlGZ1svEPM8xN84ETm85KtbLYTkhuksj/n6+mRM5Z1Dy9oDDZ9pV1vXUYt7 hmViJAl/eQTWobxP1x63ptTh5glrv/Lk2aNnh2t7YIvbLDAstnthw1l6tSCT336Qq8ZM qVs28AGxSJyJm1Ytt8yOGXwyprRY9a1PiRcFIGtzb5VhlzW1+PL/nZuwDi80ickOug2W SYFlByDmQh2uMxFRzotumu1ZLGHtiQyTHDsoKj/U1cut6WOw+ZUEqF74Qajv7pz7WT7M YXSw== 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=KDjVKJAvjmvSznZtB3TgaDfSp2HabalO4ovxbecKq1g=; b=A9k9nTX/P+ShbF9JxpB/KkCCBwvSGiGOilVWzp43eLRni8tInphLamw7ycgS010zxj RD9zhDtbtlFrAOrws7ulGgyvpqGvPllwMV5VaYrjTr6CWhJdu8UmCQEkkARB6LHqC/OK dluANh9N/I5Q3/F4cG5B28dmXSIXkqnzabDLgWlHC1XtrpXco8NhXpoA9ORbIUlxN6Ja wUBLt8Z46frssxUBcTF61e2ty45rBUcVpD0+mi2mr0RxwCYiP3FlUupxkGnVY9gY5DZ+ SCvgYecpOdJQdbTlrewCnhgCcUvP/PA9A+qo6aUccpqtbwGfX2t2xqXEr5W1eyJg45jg 3omg== X-Gm-Message-State: AOAM532qFzJ0ln53c73EIrC3/2O6dX5zWk7ljceb8vnzAShV4+MD3ARq KxPwoj7XGC/y1F+dNrl3Mc2AFw== X-Received: by 2002:a17:907:c01a:: with SMTP id ss26mr2198429ejc.734.1644416153832; Wed, 09 Feb 2022 06:15:53 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s1sm8403610edt.49.2022.02.09.06.15.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:48 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BC6CB1FFC9; Wed, 9 Feb 2022 14:15:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 17/28] docs: remove references to TCG tracing Date: Wed, 9 Feb 2022 14:15:18 +0000 Message-Id: <20220209141529.3418384-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::630 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x630.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: Luis Vilanova , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , qemu-devel@nongnu.org, Stefan Hajnoczi Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Users wanting this sort of functionality should turn to TCG plugins instead. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Cc: Luis Vilanova Cc: Stefan Hajnoczi Message-Id: <20220204204335.1689602-18-alex.bennee@linaro.org> diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 4c4da20d0f..b0156e0f25 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -601,6 +601,19 @@ the upstream Linux kernel in 2018, and it has also been dropped from glibc, so there is no new Linux development taking place with this architecture. For running the old binaries, you can use older versions of QEMU. +TCG introspection features +-------------------------- + +TCG trace-events (since 6.2) +'''''''''''''''''''''''''''' + +The ability to add new TCG trace points had bit rotted and as the +feature can be replicated with TCG plugins it was removed. If +any user is currently using this feature and needs help with +converting to using TCG plugins they should contact the qemu-devel +mailing list. + + System emulator devices ----------------------- diff --git a/docs/devel/tracing.rst b/docs/devel/tracing.rst index 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; } -"tcg" ------ - -Guest code generated by TCG can be traced by defining an event with the "tcg" -event property. Internally, this property generates two events: -"_trans" to trace the event at translation time, and -"_exec" to trace the event at execution time. - -Instead of using these two events, you should instead use the function -"trace__tcg" during translation (TCG code generation). This function -will automatically call "trace__trans", and will generate the -necessary TCG code to call "trace__exec" during guest code execution. - -Events with the "tcg" property can be declared in the "trace-events" file with a -mix of native and TCG types, and "trace__tcg" will gracefully forward -them to the "_trans" and "_exec" events. Since TCG values -are not known at translation time, these are ignored by the "_trans" -event. Because of this, the entry in the "trace-events" file needs two printing -formats (separated by a comma):: - - tcg foo(uint8_t a1, TCGv_i32 a2) "a1=%d", "a1=%d a2=%d" - -For example:: - - #include "trace-tcg.h" - - void some_disassembly_func (...) - { - uint8_t a1 = ...; - TCGv_i32 a2 = ...; - trace_foo_tcg(a1, a2); - } - -This will immediately call:: - - void trace_foo_trans(uint8_t a1); - -and will generate the TCG code to call:: - - void trace_foo(uint8_t a1, uint32_t a2); - -"vcpu" ------- - -Identifies events that trace vCPU-specific information. It implicitly adds a -"CPUState*" argument, and extends the tracing print format to show the vCPU -information. If used together with the "tcg" property, it adds a second -"TCGv_env" argument that must point to the per-target global TCG register that -points to the vCPU when guest code is executed (usually the "cpu_env" variable). - -The "tcg" and "vcpu" properties are currently only honored in the root -./trace-events file. - -The following example events:: - - foo(uint32_t a) "a=%x" - vcpu bar(uint32_t a) "a=%x" - tcg vcpu baz(uint32_t a) "a=%x", "a=%x" - -Can be used as:: - - #include "trace-tcg.h" - - CPUArchState *env; - TCGv_ptr cpu_env; - - void some_disassembly_func(...) - { - /* trace emitted at this point */ - trace_foo(0xd1); - /* trace emitted at this point */ - trace_bar(env_cpu(env), 0xd2); - /* trace emitted at this point (env) and when guest code is executed (cpu_env) */ - trace_baz_tcg(env_cpu(env), cpu_env, 0xd3); - } - -If the translating vCPU has address 0xc1 and code is later executed by vCPU -0xc2, this would be an example output:: - - // at guest code translation - foo a=0xd1 - bar cpu=0xc1 a=0xd2 - baz_trans cpu=0xc1 a=0xd3 - // at guest code execution - baz_exec cpu=0xc2 a=0xd3 From patchwork Wed Feb 9 14:15:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541112 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1436517imo; Wed, 9 Feb 2022 07:29:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJyrYXY1MJxmLncD3NeRHsbEcDuSu7Mw3a6D6Zh35AgoENEauPio82gHAKxRwV1xqmRQ8vs/ X-Received: by 2002:a25:68c2:: with SMTP id d185mr2506410ybc.37.1644420552000; Wed, 09 Feb 2022 07:29:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644420551; cv=none; d=google.com; s=arc-20160816; b=lZVS4Cd7S3TzdtIzo5H1KElsfM/8ZxXVXfeZDlxVA4OPrySXG11eavrjwJXcqHqpgq y0EmuTAZY3v9MPnHUv9Rnm9VpdSojhl9nYPQc8M24kob3S/oyMXdqv443xMDXTp8tcze PcRdaY1TQXeUN4EbQKbnemFKKt0kkI9h1ylxsIeBMVhG9vTDN94QlzYkBQ6GAXOls5pM mLSo+ByXeN2ppyW78tqws1D4Y2lCMwe3dxhndJYRd8tjkPG6y3LjupnOaJGY+xz6w6zr r0+wkRpKihEb0735XX6rleHwhLg+e1Pe8l4YE/H/ryuMYxj2k8Ptb/EOj+oB6RVEn3oY jt6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ncCfSv9/1ydZCMR3c0ComX1jn/jOM6iYBNyh5PIwWFo=; b=v/PTIpC11gw9M+SFWqNi6L3HoeQN9wFEr2vKRLU4EfaO0MDLqI2Q0xJb7Ss77FO+BQ MAOu2WxzLWsYdAyvaCrWP9y9yvRvJqfcvbewpHYG8IqJwxll2Hroa/BUGZbNK4SdQfxu bYaSlTtsIcql5SJsc4cPhM6zUQU9cAn/lTcIKZ63tY9xEhqF9LSwnAbEx+1IPSzhfr7J 17vd1fSHI8SgB0gTCKC9ERTgOnKt49Mq+PEct9f2NcVD+IxklgQF19lHLDSxd71HoFsa nZc5wouelI0qh3YNfone8Y6pL6njxoh6xE3eQSzC/JaZjFAgO1WEmSB1BXM8uivfp3yJ HDuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jhTjnc6S; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x4si13063489ybu.628.2022.02.09.07.29.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:29:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jhTjnc6S; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHou7-0005Bi-Eo for patch@linaro.org; Wed, 09 Feb 2022 10:29:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnuL-0000ps-Qa for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:23 -0500 Received: from [2a00:1450:4864:20::42d] (port=42504 helo=mail-wr1-x42d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnu9-0001P5-SW for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:20 -0500 Received: by mail-wr1-x42d.google.com with SMTP id h6so4323532wrb.9 for ; Wed, 09 Feb 2022 06:25:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ncCfSv9/1ydZCMR3c0ComX1jn/jOM6iYBNyh5PIwWFo=; b=jhTjnc6SVVsaSpx75JAknpZX65X5SL7e46jWmYEUlz/K1g1ajNyAf3MjSlkvU7GMvR 71vUbtZITZkoCIyrUJzJ4yxOU0AjurNztrA5K94Nl2NuGfQebnintF82VYGlFMpWmvKn p28S8KVjPXt2+sy6tQXyr/R54uZe2VesgoRcMzdBT/LQtnYqJh4V7RurTTKo3s9XWtb0 2FNGYicpvsJAJux1LOU/BWRlOoLO7tO4zDfhSQzdA/G6lnd7i8oRKkuEtPlK63zwX1eo ubV5meIiAM3QBAgMpLRLl5ALSqds29Mqvx4vtBHyciwqoYYkWat0Q+70A4V4i6ghBnx0 0tCQ== 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=ncCfSv9/1ydZCMR3c0ComX1jn/jOM6iYBNyh5PIwWFo=; b=pq19GtlO3K/VdQwif9txykXccUT8rXJIVseAKjxyyF0Din3ug2bPKvv+e2M3neRpGm yS1HB78RdXK0Ca7JjFw5C/ftmPYunwllYz1DR+778vwiGAePggrO30Bz8XfHf49K0P/Z zGBnRZAgy+ueUefhxSIF+yF3c7N0s2+I7ljX/UrNZMzO9xb+hd4PRigiXZJnmCFUMSuQ mqvha+Fzq86Isbk28OYoQp8l/2hFTMrbxTQ2htlJMV2qR/B0lGq/HXPW4dVzUhqTmxd7 7rZS38bgZQmejMZ2Z3B8HpZwJBbuEd96snbq7rSv0L78kujxOBD83yDdYOlaetTCQ2Wu 1b4A== X-Gm-Message-State: AOAM5315o93tiEcG2IGXwbhRI3KxswSXBwlZkT55wAIDVEKwuS40vL/N emxj2dazOOBxft9+KOhd2XvENQ== X-Received: by 2002:a05:6000:16c2:: with SMTP id h2mr2268569wrf.642.1644416708220; Wed, 09 Feb 2022 06:25:08 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v9sm4893519wrw.84.2022.02.09.06.24.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:24:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E0ABB1FFCA; Wed, 9 Feb 2022 14:15:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 18/28] tracing: remove TCG memory access tracing Date: Wed, 9 Feb 2022 14:15:19 +0000 Message-Id: <20220209141529.3418384-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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, 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: Riku Voipio , Richard Henderson , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Luis Vilanova , Stefan Hajnoczi , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" If you really want to trace all memory operations TCG plugins gives you a more flexible interface for doing so. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Cc: Luis Vilanova Cc: Stefan Hajnoczi Message-Id: <20220204204335.1689602-19-alex.bennee@linaro.org> diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h index 2d917b6b1f..fc165031e8 100644 --- a/accel/tcg/atomic_template.h +++ b/accel/tcg/atomic_template.h @@ -77,7 +77,6 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, target_ulong addr, PAGE_READ | PAGE_WRITE, retaddr); DATA_TYPE ret; - atomic_trace_rmw_pre(env, addr, oi); #if DATA_SIZE == 16 ret = atomic16_cmpxchg(haddr, cmpv, newv); #else @@ -97,7 +96,6 @@ ABI_TYPE ATOMIC_NAME(ld)(CPUArchState *env, target_ulong addr, PAGE_READ, retaddr); DATA_TYPE val; - atomic_trace_ld_pre(env, addr, oi); val = atomic16_read(haddr); ATOMIC_MMU_CLEANUP; atomic_trace_ld_post(env, addr, oi); @@ -110,7 +108,6 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong addr, ABI_TYPE val, DATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, PAGE_WRITE, retaddr); - atomic_trace_st_pre(env, addr, oi); atomic16_set(haddr, val); ATOMIC_MMU_CLEANUP; atomic_trace_st_post(env, addr, oi); @@ -124,7 +121,6 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, target_ulong addr, ABI_TYPE val, PAGE_READ | PAGE_WRITE, retaddr); DATA_TYPE ret; - atomic_trace_rmw_pre(env, addr, oi); ret = qatomic_xchg__nocheck(haddr, val); ATOMIC_MMU_CLEANUP; atomic_trace_rmw_post(env, addr, oi); @@ -138,7 +134,6 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong addr, \ DATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr); \ DATA_TYPE ret; \ - atomic_trace_rmw_pre(env, addr, oi); \ ret = qatomic_##X(haddr, val); \ ATOMIC_MMU_CLEANUP; \ atomic_trace_rmw_post(env, addr, oi); \ @@ -171,7 +166,6 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong addr, \ XDATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr); \ XDATA_TYPE cmp, old, new, val = xval; \ - atomic_trace_rmw_pre(env, addr, oi); \ smp_mb(); \ cmp = qatomic_read__nocheck(haddr); \ do { \ @@ -216,7 +210,6 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, target_ulong addr, PAGE_READ | PAGE_WRITE, retaddr); DATA_TYPE ret; - atomic_trace_rmw_pre(env, addr, oi); #if DATA_SIZE == 16 ret = atomic16_cmpxchg(haddr, BSWAP(cmpv), BSWAP(newv)); #else @@ -236,7 +229,6 @@ ABI_TYPE ATOMIC_NAME(ld)(CPUArchState *env, target_ulong addr, PAGE_READ, retaddr); DATA_TYPE val; - atomic_trace_ld_pre(env, addr, oi); val = atomic16_read(haddr); ATOMIC_MMU_CLEANUP; atomic_trace_ld_post(env, addr, oi); @@ -249,7 +241,6 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong addr, ABI_TYPE val, DATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, PAGE_WRITE, retaddr); - atomic_trace_st_pre(env, addr, oi); val = BSWAP(val); atomic16_set(haddr, val); ATOMIC_MMU_CLEANUP; @@ -264,7 +255,6 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, target_ulong addr, ABI_TYPE val, PAGE_READ | PAGE_WRITE, retaddr); ABI_TYPE ret; - atomic_trace_rmw_pre(env, addr, oi); ret = qatomic_xchg__nocheck(haddr, BSWAP(val)); ATOMIC_MMU_CLEANUP; atomic_trace_rmw_post(env, addr, oi); @@ -278,7 +268,6 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong addr, \ DATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr); \ DATA_TYPE ret; \ - atomic_trace_rmw_pre(env, addr, oi); \ ret = qatomic_##X(haddr, BSWAP(val)); \ ATOMIC_MMU_CLEANUP; \ atomic_trace_rmw_post(env, addr, oi); \ @@ -308,7 +297,6 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong addr, \ XDATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr); \ XDATA_TYPE ldo, ldn, old, new, val = xval; \ - atomic_trace_rmw_pre(env, addr, oi); \ smp_mb(); \ ldn = qatomic_read__nocheck(haddr); \ do { \ diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 5e0d0eebc3..82adefe574 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -2140,7 +2140,6 @@ static inline uint64_t cpu_load_helper(CPUArchState *env, abi_ptr addr, { uint64_t ret; - trace_guest_ld_before_exec(env_cpu(env), addr, oi); ret = full_load(env, addr, oi, retaddr); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R); return ret; @@ -2487,7 +2486,6 @@ static inline void cpu_store_helper(CPUArchState *env, target_ulong addr, uint64_t val, MemOpIdx oi, uintptr_t ra, FullStoreHelper *full_store) { - trace_guest_st_before_exec(env_cpu(env), addr, oi); full_store(env, addr, val, oi, ra); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_W); } diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 6f5d4933f0..8edf0bbaa1 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -250,7 +250,6 @@ uint8_t cpu_ldb_mmu(CPUArchState *env, abi_ptr addr, uint8_t ret; validate_memop(oi, MO_UB); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldub_p(haddr); clear_helper_retaddr(); @@ -265,7 +264,6 @@ uint16_t cpu_ldw_be_mmu(CPUArchState *env, abi_ptr addr, uint16_t ret; validate_memop(oi, MO_BEUW); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = lduw_be_p(haddr); clear_helper_retaddr(); @@ -280,7 +278,6 @@ uint32_t cpu_ldl_be_mmu(CPUArchState *env, abi_ptr addr, uint32_t ret; validate_memop(oi, MO_BEUL); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldl_be_p(haddr); clear_helper_retaddr(); @@ -295,7 +292,6 @@ uint64_t cpu_ldq_be_mmu(CPUArchState *env, abi_ptr addr, uint64_t ret; validate_memop(oi, MO_BEUQ); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldq_be_p(haddr); clear_helper_retaddr(); @@ -310,7 +306,6 @@ uint16_t cpu_ldw_le_mmu(CPUArchState *env, abi_ptr addr, uint16_t ret; validate_memop(oi, MO_LEUW); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = lduw_le_p(haddr); clear_helper_retaddr(); @@ -325,7 +320,6 @@ uint32_t cpu_ldl_le_mmu(CPUArchState *env, abi_ptr addr, uint32_t ret; validate_memop(oi, MO_LEUL); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldl_le_p(haddr); clear_helper_retaddr(); @@ -340,7 +334,6 @@ uint64_t cpu_ldq_le_mmu(CPUArchState *env, abi_ptr addr, uint64_t ret; validate_memop(oi, MO_LEUQ); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldq_le_p(haddr); clear_helper_retaddr(); @@ -354,7 +347,6 @@ void cpu_stb_mmu(CPUArchState *env, abi_ptr addr, uint8_t val, void *haddr; validate_memop(oi, MO_UB); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stb_p(haddr, val); clear_helper_retaddr(); @@ -367,7 +359,6 @@ void cpu_stw_be_mmu(CPUArchState *env, abi_ptr addr, uint16_t val, void *haddr; validate_memop(oi, MO_BEUW); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stw_be_p(haddr, val); clear_helper_retaddr(); @@ -380,7 +371,6 @@ void cpu_stl_be_mmu(CPUArchState *env, abi_ptr addr, uint32_t val, void *haddr; validate_memop(oi, MO_BEUL); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stl_be_p(haddr, val); clear_helper_retaddr(); @@ -393,7 +383,6 @@ void cpu_stq_be_mmu(CPUArchState *env, abi_ptr addr, uint64_t val, void *haddr; validate_memop(oi, MO_BEUQ); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stq_be_p(haddr, val); clear_helper_retaddr(); @@ -406,7 +395,6 @@ void cpu_stw_le_mmu(CPUArchState *env, abi_ptr addr, uint16_t val, void *haddr; validate_memop(oi, MO_LEUW); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stw_le_p(haddr, val); clear_helper_retaddr(); @@ -419,7 +407,6 @@ void cpu_stl_le_mmu(CPUArchState *env, abi_ptr addr, uint32_t val, void *haddr; validate_memop(oi, MO_LEUL); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stl_le_p(haddr, val); clear_helper_retaddr(); @@ -432,7 +419,6 @@ void cpu_stq_le_mmu(CPUArchState *env, abi_ptr addr, uint64_t val, void *haddr; validate_memop(oi, MO_LEUQ); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stq_le_p(haddr, val); clear_helper_retaddr(); diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 61b492d89f..65e1c94c2d 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -27,7 +27,6 @@ #include "tcg/tcg.h" #include "tcg/tcg-op.h" #include "tcg/tcg-mo.h" -#include "trace-tcg.h" #include "exec/plugin-gen.h" /* Reduce the number of ifdefs below. This assumes that all uses of @@ -2877,7 +2876,6 @@ void tcg_gen_qemu_ld_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); memop = tcg_canonicalize_memop(memop, 0, 0); oi = make_memop_idx(memop, idx); - trace_guest_ld_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); orig_memop = memop; if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { @@ -2916,7 +2914,6 @@ void tcg_gen_qemu_st_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); memop = tcg_canonicalize_memop(memop, 0, 1); oi = make_memop_idx(memop, idx); - trace_guest_st_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { swap = tcg_temp_new_i32(); @@ -2965,7 +2962,6 @@ void tcg_gen_qemu_ld_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); memop = tcg_canonicalize_memop(memop, 1, 0); oi = make_memop_idx(memop, idx); - trace_guest_ld_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); orig_memop = memop; if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { @@ -3013,7 +3009,6 @@ void tcg_gen_qemu_st_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); memop = tcg_canonicalize_memop(memop, 1, 1); oi = make_memop_idx(memop, idx); - trace_guest_st_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { swap = tcg_temp_new_i64(); diff --git a/accel/tcg/atomic_common.c.inc b/accel/tcg/atomic_common.c.inc index 1df1f243e9..6602d7689f 100644 --- a/accel/tcg/atomic_common.c.inc +++ b/accel/tcg/atomic_common.c.inc @@ -13,14 +13,6 @@ * See the COPYING file in the top-level directory. */ -static void atomic_trace_rmw_pre(CPUArchState *env, target_ulong addr, - MemOpIdx oi) -{ - CPUState *cpu = env_cpu(env); - - trace_guest_rmw_before_exec(cpu, addr, oi); -} - static void atomic_trace_rmw_post(CPUArchState *env, target_ulong addr, MemOpIdx oi) { @@ -28,24 +20,12 @@ static void atomic_trace_rmw_post(CPUArchState *env, target_ulong addr, } #if HAVE_ATOMIC128 -static void atomic_trace_ld_pre(CPUArchState *env, target_ulong addr, - MemOpIdx oi) -{ - trace_guest_ld_before_exec(env_cpu(env), addr, oi); -} - static void atomic_trace_ld_post(CPUArchState *env, target_ulong addr, MemOpIdx oi) { qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R); } -static void atomic_trace_st_pre(CPUArchState *env, target_ulong addr, - MemOpIdx oi) -{ - trace_guest_st_before_exec(env_cpu(env), addr, oi); -} - static void atomic_trace_st_post(CPUArchState *env, target_ulong addr, MemOpIdx oi) { diff --git a/trace-events b/trace-events index a637a61eba..bc71006675 100644 --- a/trace-events +++ b/trace-events @@ -117,20 +117,6 @@ vcpu guest_cpu_exit(void) # Targets: all vcpu guest_cpu_reset(void) -# tcg/tcg-op.c - -# @vaddr: Access' virtual address. -# @memopidx: Access' information (see below). -# -# Start virtual memory access (before any potential access violation). -# Does not include memory accesses performed by devices. -# -# Mode: user, softmmu -# Targets: TCG(all) -vcpu tcg guest_ld_before(TCGv vaddr, uint32_t memopidx) "info=%d", "vaddr=0x%016"PRIx64" memopidx=0x%x" -vcpu tcg guest_st_before(TCGv vaddr, uint32_t memopidx) "info=%d", "vaddr=0x%016"PRIx64" memopidx=0x%x" -vcpu tcg guest_rmw_before(TCGv vaddr, uint32_t memopidx) "info=%d", "vaddr=0x%016"PRIx64" memopidx=0x%x" - # include/user/syscall-trace.h # @num: System call number. From patchwork Wed Feb 9 14:15:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541123 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1484395imo; Wed, 9 Feb 2022 08:28:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJx79Qevr14xqimVkrU4WyTvtcx+aqrpf5ax9sbdjIU0t6BjaJdNkLtuplFVSbxY67Y7w72+ X-Received: by 2002:a81:d004:: with SMTP id v4mr3087211ywi.127.1644424090622; Wed, 09 Feb 2022 08:28:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644424090; cv=none; d=google.com; s=arc-20160816; b=nRls51QTbdS/PGppJRezB/PudPdJcLd1hKE/CHv4zp4lhupuYYjHTHCfX3DKygeBVZ rQ3QAEPDaOcXF49O2aR/Dp88KJlnAdFej5GsoSpF0mtm0NPGIJVorR4IK1XC1qscdVgk xEevGwt0mHLhYfcfzmun+UUeamhkuaFfe1DXjQNgndVKEBUgSZiDa6FS0dqKp6JujAKf WyvGSHBr4fyXLajWn6xJmCeZQkl9CJ9ndcHJXROootobk4vK61SmtrgXuqZis+ZjOHbj ob4DEpCST9cx25avIB2XoOwjOea1U+DPnsAPC9fWJZFCNdHXi6oBzvlpMT7xqSwt7DI4 7w4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=BVs06yq2xpLk3BuTgn2wEdh+5ZuM90acH+yY+MF8S6E=; b=zWpa1x+tmcUZZzTU3UtajsFlSlUS6FGzSNGrALTvoH16wTRXklPVmxMag1SGIQxDp3 7tYwDNgi1zB9xdYGt9TgNJg9ZXIJSHeGnA5zyKnUmOiaGwmLoIcklZErJSdv+reIpkHN xdAgNDyJqisvcv2sgMhfbPV7uoruAWfY2NLCkmkkGLUE5ZIeFJAus+gO893IHM7lqbLz uU3r5yrTsRkcakrEwqkdt1jmucWUI3ccnlK+AMW1Ed0bAyX0b5TgdbpyJZ1K1PYHY94W Gi0b8KePormaV+EmsNEnsk0aIvksE5fniVntX9StA8h9veEnl7HykbLONix9FAByDp5U 2x4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ql6mey++; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v8si4149505ybs.510.2022.02.09.08.28.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 08:28:10 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ql6mey++; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHppC-0005mV-1X for patch@linaro.org; Wed, 09 Feb 2022 11:28:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnu1-0000Xg-U1 for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:01 -0500 Received: from [2a00:1450:4864:20::42f] (port=44865 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 1nHnu0-0001Lz-A7 for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:01 -0500 Received: by mail-wr1-x42f.google.com with SMTP id k18so4311395wrg.11 for ; Wed, 09 Feb 2022 06:24:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BVs06yq2xpLk3BuTgn2wEdh+5ZuM90acH+yY+MF8S6E=; b=ql6mey++FoZoqkvO+AwzeoCjVqUj7ykQuVMbYU2TII7QzELZwxXEHjn8q4m2r9NTmm JZYgEZ8WqUhfqaTXZoxQKn0LuTAHCCNJAtzJpv2vxfw61nVCsoqPcbJ1jGXIZOnR7PFJ BaXTNT8VQhbSzoSNlwaliussvSDrm4JqlEZfqXYaPw+MmzVcuIsZpIzCE4Rzr1rkaUsr MEdDAYnnPv9LkoEovhW3IwO3xLqgGuO/Q98lK5d0L4U+S1pnnf71CEL0h6OT6zGHKik+ QCym902Bt9FQ6Hf9Dh6FusR/hvyfyhdOusuulDQ+h9GiUlemD28uQ2PoBln2TFrwx4YG UEOQ== 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=BVs06yq2xpLk3BuTgn2wEdh+5ZuM90acH+yY+MF8S6E=; b=OEMpvJeyZhlDZ0kyEBcQJ8CGEyBZVfVah4rNCa9rUWVGi/gNvZ5Z1CUuB72iWYRXZI fNkQkrRG5YAHoOuItUXE4KBBgcg6EbDz4r0uxCeznWRR78kaWViNDe3cC0wB2pnECkll VbS9uA7tIqJFyrxuvoJWuUwaWllRF6YBozeu8X1qfevH5akOIbKWaxEanrNq8grZQBf0 XoHEq0EPZMjKJilQuXMfA45xeH/yHBRydFm5eCRQ+u902+X4TKZ9BKPTSaasd2vezx+m 0uAyLSXn7Vlv6kyi6V/K4Kb0rt1qKVMuowI8PdVNVIlJwyAFU3yDhMheyKHvj0xA/3zx f9bw== X-Gm-Message-State: AOAM531GDpuFZDY1XC59oJs9nsbEK5kkP79pbTO2f7n36/74dhbq4IRE S+ma2DBn5f7TjJOpLMY/xvijuw== X-Received: by 2002:adf:b610:: with SMTP id f16mr2293317wre.627.1644416699030; Wed, 09 Feb 2022 06:24:59 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b2sm17623041wri.88.2022.02.09.06.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:24:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 01B2C1FFCB; Wed, 9 Feb 2022 14:15:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 19/28] tracing: remove the trace-tcg includes from the build Date: Wed, 9 Feb 2022 14:15:20 +0000 Message-Id: <20220209141529.3418384-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42f (failed) 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: Richard Henderson , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Luis Vilanova , Stefan Hajnoczi , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Cc: Luis Vilanova Cc: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220204204335.1689602-20-alex.bennee@linaro.org> diff --git a/include/exec/helper-proto.h b/include/exec/helper-proto.h index ba100793a7..c4b1bda632 100644 --- a/include/exec/helper-proto.h +++ b/include/exec/helper-proto.h @@ -38,7 +38,6 @@ dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \ #define IN_HELPER_PROTO #include "helper.h" -#include "trace/generated-helpers.h" #include "accel/tcg/tcg-runtime.h" #include "accel/tcg/plugin-helpers.h" diff --git a/include/exec/helper-tcg.h b/include/exec/helper-tcg.h index 16cd318b83..3933258f1a 100644 --- a/include/exec/helper-tcg.h +++ b/include/exec/helper-tcg.h @@ -59,7 +59,6 @@ | dh_typemask(t5, 5) | dh_typemask(t6, 6) | dh_typemask(t7, 7) }, #include "helper.h" -#include "trace/generated-helpers.h" #include "accel/tcg/tcg-runtime.h" #include "accel/tcg/plugin-helpers.h" diff --git a/include/trace-tcg.h b/include/trace-tcg.h deleted file mode 100644 index da68608c85..0000000000 --- a/include/trace-tcg.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef TRACE_TCG_H -#define TRACE_TCG_H - -#include "trace/generated-tcg-tracers.h" - -#endif /* TRACE_TCG_H */ diff --git a/trace/meson.build b/trace/meson.build index c4794a1f2a..29f3bffd5a 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -67,7 +67,6 @@ trace_events_all = custom_target('trace-events-all', install_dir: qemu_datadir) foreach d : [ - ['generated-tcg-tracers.h', 'tcg-h'], ['generated-helpers.c', 'tcg-helper-c'], ['generated-helpers.h', 'tcg-helper-h'], ['generated-helpers-wrappers.h', 'tcg-helper-wrapper-h'], From patchwork Wed Feb 9 14:15:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541111 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1434635imo; Wed, 9 Feb 2022 07:26:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJxAEqeQ2nEKTO+uuX0emDWQOmtBgJY/DZDWOr5e3gaI0QJhutOixmyZ4cQfOH22BN+NSx0G X-Received: by 2002:a81:310:: with SMTP id 16mr2621718ywd.35.1644420393723; Wed, 09 Feb 2022 07:26:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644420393; cv=none; d=google.com; s=arc-20160816; b=0HcNudm1crnaZWPkrUk+e7WtBCIwfsM1pFDrgbObeUzjqbhBVSkJVnTVKS6ZXsnUpg xfHpazwfihb12Uxqvbf5o10fSxg6rhhF2YYeFphM7WXvTFPw+zOw+E1QS57h3Ol0N7ZA oJ3UsUTj3Je0blXZB7kdsgoUHgxHlwGuCXon5G+/4DXS6HFmVb1Anz/1uuFeacinTrpV BwQkwdbzwQJkarKep6v2kSqXKWzXa9UvdHTOyzbdF6rduJtHPx5aHN/SrVOBm8XBi8kn JfK2mzuhBJbze983FYwsLNG+SvG9t1vsgxOUs4jIYJQe0ftkNF0+XMKZx/UBt2zJTZj3 55Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=wHJdj0cr3nVUIxPJb7r9wUxrO/9wqHSVk6Za08NL7ME=; b=ue2gOu8/OOHz34ZpNm2PcMYyJuPjwT2OPP+hT98nKu7+xemmwD4uatbIGBJH5whNE/ 3YCAdPtjJIB0QiivFaGKhgA26PyncMnFy1ROSJjY6IAq43BMKxMW+SWpSPioL7/bOXQz CqR8bllL55VhwDKwHEIuO74q8MTLvDRZjrGsHVES5qR7pAVzOH2yCnd4V5vMDZB/QMJB L2FrxsJQCXowxBdfw6p0w01o6p44I++ZwK2DUu7mKfh0BcvC9R1z2B9PhiWK3VBuECbM gGHn3stmNR0nEt5hvI/S8fcEi6lps+72wepy/6ErSdIjwSoBPHoFnIz7MC25OmX7EaL+ uBJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hc5a48ld; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 200si11444106ywi.544.2022.02.09.07.26.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:26:33 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hc5a48ld; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHorZ-0006qY-4V for patch@linaro.org; Wed, 09 Feb 2022 10:26:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnuB-0000l5-OH for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:11 -0500 Received: from [2a00:1450:4864:20::433] (port=43668 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 1nHnu8-0001NW-VN for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:11 -0500 Received: by mail-wr1-x433.google.com with SMTP id i14so4307640wrc.10 for ; Wed, 09 Feb 2022 06:25:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wHJdj0cr3nVUIxPJb7r9wUxrO/9wqHSVk6Za08NL7ME=; b=hc5a48ld77peuC7jWlhoHce3wDCwg2MPYoX+NHT3wm9vuxdBjt00QhD+kV2Qg5KiKt 2iw4GTmnNB358zmN0MMbmGhDZFymJBPVddXfRg8VTIXWQqlp1eqxAtSugAf5HVDGJGPS 7VlwFw16H81ulD3ijokvtf8cEoRtAHN+psoS+mgvCzkrC3yzWxnQYx26jz5Uc+6ZXsO3 RXG4JnyqO7DwdZ/WV7/qQUJCm/IVnIEZTMhDyp/XRZ0Hr3WQNpXTPB06t1wXQUihZec7 XQqwOqc8qbNnWodaEOf4w9B49BTq+28sRPFybXjcCtFK1bvLdZ3QupnZ/PbvyWIjeRVO PKxQ== 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=wHJdj0cr3nVUIxPJb7r9wUxrO/9wqHSVk6Za08NL7ME=; b=RWePKoQ5QVa3AkHhvGWZnb+YvvXWSIUq4rVSDMLeLoJ1h8qvJV0ChurIO6rzVW9mu8 e5ax9kbpawo5UhNtxAYz3iP1O6HVt9+q1TeZWwQV1Zi3m5oJcYyWqHJ9AEltS8OwocyD PNnL4icvIyxxeb66nC1L0FDPPufrIqm1l1Kd2t01Mq/+V+nmBtY1uPn2LJxpwxYWphu9 AVIw5nlnIEDmrxegFYMorTlrvQmMrY/UmbESs0AuyLq9/qJOVimInwlwf/KjY5MQ/mVT ZoKjycYt68EVeeSawKEUwbK1DK0RNozR6kdbQcc8HgQ74BwDh5N6hw6Tq+kWfP0nZOCF WNkw== X-Gm-Message-State: AOAM532X3O7zCTYujT8cqftZILAUdmhz34nfz99nI1U/T2FjZCyK3ZhU kC91cv3fnF/YV6YId2N+Z+LB4jzxZgWZ6w== X-Received: by 2002:a05:6000:18a2:: with SMTP id b2mr2271226wri.310.1644416706049; Wed, 09 Feb 2022 06:25:06 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p27sm5088402wms.39.2022.02.09.06.24.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:24:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 26BFA1FFCC; Wed, 9 Feb 2022 14:15:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 20/28] tracing: excise the tcg related from tracetool Date: Wed, 9 Feb 2022 14:15:21 +0000 Message-Id: <20220209141529.3418384-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::433 (failed) 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: Richard Henderson , qemu-devel@nongnu.org, Luis Vilanova , Stefan Hajnoczi , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now we have no TCG trace events and no longer handle them in the code we can remove the handling from the tracetool to generate them. vcpu tracing is still available although the existing syscall event is an exercise in redundancy (plugins and -strace can also get the information). Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Cc: Luis Vilanova Cc: Stefan Hajnoczi Message-Id: <20220204204335.1689602-21-alex.bennee@linaro.org> diff --git a/meson.build b/meson.build index 82db1e7e74..ae5f7eec6e 100644 --- a/meson.build +++ b/meson.build @@ -2357,19 +2357,15 @@ tracetool_depends = files( 'scripts/tracetool/backend/simple.py', 'scripts/tracetool/backend/syslog.py', 'scripts/tracetool/backend/ust.py', - 'scripts/tracetool/format/tcg_h.py', 'scripts/tracetool/format/ust_events_c.py', 'scripts/tracetool/format/ust_events_h.py', 'scripts/tracetool/format/__init__.py', 'scripts/tracetool/format/d.py', - 'scripts/tracetool/format/tcg_helper_c.py', 'scripts/tracetool/format/simpletrace_stap.py', 'scripts/tracetool/format/c.py', 'scripts/tracetool/format/h.py', - 'scripts/tracetool/format/tcg_helper_h.py', 'scripts/tracetool/format/log_stap.py', 'scripts/tracetool/format/stap.py', - 'scripts/tracetool/format/tcg_helper_wrapper_h.py', 'scripts/tracetool/__init__.py', 'scripts/tracetool/transform.py', 'scripts/tracetool/vcpu.py' diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h index 1c2e7a8ed3..7b6ca975ef 100644 --- a/include/exec/helper-gen.h +++ b/include/exec/helper-gen.h @@ -79,8 +79,6 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \ } #include "helper.h" -#include "trace/generated-helpers.h" -#include "trace/generated-helpers-wrappers.h" #include "accel/tcg/tcg-runtime.h" #include "accel/tcg/plugin-helpers.h" diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 5bc94d95cf..5393c7fc5c 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -87,8 +87,6 @@ def out(*lines, **kwargs): "ssize_t", "uintptr_t", "ptrdiff_t", - # Magic substitution is done by tracetool - "TCGv", ] def validate_type(name): @@ -232,7 +230,7 @@ class Event(object): "(?:(?:(?P\".+),)?\s*(?P\".+))?" "\s*") - _VALID_PROPS = set(["disable", "tcg", "tcg-trans", "tcg-exec", "vcpu"]) + _VALID_PROPS = set(["disable", "vcpu"]) def __init__(self, name, props, fmt, args, lineno, filename, orig=None, event_trans=None, event_exec=None): @@ -321,15 +319,6 @@ def build(line_str, lineno, filename): fmt = [fmt_trans, fmt] args = Arguments.build(groups["args"]) - if "tcg-trans" in props: - raise ValueError("Invalid property 'tcg-trans'") - if "tcg-exec" in props: - raise ValueError("Invalid property 'tcg-exec'") - if "tcg" not in props and not isinstance(fmt, str): - raise ValueError("Only events with 'tcg' property can have two format strings") - if "tcg" in props and isinstance(fmt, str): - raise ValueError("Events with 'tcg' property must have two format strings") - event = Event(name, props, fmt, args, lineno, filename) # add implicit arguments when using the 'vcpu' property @@ -409,33 +398,7 @@ def read_events(fobj, fname): e.args = (arg0,) + e.args[1:] raise - # transform TCG-enabled events - if "tcg" not in event.properties: - events.append(event) - else: - event_trans = event.copy() - event_trans.name += "_trans" - event_trans.properties += ["tcg-trans"] - event_trans.fmt = event.fmt[0] - # ignore TCG arguments - args_trans = [] - for atrans, aorig in zip( - event_trans.transform(tracetool.transform.TCG_2_HOST).args, - event.args): - if atrans == aorig: - args_trans.append(atrans) - event_trans.args = Arguments(args_trans) - - event_exec = event.copy() - event_exec.name += "_exec" - event_exec.properties += ["tcg-exec"] - event_exec.fmt = event.fmt[1] - event_exec.args = event_exec.args.transform(tracetool.transform.TCG_2_HOST) - - new_event = [event_trans, event_exec] - event.event_trans, event.event_exec = new_event - - events.extend(new_event) + events.append(event) return events diff --git a/scripts/tracetool/format/tcg_h.py b/scripts/tracetool/format/tcg_h.py deleted file mode 100644 index 4d84440aff..0000000000 --- a/scripts/tracetool/format/tcg_h.py +++ /dev/null @@ -1,83 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -Generate .h file for TCG code generation. -""" - -__author__ = "Lluís Vilanova " -__copyright__ = "Copyright 2012-2017, Lluís Vilanova " -__license__ = "GPL version 2 or (at your option) any later version" - -__maintainer__ = "Stefan Hajnoczi" -__email__ = "stefanha@redhat.com" - - -from tracetool import out, Arguments -import tracetool.vcpu - - -def vcpu_transform_args(args): - assert len(args) == 1 - return Arguments([ - args, - # NOTE: this name must be kept in sync with the one in "tcg_h" - # NOTE: Current helper code uses TCGv_env (CPUArchState*) - ("TCGv_env", "__tcg_" + args.names()[0]), - ]) - - -def generate(events, backend, group): - if group == "root": - header = "trace/trace-root.h" - else: - header = "trace.h" - - out('/* This file is autogenerated by tracetool, do not edit. */', - '/* You must include this file after the inclusion of helper.h */', - '', - '#ifndef TRACE_%s_GENERATED_TCG_TRACERS_H' % group.upper(), - '#define TRACE_%s_GENERATED_TCG_TRACERS_H' % group.upper(), - '', - '#include "exec/helper-proto.h"', - '#include "%s"' % header, - '', - ) - - for e in events: - # just keep one of them - if "tcg-exec" not in e.properties: - continue - - out('static inline void %(name_tcg)s(%(args)s)', - '{', - name_tcg=e.original.api(e.QEMU_TRACE_TCG), - args=tracetool.vcpu.transform_args("tcg_h", e.original)) - - if "disable" not in e.properties: - args_trans = e.original.event_trans.args - args_exec = tracetool.vcpu.transform_args( - "tcg_helper_c", e.original.event_exec, "wrapper") - if "vcpu" in e.properties: - trace_cpu = e.args.names()[0] - cond = "trace_event_get_vcpu_state(%(cpu)s,"\ - " TRACE_%(id)s)"\ - % dict( - cpu=trace_cpu, - id=e.original.event_exec.name.upper()) - else: - cond = "true" - - out(' %(name_trans)s(%(argnames_trans)s);', - ' if (%(cond)s) {', - ' gen_helper_%(name_exec)s(%(argnames_exec)s);', - ' }', - name_trans=e.original.event_trans.api(e.QEMU_TRACE), - name_exec=e.original.event_exec.api(e.QEMU_TRACE), - argnames_trans=", ".join(args_trans.names()), - argnames_exec=", ".join(args_exec.names()), - cond=cond) - - out('}') - - out('', - '#endif /* TRACE_%s_GENERATED_TCG_TRACERS_H */' % group.upper()) diff --git a/scripts/tracetool/format/tcg_helper_c.py b/scripts/tracetool/format/tcg_helper_c.py deleted file mode 100644 index 72576e67d1..0000000000 --- a/scripts/tracetool/format/tcg_helper_c.py +++ /dev/null @@ -1,79 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -Generate trace/generated-helpers.c. -""" - -__author__ = "Lluís Vilanova " -__copyright__ = "Copyright 2012-2017, Lluís Vilanova " -__license__ = "GPL version 2 or (at your option) any later version" - -__maintainer__ = "Stefan Hajnoczi" -__email__ = "stefanha@redhat.com" - - -from tracetool import Arguments, out -from tracetool.transform import * -import tracetool.vcpu - - -def vcpu_transform_args(args, mode): - assert len(args) == 1 - # NOTE: this name must be kept in sync with the one in "tcg_h" - args = Arguments([(args.types()[0], "__tcg_" + args.names()[0])]) - if mode == "code": - return Arguments([ - # Does cast from helper requirements to tracing types - ("CPUState *", "env_cpu(%s)" % args.names()[0]), - ]) - else: - args = Arguments([ - # NOTE: Current helper code uses TCGv_env (CPUArchState*) - ("CPUArchState *", args.names()[0]), - ]) - if mode == "header": - return args - elif mode == "wrapper": - return args.transform(HOST_2_TCG) - else: - assert False - - -def generate(events, backend, group): - if group == "root": - header = "trace/trace-root.h" - else: - header = "trace.h" - - events = [e for e in events - if "disable" not in e.properties] - - out('/* This file is autogenerated by tracetool, do not edit. */', - '', - '#include "qemu/osdep.h"', - '#include "cpu.h"', - '#include "exec/helper-proto.h"', - '#include "%s"' % header, - '', - ) - - for e in events: - if "tcg-exec" not in e.properties: - continue - - e_args_api = tracetool.vcpu.transform_args( - "tcg_helper_c", e.original, "header").transform( - HOST_2_TCG_COMPAT, TCG_2_TCG_HELPER_DEF) - e_args_call = tracetool.vcpu.transform_args( - "tcg_helper_c", e, "code") - - out('void %(name_tcg)s(%(args_api)s)', - '{', - # NOTE: the check was already performed at TCG-generation time - ' %(name)s(%(args_call)s);', - '}', - name_tcg="helper_%s_proxy" % e.api(), - name=e.api(e.QEMU_TRACE_NOCHECK), - args_api=e_args_api, - args_call=", ".join(e_args_call.casted()), - ) diff --git a/scripts/tracetool/format/tcg_helper_h.py b/scripts/tracetool/format/tcg_helper_h.py deleted file mode 100644 index 08554fbc85..0000000000 --- a/scripts/tracetool/format/tcg_helper_h.py +++ /dev/null @@ -1,48 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -Generate trace/generated-helpers.h. -""" - -__author__ = "Lluís Vilanova " -__copyright__ = "Copyright 2012-2016, Lluís Vilanova " -__license__ = "GPL version 2 or (at your option) any later version" - -__maintainer__ = "Stefan Hajnoczi" -__email__ = "stefanha@redhat.com" - - -from tracetool import out -from tracetool.transform import * -import tracetool.vcpu - - -def generate(events, backend, group): - events = [e for e in events - if "disable" not in e.properties] - - out('/* This file is autogenerated by tracetool, do not edit. */', - '', - ) - - for e in events: - if "tcg-exec" not in e.properties: - continue - - # TCG helper proxy declaration - fmt = "DEF_HELPER_FLAGS_%(argc)d(%(name)s, %(flags)svoid%(types)s)" - e_args = tracetool.vcpu.transform_args("tcg_helper_c", e.original, "header") - args = e_args.transform(HOST_2_TCG_COMPAT, HOST_2_TCG, - TCG_2_TCG_HELPER_DECL) - types = ", ".join(args.types()) - if types != "": - types = ", " + types - - flags = "TCG_CALL_NO_RWG, " - - out(fmt, - flags=flags, - argc=len(args), - name=e.api() + "_proxy", - types=types, - ) diff --git a/scripts/tracetool/format/tcg_helper_wrapper_h.py b/scripts/tracetool/format/tcg_helper_wrapper_h.py deleted file mode 100644 index 0c5a9797d1..0000000000 --- a/scripts/tracetool/format/tcg_helper_wrapper_h.py +++ /dev/null @@ -1,70 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -Generate trace/generated-helpers-wrappers.h. -""" - -__author__ = "Lluís Vilanova " -__copyright__ = "Copyright 2012-2016, Lluís Vilanova " -__license__ = "GPL version 2 or (at your option) any later version" - -__maintainer__ = "Stefan Hajnoczi" -__email__ = "stefanha@redhat.com" - - -from tracetool import out -from tracetool.transform import * -import tracetool.vcpu - - -def generate(events, backend, group): - events = [e for e in events - if "disable" not in e.properties] - - out('/* This file is autogenerated by tracetool, do not edit. */', - '', - '#define tcg_temp_new_nop(v) (v)', - '#define tcg_temp_free_nop(v)', - '', - ) - - for e in events: - if "tcg-exec" not in e.properties: - continue - - # tracetool.generate always transforms types to host - e_args = tracetool.vcpu.transform_args("tcg_helper_c", e.original, "wrapper") - - # mixed-type to TCG helper bridge - args_tcg_compat = e_args.transform(HOST_2_TCG_COMPAT) - - code_new = [ - "%(tcg_type)s __%(name)s = %(tcg_func)s(%(name)s);" % - {"tcg_type": transform_type(type_, HOST_2_TCG), - "tcg_func": transform_type(type_, HOST_2_TCG_TMP_NEW), - "name": name} - for (type_, name) in args_tcg_compat - ] - - code_free = [ - "%(tcg_func)s(__%(name)s);" % - {"tcg_func": transform_type(type_, HOST_2_TCG_TMP_FREE), - "name": name} - for (type_, name) in args_tcg_compat - ] - - gen_name = "gen_helper_" + e.api() - - out('static inline void %(name)s(%(args)s)', - '{', - ' %(code_new)s', - ' %(proxy_name)s(%(tmp_names)s);', - ' %(code_free)s', - '}', - name=gen_name, - args=e_args, - proxy_name=gen_name + "_proxy", - code_new="\n ".join(code_new), - code_free="\n ".join(code_free), - tmp_names=", ".join(["__%s" % name for _, name in e_args]), - ) diff --git a/scripts/tracetool/vcpu.py b/scripts/tracetool/vcpu.py index 868b4cb04c..d232cb1d06 100644 --- a/scripts/tracetool/vcpu.py +++ b/scripts/tracetool/vcpu.py @@ -19,19 +19,9 @@ def transform_event(event): """Transform event to comply with the 'vcpu' property (if present).""" if "vcpu" in event.properties: - # events with 'tcg-trans' and 'tcg-exec' are auto-generated from - # already-patched events - assert "tcg-trans" not in event.properties - assert "tcg-exec" not in event.properties - event.args = Arguments([("void *", "__cpu"), event.args]) - if "tcg" in event.properties: - fmt = "\"cpu=%p \"" - event.fmt = [fmt + event.fmt[0], - fmt + event.fmt[1]] - else: - fmt = "\"cpu=%p \"" - event.fmt = fmt + event.fmt + fmt = "\"cpu=%p \"" + event.fmt = fmt + event.fmt return event diff --git a/trace/meson.build b/trace/meson.build index 29f3bffd5a..26b54714d5 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -66,19 +66,6 @@ trace_events_all = custom_target('trace-events-all', install: true, install_dir: qemu_datadir) -foreach d : [ - ['generated-helpers.c', 'tcg-helper-c'], - ['generated-helpers.h', 'tcg-helper-h'], - ['generated-helpers-wrappers.h', 'tcg-helper-wrapper-h'], -] - gen = custom_target(d[0], - output: d[0], - input: meson.project_source_root() / 'trace-events', - command: [ tracetool, '--group=root', '--format=@0@'.format(d[1]), '@INPUT@', '@OUTPUT@' ], - depend_files: tracetool_depends) - specific_ss.add(when: 'CONFIG_TCG', if_true: gen) -endforeach - if 'ust' in get_option('trace_backends') trace_ust_all_h = custom_target('trace-ust-all.h', output: 'trace-ust-all.h', From patchwork Wed Feb 9 14:15:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541100 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1405620imo; Wed, 9 Feb 2022 06:52:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNn9CCNajcMdf84dPTHyQnABAVPN1yjIw5z+iJkl/0UGEPA1V5i6uw78yMiO6vn7BQXFpR X-Received: by 2002:a25:5c3:: with SMTP id 186mr2561823ybf.255.1644418363793; Wed, 09 Feb 2022 06:52:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644418363; cv=none; d=google.com; s=arc-20160816; b=B8L978GZpvqT+QcfBCZH1vd/sAwdZpi8FnQ2s7N6yXdIh3Z7YrZR7lNxg8kfcslSp4 2RgOBCxoF6i9y8NL/Gp0YOerfhxSeCmJi7GUPheow2GhzcqkaohyHVHv5cI9HHzLnwl+ qq/v9zjxAFkzDmv2Fy5Zcm+YvTLFV9fSCMkO3zRxvW5O6KFy+rCfbKmlJjHTj++JIrpQ dOa1g2vLmrLK+JGJfxCYwoh6Xm9rTJPQj+I5YZLzhfbtyqxb37pitavFsHTFGFZ8KGcZ zVEaXQvfbg7UcnIze4ePRbeREHsqs+1o8YW9Bstdk+h6dNbP3gAWIrFU0Cb1H402YV9w MOgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=dgCjpzddyLR13n942aoYs6/a68SmDhnOYnBtsv8AWc0=; b=YkFe36d4CC3ak9JTlsUcaz74EFWU13J8tHrjarVCq9CjNAzgdHRy0ITf+BEN+PRJxX tOm9+XMFEJY9BzPxfVyLDnR11bfQi2oq/I/S4p1USYlqFUrVeBSAh7VW9jV5F/xCOf60 5n/usdPImbyPa3D2GMFge76fsf/YiiLt2eeDR04wo9RruNOELnJAHYUtkRxSpqaolzDx sQPM8YUj1NfXF1OapbbvB2+C2n9nzv9bhyJ730SuaYV3q8Bu4zyRi2Re/wbDUcsXAjCG nbljbRI2t9pkG4sTbfSt/ic0a9p4yt/L5hh+lMBxGcVTvcqDXyGN1KgFJuDmoUkLTux8 /3MQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=U7ghHn32; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w4si14501179ybt.831.2022.02.09.06.52.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 06:52:43 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=U7ghHn32; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHoKo-0007Jv-RC for patch@linaro.org; Wed, 09 Feb 2022 09:52:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHntx-0000JR-Hw for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:24:57 -0500 Received: from [2a00:1450:4864:20::42a] (port=33779 helo=mail-wr1-x42a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHntv-0001L2-DX for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:24:57 -0500 Received: by mail-wr1-x42a.google.com with SMTP id e3so4449517wra.0 for ; Wed, 09 Feb 2022 06:24:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dgCjpzddyLR13n942aoYs6/a68SmDhnOYnBtsv8AWc0=; b=U7ghHn32q8rEvlrCl0VOpBBboOaj+q2Qc0y3O3ws63NZ9/B8Ri/+V2F6IDsEhTCEyL 7wboFaZDV6Fv8YXnhWp5JLV89P8tM/UJgsnACFjMMozQ/eyVMSVVv4sL7mkULOVwEXtG rS6uo0Vf6Tx6B1EouKpSG5o/U8k48I81f1SoIvQjflRsM+xGB5tQ6yoKbN2LM6havtEn koJK2CqHJ3BN2mlCX9mUOC2IE7m9ZBxxCqCmZIQbJ1Z4Gw5X9ixIaqgJqa6PGm12p8gz 1YPoWqKVgMXQIhZXuxQjx0MgTWzpJ++AXWG45N95MfdMzqBpNfaFxrsrILSZgE89ercC PgXA== 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=dgCjpzddyLR13n942aoYs6/a68SmDhnOYnBtsv8AWc0=; b=ZmaFUIlSTiYOHbHjYnBjdzjAoSb+YyXm/L70eQRU7/hm2DYZVojb6h68tD/pYXJ20E Q5kuKnGbCkywGqwZZ0krR4lRsBXE/mgPHYJLUuotGKCURjjZBBUOlHbQ1rFRXMwBy3m9 /qLNM5n5T009/2luo3WfLypKx0GckrXWCoGyTRXvd3WcTR4OtFjujwruwNf4MbbCxSsC gG4N2Zxif+x0FCFvalulyOa5OPl/XZGtXTMsnQ4Oyc9W1K2S59fZctjTEb/uJPuQlugr MR7UAuZ+nhbkQDn8QjsQfloItDhhbltV95N9NvumodtXDiYy7E3pnf2dTij4df7Q1szp 30PA== X-Gm-Message-State: AOAM532uZJvE1JVGsVI8u1goCStGC1WOpGkru1MRQRwCtI+vVSveXVTo +hfsBROPQECDXYphiMk2Yws4mQ== X-Received: by 2002:a05:6000:1548:: with SMTP id 8mr2270818wry.242.1644416694032; Wed, 09 Feb 2022 06:24:54 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t11sm1788178wrm.46.2022.02.09.06.24.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:24:49 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 39ACA1FFB8; Wed, 9 Feb 2022 14:15:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 21/28] plugins: add helper functions for coverage plugins Date: Wed, 9 Feb 2022 14:15:22 +0000 Message-Id: <20220209141529.3418384-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42a (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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: Ivanov Arkady , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Alexandre Iooss Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Ivanov Arkady Which provide information about: - start_code. - end_code. - entry. - path to the executable binary. Signed-off-by: Ivanov Arkady Message-Id: <163491883461.304355.8210754161847179432.stgit@pc-System-Product-Name> [AJB: reword title, better descriptions, defaults, rm export, fix include] Signed-off-by: Alex Bennée Message-Id: <20220204204335.1689602-22-alex.bennee@linaro.org> diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h index 5f1017201f..535ddbf0ae 100644 --- a/include/qemu/qemu-plugin.h +++ b/include/qemu/qemu-plugin.h @@ -590,4 +590,38 @@ void qemu_plugin_outs(const char *string); */ bool qemu_plugin_bool_parse(const char *name, const char *val, bool *ret); +/** + * qemu_plugin_path_to_binary() - path to binary file being executed + * + * Return a string representing the path to the binary. For user-mode + * this is the main executable. For system emulation we currently + * return NULL. The user should g_free() the string once no longer + * needed. + */ +const char *qemu_plugin_path_to_binary(void); + +/** + * qemu_plugin_start_code() - returns start of text segment + * + * Returns the nominal start address of the main text segment in + * user-mode. Currently returns 0 for system emulation. + */ +uint64_t qemu_plugin_start_code(void); + +/** + * qemu_plugin_end_code() - returns end of text segment + * + * Returns the nominal end address of the main text segment in + * user-mode. Currently returns 0 for system emulation. + */ +uint64_t qemu_plugin_end_code(void); + +/** + * qemu_plugin_entry_code() - returns start address for module + * + * Returns the nominal entry address of the main text segment in + * user-mode. Currently returns 0 for system emulation. + */ +uint64_t qemu_plugin_entry_code(void); + #endif /* QEMU_PLUGIN_API_H */ diff --git a/plugins/api.c b/plugins/api.c index b143b09ce9..91e0c7074c 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -44,6 +44,11 @@ #ifndef CONFIG_USER_ONLY #include "qemu/plugin-memory.h" #include "hw/boards.h" +#else +#include "qemu.h" +#ifdef CONFIG_LINUX +#include "loader.h" +#endif #endif /* Uninstall and Reset handlers */ @@ -391,3 +396,46 @@ bool qemu_plugin_bool_parse(const char *name, const char *value, bool *ret) { return name && value && qapi_bool_parse(name, value, ret, NULL); } + +/* + * Binary path, start and end locations + */ +const char *qemu_plugin_path_to_binary(void) +{ + char *path = NULL; +#ifdef CONFIG_USER_ONLY + TaskState *ts = (TaskState *) current_cpu->opaque; + path = g_strdup(ts->bprm->filename); +#endif + return path; +} + +uint64_t qemu_plugin_start_code(void) +{ + uint64_t start = 0; +#ifdef CONFIG_USER_ONLY + TaskState *ts = (TaskState *) current_cpu->opaque; + start = ts->info->start_code; +#endif + return start; +} + +uint64_t qemu_plugin_end_code(void) +{ + uint64_t end = 0; +#ifdef CONFIG_USER_ONLY + TaskState *ts = (TaskState *) current_cpu->opaque; + end = ts->info->end_code; +#endif + return end; +} + +uint64_t qemu_plugin_entry_code(void) +{ + uint64_t entry = 0; +#ifdef CONFIG_USER_ONLY + TaskState *ts = (TaskState *) current_cpu->opaque; + entry = ts->info->entry; +#endif + return entry; +} diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols index 4834756ba3..71f6c90549 100644 --- a/plugins/qemu-plugins.symbols +++ b/plugins/qemu-plugins.symbols @@ -1,5 +1,7 @@ { qemu_plugin_bool_parse; + qemu_plugin_end_code; + qemu_plugin_entry_code; qemu_plugin_get_hwaddr; qemu_plugin_hwaddr_device_name; qemu_plugin_hwaddr_is_io; @@ -17,6 +19,7 @@ qemu_plugin_n_max_vcpus; qemu_plugin_n_vcpus; qemu_plugin_outs; + qemu_plugin_path_to_binary; qemu_plugin_register_atexit_cb; qemu_plugin_register_flush_cb; qemu_plugin_register_vcpu_exit_cb; @@ -33,6 +36,7 @@ qemu_plugin_register_vcpu_tb_exec_inline; qemu_plugin_register_vcpu_tb_trans_cb; qemu_plugin_reset; + qemu_plugin_start_code; qemu_plugin_tb_get_insn; qemu_plugin_tb_n_insns; qemu_plugin_tb_vaddr; From patchwork Wed Feb 9 14:15:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541113 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1442320imo; Wed, 9 Feb 2022 07:36:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJyM/52GoWk3DUdZP9xStarjqAbzr4nfRB6Sk2HJtk7vtisNZyBLJgzWEzyYhF0IPYfv6S3k X-Received: by 2002:a81:df0a:: with SMTP id c10mr2721228ywn.0.1644420992914; Wed, 09 Feb 2022 07:36:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644420992; cv=none; d=google.com; s=arc-20160816; b=wm6hysJDqfYoMX83gJGCSaJAXrqfaJWno3gfWEPxCmNk3LQZbYnPIl7uSr3d/S5e5z C+IkJEQVlDMdR/3KY2LWlGrX0fkQw55jZs9wDBNY8gdCdwZYE6Wl/k4vpEL++5yppLb6 NickBh9KBcP3J23U3GzxhysE04RZ2vw9W2YJB5GV5pyDcEt20Dy9t9FlXuo/jIHyYtnC zMwa/sMwbEcfH62Gln/iQYqUTGjMMr3lgrAtlosyT/XfoZbWNe42nyH1y2lF2UrLMD8M g5Th2P4QpTJZsol/trbrhPjoQ7waKiwMabKKJuWy7a3tciA/WT8VVp/J1jrtJqT9GOde 9V6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=jZCQ7LtYjkNpZcIUcntr9yNzTTMtZKopN6QvGhfoSiw=; b=ycvbu7VVY9XiqGSIvkQIimpuUKZkdn4q3IB6+Sl3gj+3ERT1SQyo4QMPaeZ3I8EzpB xR2cSK5ymCpdvhdT+vBeyItfOrjUONgGKg8p/6D3dC12q3SNrVLaK5XHoiGN9DwqvtjN O2qJ1/OYRS3Ep5NwRIpiDxkdDnxNHP7HbfZQ1JpDmP1nX59arYe70drGeA37jq6E/R9N zAPc6lf908aDgbXmqij0PrCdm0rTx+h+mWGJdZ9YFKaw9iD4S3C9bs/Ht20Gr02+kDVW EzdWJxrr2jubuDwsDYVKrVamewH4/ow/yiktmQ32YfJcM7mNHUEulVvOAvmMAs6Iu30M iC9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="vYpQh95/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c62si12533889ybc.235.2022.02.09.07.36.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 07:36:32 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="vYpQh95/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHp1E-0003Sc-BQ for patch@linaro.org; Wed, 09 Feb 2022 10:36:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnlN-0002Zy-VQ for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:06 -0500 Received: from [2a00:1450:4864:20::630] (port=42533 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 1nHnlJ-0007sf-3n for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:05 -0500 Received: by mail-ej1-x630.google.com with SMTP id m4so7693841ejb.9 for ; Wed, 09 Feb 2022 06:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jZCQ7LtYjkNpZcIUcntr9yNzTTMtZKopN6QvGhfoSiw=; b=vYpQh95/sMuzoS4QOqzwF4vDmS99XBMPp5ebTmumsXs03kgTsRXhAMvgumAgoxwZXV iNv4r6rb1b5YLFJ39l90SkVzfVZMESgEU6SxK+l8gzA8ZPRHxnO1eM/DIVXTUAI6Qxxg iw3cYBuDGlLD1baG83TRG3xl0/FgMZfiLSgD7+iFtLBt3On/7SdNZn9+mqpzMwzoLVIZ LTQH93imL1eEdAq68IjwXJ5vDzlDRsYAlJydSa+qVmjqHS0xgBTFTx+uo4PK5/iDPMRM EDDtbsR7JNIuQAS+tfNnLxzi21yWhyLq8tUYNJIS732yP4+rqTIP/xe8eV9Tkil14cge HvxQ== 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=jZCQ7LtYjkNpZcIUcntr9yNzTTMtZKopN6QvGhfoSiw=; b=SWWMyb/4Q16t6ZiAoTIyuaM0AoNAxDk0FkN6R8a4c09GVjSkF8yEcGpSPGmPqCBqFM yFTrCi7NrHpZyT6wrx/QZMgHZfWwIAl0HMPhdrNv0gKMNBBh6j/oiMSuqDwXSvvYNRr4 2tUPBqn22bRdN1zU7pMb4M2lTWFhmWQRobFmtOWIp2kyrgHpNIhwePHmRsYmSky++u4n /yaw6C/5rRYtdyt13mbAAwcXGZ//eCe2Jp+Q/y6M4kh+WmihnWoRdeVloisST0y/GQ4f +dxZdWEHmmEG+crbtp8rQ6kwjZqEVmvvxi+iYsRPMnPxKjL9gIWeoh+HKjCHHEWCL2rd cfXg== X-Gm-Message-State: AOAM530SCNN6OPnhFKpAsQLoRoWfP281VHZDu4fryJDYV1NLtoOiNUBV /w0Wgvc3Ii3iaQpBB+FZSwP/+g== X-Received: by 2002:a17:907:9620:: with SMTP id gb32mr2195826ejc.546.1644416153048; Wed, 09 Feb 2022 06:15:53 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i24sm2043339edt.86.2022.02.09.06.15.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:48 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 531361FFCD; Wed, 9 Feb 2022 14:15:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 22/28] contrib/plugins: add a drcov plugin Date: Wed, 9 Feb 2022 14:15:23 +0000 Message-Id: <20220209141529.3418384-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::630 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x630.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: Ivanov Arkady , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Alexandre Iooss Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Ivanov Arkady This patch adds the ability to generate files in drcov format. Primary goal this script is to have coverage logfiles thatwork in Lighthouse. Signed-off-by: Ivanov Arkady Message-Id: <163491884553.304355.13246023070235438959.stgit@pc-System-Product-Name> [AJB: use g_ptr_array instead of slist] Signed-off-by: Alex Bennée Message-Id: <20220204204335.1689602-23-alex.bennee@linaro.org> diff --git a/contrib/plugins/drcov.c b/contrib/plugins/drcov.c new file mode 100644 index 0000000000..b4a855adaf --- /dev/null +++ b/contrib/plugins/drcov.c @@ -0,0 +1,163 @@ +/* + * Copyright (C) 2021, Ivanov Arkady + * + * Drcov - a DynamoRIO-based tool that collects coverage information + * from a binary. Primary goal this script is to have coverage log + * files that work in Lighthouse. + * + * License: GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION; + +static char header[] = "DRCOV VERSION: 2\n" + "DRCOV FLAVOR: drcov-64\n" + "Module Table: version 2, count 1\n" + "Columns: id, base, end, entry, path\n"; + +static FILE *fp; +static const char *file_name = "file.drcov.trace"; +static GMutex lock; + +typedef struct { + uint32_t start; + uint16_t size; + uint16_t mod_id; + bool exec; +} bb_entry_t; + +/* Translated blocks */ +static GPtrArray *blocks; + +static void printf_header(unsigned long count) +{ + fprintf(fp, "%s", header); + const char *path = qemu_plugin_path_to_binary(); + uint64_t start_code = qemu_plugin_start_code(); + uint64_t end_code = qemu_plugin_end_code(); + uint64_t entry = qemu_plugin_entry_code(); + fprintf(fp, "0, 0x%lx, 0x%lx, 0x%lx, %s\n", + start_code, end_code, entry, path); + fprintf(fp, "BB Table: %ld bbs\n", count); +} + +static void printf_char_array32(uint32_t data) +{ + const uint8_t *bytes = (const uint8_t *)(&data); + fwrite(bytes, sizeof(char), sizeof(data), fp); +} + +static void printf_char_array16(uint16_t data) +{ + const uint8_t *bytes = (const uint8_t *)(&data); + fwrite(bytes, sizeof(char), sizeof(data), fp); +} + + +static void printf_el(gpointer data, gpointer user_data) +{ + bb_entry_t *bb = (bb_entry_t *)data; + if (bb->exec) { + printf_char_array32(bb->start); + printf_char_array16(bb->size); + printf_char_array16(bb->mod_id); + } + g_free(bb); +} + +static void count_block(gpointer data, gpointer user_data) +{ + unsigned long *count = (unsigned long *) user_data; + bb_entry_t *bb = (bb_entry_t *)data; + if (bb->exec) { + *count = *count + 1; + } +} + +static void plugin_exit(qemu_plugin_id_t id, void *p) +{ + unsigned long count = 0; + g_mutex_lock(&lock); + g_ptr_array_foreach(blocks, count_block, &count); + + /* Print function */ + printf_header(count); + g_ptr_array_foreach(blocks, printf_el, NULL); + + /* Clear */ + g_ptr_array_free(blocks, true); + + fclose(fp); + + g_mutex_unlock(&lock); +} + +static void plugin_init(void) +{ + fp = fopen(file_name, "wb"); + blocks = g_ptr_array_sized_new(128); +} + +static void vcpu_tb_exec(unsigned int cpu_index, void *udata) +{ + bb_entry_t *bb = (bb_entry_t *) udata; + + g_mutex_lock(&lock); + bb->exec = true; + g_mutex_unlock(&lock); +} + +static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) +{ + uint64_t pc = qemu_plugin_tb_vaddr(tb); + size_t n = qemu_plugin_tb_n_insns(tb); + + g_mutex_lock(&lock); + + bb_entry_t *bb = g_new0(bb_entry_t, 1); + for (int i = 0; i < n; i++) { + bb->size += qemu_plugin_insn_size(qemu_plugin_tb_get_insn(tb, i)); + } + + bb->start = pc; + bb->mod_id = 0; + bb->exec = false; + g_ptr_array_add(blocks, bb); + + g_mutex_unlock(&lock); + qemu_plugin_register_vcpu_tb_exec_cb(tb, vcpu_tb_exec, + QEMU_PLUGIN_CB_NO_REGS, + (void *)bb); + +} + +QEMU_PLUGIN_EXPORT +int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, + int argc, char **argv) +{ + for (int i = 0; i < argc; i++) { + g_autofree char **tokens = g_strsplit(argv[i], "=", 2); + if (g_strcmp0(tokens[0], "filename") == 0) { + file_name = g_strdup(tokens[1]); + } + } + + plugin_init(); + + qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans); + qemu_plugin_register_atexit_cb(id, plugin_exit, NULL); + + return 0; +} diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index 54ac5ccd9f..df3499f4f2 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -20,6 +20,7 @@ NAMES += howvec NAMES += lockstep NAMES += hwprofile NAMES += cache +NAMES += drcov SONAMES := $(addsuffix .so,$(addprefix lib,$(NAMES))) From patchwork Wed Feb 9 14:15:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541120 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1472289imo; Wed, 9 Feb 2022 08:13:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJwITTJ9AZ+svdMF37PZdMIQkz8MA50CHZl9t6+nsAveOe9qW3Gj7eZ+Wn106MlnakTivixd X-Received: by 2002:a05:6902:247:: with SMTP id k7mr2675644ybs.322.1644423198964; Wed, 09 Feb 2022 08:13:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644423198; cv=none; d=google.com; s=arc-20160816; b=FNrr7uSXwgl4NjgtCIkNsCPbXVCaC+7wG+1VaOqQg7xMz4iWvYwAAVGfxY5O2nBi+f E2k0KTyI9MeuiaaFVn60bwvjUd3IOD2BLFDPPYwcu/EQPvk1kJIKJmQWgrQk4yFMDeo5 H4Me3uHeibfF0A16yQH7TDEZjq9ZnG4zm071JuvAOAl3PKJ+iL8wVUZewlyM02pYvNVb 7JVPQNJxaBY0UxqQvph/PbFPcSD11qiKs3CilOQhatHlEQPRsQGvPWvJSrkXHCl+ZiKM 9evPdGe7P28f9V0A0Kxh83SX5SZUX0B4VnzE4j0jdr2pfcusE5AhwDYuY3N2/WFfEsWj 6Ybw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=FY3te3zfqLp5nnKkdOF5vtBHhRQZFWMIIuZXZpuWjGs=; b=anmIjibmZHBxiM+UDs3cxxARSRVrHnzVAqnvKePqqzDRcecX2DERlkvIdZ5HZxPRxR UY+xcBoPpFjChCUwLcbxE20F/BxMQiLlYj8LwGEEpuvwQrXI/HhgMDvXqh+jvUz2i3U7 C65e1fif61sXvA/SMEtUHGvTXJXAh6q6g2eDKyHZa/xxP5qPqyuMhdcoutlaas7c7sur b0ekStjgRdiWrf0vAtGi1H9wJvyqK88RguOqvI3gWAw5oGQu2nbPsgcRveZgx/d3VoO2 bH7rWmcIdv1ik9H/7fBP97yhznnCBKfD1oAbiXIKlA4YqUJ9S3pwwadjj0Z7qTHjxdGM P/iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="HfdBd5/4"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b124si13241106ybc.450.2022.02.09.08.13.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 08:13:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="HfdBd5/4"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHpao-0007ZW-F0 for patch@linaro.org; Wed, 09 Feb 2022 11:13:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnll-00030W-QI for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:30 -0500 Received: from [2a00:1450:4864:20::536] (port=36683 helo=mail-ed1-x536.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnlK-0007sO-Be for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:13 -0500 Received: by mail-ed1-x536.google.com with SMTP id s7so5409617edd.3 for ; Wed, 09 Feb 2022 06:15:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FY3te3zfqLp5nnKkdOF5vtBHhRQZFWMIIuZXZpuWjGs=; b=HfdBd5/4cVkZTHOe3TjmMjjdExy3pep8L7EaL7rn+maOBqJ9UeiXrlgKazuEDVbT7Y Q4hW9JKyC8HtVxPnlaguPm6AKStcFbuJFxtSn4SwWAqMDOcu0AcnseFrRfHkAYhcrQo6 UMvXgagQ07DXxKh095uJuYOTlziuKnQzTu3w8d7gvjIEPQ1ySn+iCXr7q3jZGchUhAiy YE73c/mzyJwXJiUdWsBWGzKlQ7+4VBD2VIH9kLEj0IH+oBQCPek85mbG2biwvVZY+ixW lheOCDAd0kxOYyx9j7z2uPFsjlbhmxWeQjk2srpYOnOCPJ0VFOOWssflrwrYDqZ4FJyB GLQg== 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=FY3te3zfqLp5nnKkdOF5vtBHhRQZFWMIIuZXZpuWjGs=; b=3bAYi2MvJWHDB/fy1ohq74jg1V8LOw1XroHdOg7HyKHdHsxdPmcex6r6TLWKf6VKLF oYbtwNRCQExtHUo1ScyszKlnRu7ZzxMFRzSDYSQIBjz/9QAesuJ1jAhuzXhB3q7UEfcS LjklSmV/M4zIhuqpC4z1fI9yGj94MvzWf3+bydpudKrbMKVjcezYhkMzWeGE9O74GUVe CSB+Z+hpupwUk4DvSBR4/hCcjzywEpdOg0kHXMWgnaIQqVavmPIVKpv6iw0SgTJOOBuG 25ftdU/g5CsQ4DU/GB7LxCnkVttT4Ffj2PujFWsja96XeQOS/T+HFOwCqCYJ+w9/eaB3 Bbyw== X-Gm-Message-State: AOAM531uvvhLIU6UtXXr6w9xNyWlX8AAp00lSMS9uskJ5Q0P6JBHXCLo vqnhZNhyWkJ5unoBFYMGzicAcQ== X-Received: by 2002:a05:6402:12d5:: with SMTP id k21mr2756794edx.138.1644416150081; Wed, 09 Feb 2022 06:15:50 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f19sm4421537edr.96.2022.02.09.06.15.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:48 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 60B911FFCE; Wed, 9 Feb 2022 14:15:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 23/28] tests/plugin: allow libinsn.so per-CPU counts Date: Wed, 9 Feb 2022 14:15:24 +0000 Message-Id: <20220209141529.3418384-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::536 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x536.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: Alexandre Iooss , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We won't go fully flexible but for most system emulation 8 vCPUs resolution should be enough for anybody ;-) Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220204204335.1689602-24-alex.bennee@linaro.org> diff --git a/tests/plugin/insn.c b/tests/plugin/insn.c index d229fdc001..d5a0a08cb4 100644 --- a/tests/plugin/insn.c +++ b/tests/plugin/insn.c @@ -16,22 +16,33 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION; -static uint64_t insn_count; +#define MAX_CPUS 8 /* lets not go nuts */ + +typedef struct { + uint64_t last_pc; + uint64_t insn_count; +} InstructionCount; + +static InstructionCount counts[MAX_CPUS]; +static uint64_t inline_insn_count; + static bool do_inline; static bool do_size; +static bool do_frequency; static GArray *sizes; static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata) { - static uint64_t last_pc; + unsigned int i = cpu_index % MAX_CPUS; + InstructionCount *c = &counts[i]; uint64_t this_pc = GPOINTER_TO_UINT(udata); - if (this_pc == last_pc) { + if (this_pc == c->last_pc) { g_autofree gchar *out = g_strdup_printf("detected repeat execution @ 0x%" PRIx64 "\n", this_pc); qemu_plugin_outs(out); } - last_pc = this_pc; - insn_count++; + c->last_pc = this_pc; + c->insn_count++; } static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) @@ -44,7 +55,7 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) if (do_inline) { qemu_plugin_register_vcpu_insn_exec_inline( - insn, QEMU_PLUGIN_INLINE_ADD_U64, &insn_count, 1); + insn, QEMU_PLUGIN_INLINE_ADD_U64, &inline_insn_count, 1); } else { uint64_t vaddr = qemu_plugin_insn_vaddr(insn); qemu_plugin_register_vcpu_insn_exec_cb( @@ -66,9 +77,9 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) static void plugin_exit(qemu_plugin_id_t id, void *p) { g_autoptr(GString) out = g_string_new(NULL); + int i; if (do_size) { - int i; for (i = 0; i <= sizes->len; i++) { unsigned long *cnt = &g_array_index(sizes, unsigned long, i); if (*cnt) { @@ -76,8 +87,20 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) "len %d bytes: %ld insns\n", i, *cnt); } } + } else if (do_inline) { + g_string_append_printf(out, "insns: %" PRIu64 "\n", inline_insn_count); } else { - g_string_append_printf(out, "insns: %" PRIu64 "\n", insn_count); + uint64_t total_insns = 0; + for (i = 0; i < MAX_CPUS; i++) { + InstructionCount *c = &counts[i]; + if (c->insn_count) { + g_string_append_printf(out, "cpu %d insns: %" PRIu64 "\n", + i, c->insn_count); + total_insns += c->insn_count; + } + } + g_string_append_printf(out, "total insns: %" PRIu64 "\n", + total_insns); } qemu_plugin_outs(out->str); } From patchwork Wed Feb 9 14:15:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541097 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1394251imo; Wed, 9 Feb 2022 06:37:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJzmB2rJdnFvm5XbjYheHJ6EzhFBuhjWIBJYrv+G08y1FQKFtkAqfvkJ+kEuVQlq2oQMIKd5 X-Received: by 2002:a25:bc47:: with SMTP id d7mr2487828ybk.122.1644417446216; Wed, 09 Feb 2022 06:37:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644417446; cv=none; d=google.com; s=arc-20160816; b=jJgaAlk5p/9WIuztRqqbE2keSADF1IjXYsgWuIKeNPeR4aw+I5cMCkp0e4DiMqaYsM lbN5632ObK0ZOtso8uQuqYOQ/pQGxafHzwLvchvjGWv8MT5mleSujmPRoEST1c64nTle EO1LWN0RhwX7ZnSYU0okOq6dP3GB39kuE0BqVTVHLB9aFwURgsjLGAVSKmYoq64sJHol hKBcpQ1gwDavM0FrSZ2+ABc0ezZJc3hXVLq4knGX54bK5ywweivopmgMi82EWNwct/2k KnVQoG+mELhgWwHwqH5pgcKaMVCmP8IGU+poFIxF3BZ5jwb1IVtwBleFyJdwXyEW3VDn lakQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=D2SU2BVtazPSSzG80PekxDXRIejR2lmUffnXojxk3AU=; b=KrX2COC7UbJ50Itj5+1483JtA4xufB/C4yAJem+gASOOqIjEe5/vDbQMOhGeGqox6y oEC6awlCnCQclwaTDFZy65fov1mczBETMDTzCxpNN6oNCgvAtxAsIywpoS2AkMTAcyt1 CZT8cyZskdYqAP5hndorRrwcJ+MOjIxoza90ZL8sTdFjswxPf74+0mDapqge+I3GyJzr P3DARkQXKdKUkw/kajE1u2kaFRTdMUIxIcBfg7yd/RZVEZzYuz3r1sXOgZswSpjBcGS/ qW+fdDlJg/1NaP+7NnNIHhEkXEFgSvGnoyzt/GGOdUs+yvbzZXa/eWLHinN/dkTZbHmA 8Lnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MFCSa+Kp; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e82si5758007ywa.380.2022.02.09.06.37.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 06:37:26 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MFCSa+Kp; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHo61-0003MI-M3 for patch@linaro.org; Wed, 09 Feb 2022 09:37:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnlO-0002b2-Iy for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:06 -0500 Received: from [2a00:1450:4864:20::62e] (port=37625 helo=mail-ej1-x62e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHnlJ-0007sS-4k for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:16:06 -0500 Received: by mail-ej1-x62e.google.com with SMTP id fj5so4876275ejc.4 for ; Wed, 09 Feb 2022 06:15:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D2SU2BVtazPSSzG80PekxDXRIejR2lmUffnXojxk3AU=; b=MFCSa+KpMWCyNzEY8714Lf2PNjkOC0kvIp/tWKY9OaHRH+eFQfv5MLSUtpdWzzXWkh 1nzZbwMpv+XElDicIlFfiCK1MFMgqugRM/VlVe7pA1/Ad1H8IsERcfnS1Yg61aJTWkqy 57d7mSNgwYKL0Yoa9gmgpdt1mhAMeWpjd37Q/vTE/rQj5qAsXa/tbIgH6ahaHekD5O/Y p9pANd4yyJ6f6C/rh76tR2dVS3F/Sr0SxZkgEFjNznrWreY2LHfOlWAUEzYlfKTQlyYK RNjBuhqX2g8XE7TW921U/gE0122BEa+Ae0ZXuTRS+YbReOgAnbyG08+NfEO3loF3ouT7 Ir2Q== 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=D2SU2BVtazPSSzG80PekxDXRIejR2lmUffnXojxk3AU=; b=lXpuRzIBaP8otvvE4qi4hoSOTrOID5kHNqu8iik4xX1DzNyexzXWNPj8At4ZfHgDJc PK/YWlr3z1KbJ2ZB0EMroraXNoQmZAc2AYt8wd8SndxnpPKudRg6Iilk7pN6ZbEIWnxP +qOcRxEgam2ZyduY0MeLQNtESPcLXV1MrQs3iMaFyDXyYyPuYePfu1yBGuX/XbYdk80r 6R3vN5RqK1Rg/iOhxqLGgq26Mb7CrhWcjtREHzfJA9CgYoFLsFFA2wWZBBAH5E99yS+k 1SzjGIit3WAitS/Y+uoKtH7xVjpIxiUZJL5NnPQbIPqsFlwyIIUAfXUPdTcghKUoMyuq OZ6A== X-Gm-Message-State: AOAM532s1Ix7bS+yHf3BLFcykmvpUsgokFHLjX7oeZcI4YgCZuDdgsij 6BwdUWXINg3+lIhul2buaB1qdw== X-Received: by 2002:a17:906:488b:: with SMTP id v11mr2144897ejq.311.1644416151555; Wed, 09 Feb 2022 06:15:51 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id da16sm3379595edb.72.2022.02.09.06.15.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:15:48 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 779CD1FFCF; Wed, 9 Feb 2022 14:15:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 24/28] tests/plugins: add instruction matching to libinsn.so Date: Wed, 9 Feb 2022 14:15:25 +0000 Message-Id: <20220209141529.3418384-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62e.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: Vasilev Oleg , Richard Henderson , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Emilio Cota , Alexandre Iooss , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This adds simple instruction matching to the libinsn.so plugin which is useful for examining the execution distance between instructions. For example to track how often we flush in ARM due to TLB updates: -plugin ./tests/plugin/libinsn.so,match=tlbi which leads to output like this: 0xffffffc01019a918, 'tlbi vale1is, x1', 5702 hits, 31825 match hits, Δ+8112 since last match, 68859 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5703 hits, 56593 match hits, Δ+17712125 since last match, 33455 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5704 hits, 56594 match hits, Δ+12689 since last match, 33454 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5705 hits, 56595 match hits, Δ+12585 since last match, 33454 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5706 hits, 56596 match hits, Δ+10491 since last match, 33454 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5707 hits, 56597 match hits, Δ+4721 since last match, 33453 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5708 hits, 56598 match hits, Δ+10733 since last match, 33453 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5709 hits, 56599 match hits, Δ+61959 since last match, 33453 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5710 hits, 56600 match hits, Δ+55235 since last match, 33454 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5711 hits, 56601 match hits, Δ+54373 since last match, 33454 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5712 hits, 56602 match hits, Δ+2705 since last match, 33453 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5713 hits, 56603 match hits, Δ+17262 since last match, 33453 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5714 hits, 56604 match hits, Δ+17206 since last match, 33453 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5715 hits, 56605 match hits, Δ+28940 since last match, 33453 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5716 hits, 56606 match hits, Δ+7370 since last match, 33452 avg insns/match 0xffffffc01019a918, 'tlbi vale1is, x1', 5717 hits, 56607 match hits, Δ+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ée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220204204335.1689602-25-alex.bennee@linaro.org> 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; static bool do_inline; static bool do_size; -static bool do_frequency; static GArray *sizes; +typedef struct { + char *match_string; + uint64_t hits[MAX_CPUS]; + uint64_t last_hit[MAX_CPUS]; + uint64_t total_delta[MAX_CPUS]; + GPtrArray *history[MAX_CPUS]; +} Match; + +static GArray *matches; + +typedef struct { + Match *match; + uint64_t vaddr; + uint64_t hits; + char *disas; +} Instruction; + static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata) { unsigned int i = cpu_index % MAX_CPUS; @@ -45,6 +61,37 @@ static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata) c->insn_count++; } +static void vcpu_insn_matched_exec_before(unsigned int cpu_index, void *udata) +{ + unsigned int i = cpu_index % MAX_CPUS; + Instruction *insn = (Instruction *) udata; + Match *match = insn->match; + g_autoptr(GString) ts = g_string_new(""); + + insn->hits++; + g_string_append_printf(ts, "0x%" PRIx64 ", '%s', %"PRId64 " hits", + insn->vaddr, insn->disas, insn->hits); + + uint64_t icount = counts[i].insn_count; + uint64_t delta = icount - match->last_hit[i]; + + match->hits[i]++; + match->total_delta[i] += delta; + + g_string_append_printf(ts, + ", %"PRId64" match hits, " + "Δ+%"PRId64 " since last match," + " %"PRId64 " avg insns/match\n", + match->hits[i], delta, + match->total_delta[i] / match->hits[i]); + + match->last_hit[i] = icount; + + qemu_plugin_outs(ts->str); + + g_ptr_array_add(match->history[i], insn); +} + static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) { size_t n = qemu_plugin_tb_n_insns(tb); @@ -71,6 +118,29 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) unsigned long *cnt = &g_array_index(sizes, unsigned long, sz); (*cnt)++; } + + /* + * If we are tracking certain instructions we will need more + * information about the instruction which we also need to + * save if there is a hit. + */ + if (matches) { + char *insn_disas = qemu_plugin_insn_disas(insn); + int j; + for (j = 0; j < matches->len; j++) { + Match *m = &g_array_index(matches, Match, j); + if (g_str_has_prefix(insn_disas, m->match_string)) { + Instruction *rec = g_new0(Instruction, 1); + rec->disas = g_strdup(insn_disas); + rec->vaddr = qemu_plugin_insn_vaddr(insn); + rec->match = m; + qemu_plugin_register_vcpu_insn_exec_cb( + insn, vcpu_insn_matched_exec_before, + QEMU_PLUGIN_CB_NO_REGS, rec); + } + } + g_free(insn_disas); + } } } @@ -105,6 +175,21 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) qemu_plugin_outs(out->str); } + +/* Add a match to the array of matches */ +static void parse_match(char *match) +{ + Match new_match = { .match_string = match }; + int i; + for (i = 0; i < MAX_CPUS; i++) { + new_match.history[i] = g_ptr_array_new(); + } + if (!matches) { + matches = g_array_new(false, true, sizeof(Match)); + } + g_array_append_val(matches, new_match); +} + QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, int argc, char **argv) @@ -122,6 +207,8 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, fprintf(stderr, "boolean argument parsing failed: %s\n", opt); return -1; } + } else if (g_strcmp0(tokens[0], "match") == 0) { + parse_match(tokens[1]); } else { fprintf(stderr, "option parsing failed: %s\n", opt); return -1; From patchwork Wed Feb 9 14:15:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541121 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1475971imo; Wed, 9 Feb 2022 08:17:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJyKXV7Rc7bB2T2Pv4j0UIHOHrcGClWhioGdDRuVa5Upt0tJioTca+1EJEqa+HTD/OujCjnK X-Received: by 2002:a81:328b:: with SMTP id y133mr1888630ywy.360.1644423449469; Wed, 09 Feb 2022 08:17:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644423449; cv=none; d=google.com; s=arc-20160816; b=p72CqoDvN5Oat1IDhUKq6cdWP1qZntu8XgxjJVFa5zRb7B0pGdZXMXcmJEogsCeFDr c159htIC0Ixbwu9GLXIXmjBoOUbV3qfboHSgW+ee3CFBRRl0nJtQ1jW9iXu5POCQA/Gv tlFtHF0cEH+kLUXDwSPrgGURe8NCQaCM5UHnPaWzzXJgBPbx4DVpnL1uS9yJLkivdsE1 +Zuz5f+qutVDx+vbVACJ/MuFnStAmpT7LHEUmGKZwt1+UxK74lhFHy9NC0XIRbUqAvzD rs+CHuJMoXOCxd6ZmjmT+dl27I9APb8SknhmY96AzDZuEYatrITNkcE4XkkXU2J6Wcna uu9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Nc7NqSSiuD8zDZWIBuWD4uXfx2qSa99zJOclVo9lxBA=; b=rTuTCY9Y1AQhMG9KZ8HnupbXDLqNzdD8jsp+WlvMsOntCnrFl2kT9nvtD2zvW26h4t koOMJQXpN3FG7f4NT63jpCYvQMLXTq+NeMW0PxOB0P6MtEz3yEebLUIH00Xa3VWNGxgB CnI+yWi1a/DX2HxPpxZmBB9M67tq7IGCqENcbon5P8Hi7KefTtW3/WMgETpRElb00F1V VykB9muzrihg27rok7oDjstL2Hm3/iHLLQ6nVkZWgLNwmo96q8L8ZVUyBHUuPkNDZGls Fa9xltM+AoILnEK7BV9g6JwtnqiLCpboeDcqI8Olss9iug6S07UASshVJDhw9KXoFiki ktjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SW1OP7QM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x1si15369771ybt.639.2022.02.09.08.17.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 08:17:29 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SW1OP7QM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHpeq-0002mj-R8 for patch@linaro.org; Wed, 09 Feb 2022 11:17:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHo3b-0004mc-DQ for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:34:55 -0500 Received: from [2a00:1450:4864:20::534] (port=41501 helo=mail-ed1-x534.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHo3Z-0003E0-Hr for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:34:55 -0500 Received: by mail-ed1-x534.google.com with SMTP id cz16so5446643edb.8 for ; Wed, 09 Feb 2022 06:34:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Nc7NqSSiuD8zDZWIBuWD4uXfx2qSa99zJOclVo9lxBA=; b=SW1OP7QMPXwLLrVWCRlrIqlGgg0TRnLBe239Y3UuzDFHX842kAd4Xg/lTfAz4lETh7 uLYDhR574ecpkUz0hPb5HpV/LBJ/fw5OxahQbqxrNWMGvU6rwtjyBdUkW93gLDMUULUT HphJjohzYBrMWnp6gLk2j92IS5+16loY6FHRfnLD51/kVC0StXCLqQf1D0v/P+2FZNmt 35HhUo7PJ8coYaWIiprYaz+LfeR8Wsj4DqRt36ilc/QEyzKlTBqXLHKKTEgpPoSNUQIe IPvYjgRZ2NVYv1rdjWniIGQfAO/sNpEtZYPHfLtXID0u1xao8CUSZypJON79hx5frjtJ sEFA== 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=Nc7NqSSiuD8zDZWIBuWD4uXfx2qSa99zJOclVo9lxBA=; b=Y5v7KF+7EtmLeRXeAncjV7iQF8VGZqg1pzSpGUt6JH3v+ST67dp92cu5YLAIQ3eNYB quk56B4Zou1JrCZE4Uzp24xQnSkJ28e6Vy+fSUdjZaFNSCrOxCEAwsyF33dYq/xtnJvQ Dm+4ayMX95aReLmjKpQ8441GUiA09cCZ8WTL/k6+rU5OuAYuAorBX39DQfKYQNFB9nci shVZfIo6KXgJ4Y7QfLvitAucnLBpqpNrW+fwhzwSRLpUNQnvef1SOUe4ybPhsMahnTuD G3HXyNoQH+mgAITYuhpF7BCd+tNmeQFq2EbBmz0id18PyRBKm/Brfh1MvKtWn2YjHzYQ EXcw== X-Gm-Message-State: AOAM530ZLZKQv8U3rtrksgvG29BMHqfNx5Wngty5zG/RzgXd8x8AXbdE WZ1iuPYSN2b2DMsOJoEwbiY+dw== X-Received: by 2002:a50:fd05:: with SMTP id i5mr2796341eds.181.1644417292027; Wed, 09 Feb 2022 06:34:52 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q5sm5136325eds.82.2022.02.09.06.34.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:34:50 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 83B251FFD0; Wed, 9 Feb 2022 14:15:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 25/28] target/i386: use CPU_LOG_INT for IRQ servicing Date: Wed, 9 Feb 2022 14:15:26 +0000 Message-Id: <20220209141529.3418384-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::534 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x534.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: Eduardo Habkost , Richard Henderson , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" I think these have been wrong since f193c7979c (do not depend on thunk.h - more log items). Fix them so as not to confuse other debugging. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20220204204335.1689602-26-alex.bennee@linaro.org> diff --git a/target/i386/tcg/sysemu/seg_helper.c b/target/i386/tcg/sysemu/seg_helper.c index bf3444c26b..824b9a5a26 100644 --- a/target/i386/tcg/sysemu/seg_helper.c +++ b/target/i386/tcg/sysemu/seg_helper.c @@ -167,7 +167,7 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request) cs->interrupt_request &= ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_VIRQ); intno = cpu_get_pic_interrupt(env); - qemu_log_mask(CPU_LOG_TB_IN_ASM, + qemu_log_mask(CPU_LOG_INT, "Servicing hardware INT=0x%02x\n", intno); do_interrupt_x86_hardirq(env, intno, 1); break; @@ -175,7 +175,7 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request) cpu_svm_check_intercept_param(env, SVM_EXIT_VINTR, 0, 0); intno = x86_ldl_phys(cs, env->vm_vmcb + offsetof(struct vmcb, control.int_vector)); - qemu_log_mask(CPU_LOG_TB_IN_ASM, + qemu_log_mask(CPU_LOG_INT, "Servicing virtual hardware INT=0x%02x\n", intno); do_interrupt_x86_hardirq(env, intno, 1); cs->interrupt_request &= ~CPU_INTERRUPT_VIRQ; From patchwork Wed Feb 9 14:15:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541102 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1408960imo; Wed, 9 Feb 2022 06:57:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJyiU4M1aAnwHhFgZLuvrBPcx6pTkW3Yh01uv7yvuVdufG0ArX4aSe4pPBRKvxUf6wSXjCmo X-Received: by 2002:a25:b90f:: with SMTP id x15mr2263636ybj.423.1644418655182; Wed, 09 Feb 2022 06:57:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644418655; cv=none; d=google.com; s=arc-20160816; b=Iqbt7Wp2q7OEnj3C9yIKhNdCOvs3RmQBSizQewEView4e9K4v5V+/I8NSvzJsGUruL USjJc+zFaE80QYl7mTTe8w51nfFd8fsfhJcWK0ERMSDICTqSdAxDm4T5nG+HdP3udiNi Kjh5ti3Sb5lRAJjZrVpfgIkYONKntwzDkxUnrPr8Yd8ITiU4RI9BvLL83L35JeF59h10 bd7/R01eHdw6+gR5/WbiuTVHxV4JFRQmiSDBz15V4Hbh409c1tv70ghg8KxsLf1IUL0x ubNRm84U9O4+yIRFXaOVGbIhE5DDpxyMEYwKREY4DoLnHg02fOB5UWPs0jHthgNQJ4ie DkNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=XggHg/DQ8QhJtcx6aM9YPetrL2sQVDLzuBfvyJu1Zn0=; b=iVyJIMcU1QO453fJqM9VTDRxR4LqwNM2KKmCIH5yXnq8d3wzYBgYlLYw3DFSLHT8aq xj2EKhMazCGKEVQdAg6Rc+dTV8LJdGmYOjr4D2c1Rbp1OWEnp243SpdI2m/IQXAreKjF Yj6nS66Roh+YwDLB6zGNps6rYXnxA/KXPE8UiJBcicfzC3mchW+Bu1F3Cmi8sIevIbGN e/qodZD3aGQIrhi7yNEl0rEK8TGchAVneRdkNizr8jL7qKP046GVKOyqLJwNrZJtGjE7 lhle6TdUOR9EvhR1BRINRYezys1X2zaAOp82FYEKJwjYyLZJZFiI/96hO8N7ETM38cVb B8mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="aIpTCKE/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k7si13055142ywb.4.2022.02.09.06.57.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 06:57:35 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="aIpTCKE/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHoPW-0005WD-Mn for patch@linaro.org; Wed, 09 Feb 2022 09:57:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnty-0000L9-2Z for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:24:58 -0500 Received: from [2a00:1450:4864:20::42c] (port=39757 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 1nHntw-0001LD-CO for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:24:57 -0500 Received: by mail-wr1-x42c.google.com with SMTP id d27so4356242wrc.6 for ; Wed, 09 Feb 2022 06:24:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XggHg/DQ8QhJtcx6aM9YPetrL2sQVDLzuBfvyJu1Zn0=; b=aIpTCKE/V3kV8ZxRfMOHBwLIFNITUdlQquFH/oL1lgvRguf9gkT9Fl5muFyU9Dy/lw iMJuoNrmhHUEilVQlbHvNFLOZCf+YdRdEMtiDyhqT/4eeDJcDRxH2n3sXDwcp6SYXTvd GigR3sfWTCAfDd1D7r+V+Hn66jnRlHaMSbrqD3ob1pGVC6PHH1vqvg1+2vAkyycJGj7V eZxjMjhppIxr6LUzX/uXf49Oe51l0nBd5yLjf4gVU3PYjIiNkjB/V12dtuoMuUN2LDBA KKwDuTr3xzL2Xv3dzPZ4RkMZt+jtaaxEx2SCY2kSYKxO5QZd/Z3i4VkETVRwKBNTINi2 5wyw== 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=XggHg/DQ8QhJtcx6aM9YPetrL2sQVDLzuBfvyJu1Zn0=; b=LPOjW8QnFv/AkqTx60o5jPcdFDNesVt2d2dEQ0U6p8psKEMCxjTsw1gMTjK60h5XLp psHYIzfEDu6wvsnK/5c97PwHZx6Rao3Pb4kGjK3mXbTKiHAlk6LcVqxyz7BNwN3IGlHX YTO6iRrWqlDKAoh2lH2/VmbM0foNY0Vl2FgNP0Gq6Btvu5j8rUsX+23QMYFLdVLPQuuG UELHHQj0djYn0i7rnH7hd6JTGuj+muZe0W1vDeICV0beIC+QSaKC+BrfjiNPwstYaYkW S+9YpB+O7yg3kq7uQswyADpdp2Fz7K8SMetDO7qrEA7s/PMo8jWcllneWc/YeBU7qQdR cSjQ== X-Gm-Message-State: AOAM530tkS4I4rqnmO2y7PHlIofoR9aNSEJ7uUu3ByzJuCxGgDKv+XPQ VMzY8w0VcPQk+4C4XOFKpwWIwA== X-Received: by 2002:a05:6000:15c4:: with SMTP id y4mr2346168wry.522.1644416695025; Wed, 09 Feb 2022 06:24:55 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r11sm7428925wrt.28.2022.02.09.06.24.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:24:49 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 99FD41FFD1; Wed, 9 Feb 2022 14:15:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 26/28] plugins: move reset of plugin data to tb_start Date: Wed, 9 Feb 2022 14:15:27 +0000 Message-Id: <20220209141529.3418384-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42c (failed) 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: Richard Henderson , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can't always guarantee we get to the end of a translator loop. Although this can happen for a variety of reasons it does happen more often on x86 system emulation when an instruction spans across to an un-faulted page. This caused confusion of the instruction tracking data resulting in apparent reverse execution (at least from the plugins point of view). Fix this by moving the reset code to plugin_gen_tb_start so we always start with a clean slate. We unconditionally reset tcg_ctx->plugin_insn as the plugin_insn_append code uses this as a proxy for knowing if plugins are enabled for the current instruction. Otherwise we can hit a race where a previously instrumented thread leaves a stale value after the main thread exits and disables instrumentation. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/824 Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220204204335.1689602-27-alex.bennee@linaro.org> diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 22d95fe1c3..3d0b101e34 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -854,10 +854,20 @@ static void plugin_gen_inject(const struct qemu_plugin_tb *plugin_tb) bool plugin_gen_tb_start(CPUState *cpu, const TranslationBlock *tb, bool mem_only) { - struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; bool ret = false; if (test_bit(QEMU_PLUGIN_EV_VCPU_TB_TRANS, cpu->plugin_mask)) { + struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; + int i; + + /* reset callbacks */ + for (i = 0; i < PLUGIN_N_CB_SUBTYPES; i++) { + if (ptb->cbs[i]) { + g_array_set_size(ptb->cbs[i], 0); + } + } + ptb->n = 0; + ret = true; ptb->vaddr = tb->pc; @@ -868,6 +878,9 @@ bool plugin_gen_tb_start(CPUState *cpu, const TranslationBlock *tb, bool mem_onl plugin_gen_empty_callback(PLUGIN_GEN_FROM_TB); } + + tcg_ctx->plugin_insn = NULL; + return ret; } @@ -904,23 +917,19 @@ void plugin_gen_insn_end(void) plugin_gen_empty_callback(PLUGIN_GEN_AFTER_INSN); } +/* + * There are cases where we never get to finalise a translation - for + * example a page fault during translation. As a result we shouldn't + * do any clean-up here and make sure things are reset in + * plugin_gen_tb_start. + */ void plugin_gen_tb_end(CPUState *cpu) { struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; - int i; /* collect instrumentation requests */ qemu_plugin_tb_trans_cb(cpu, ptb); /* inject the instrumentation at the appropriate places */ plugin_gen_inject(ptb); - - /* clean up */ - for (i = 0; i < PLUGIN_N_CB_SUBTYPES; i++) { - if (ptb->cbs[i]) { - g_array_set_size(ptb->cbs[i], 0); - } - } - ptb->n = 0; - tcg_ctx->plugin_insn = NULL; } From patchwork Wed Feb 9 14:15:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 541124 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1491276imo; Wed, 9 Feb 2022 08:36:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJzcd9EpuMiIpcWarRvGUndfuNW8J5Kuh259lKs4HE3Pw/lrNGfswgxThB1vC5h374rCKJxc X-Received: by 2002:a25:fc23:: with SMTP id v35mr2717812ybd.279.1644424575056; Wed, 09 Feb 2022 08:36:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644424575; cv=none; d=google.com; s=arc-20160816; b=vgqJObek5NQlcoHViOZiN1pWrmVWtfRYCD6YwrtvCT5Eluvqu9IZo0ULBxfpEcl27C TTuPnwksW3tpSMHCY+UW/W9cAR88y+uiLhM550oJLYmQP7z+xAeC8IPeDNkGsyM5QMjt lVBto30nFGWacY1n1RmsahZwG3HWVjvrjSMmTVsQNiyGvw0OcqvdP2UFHOLqM6HJqP9i wWwq7JD/rY8enmpZsOd8HDNPoILdA0TMEgtpllDRjL++0RPKTyvZ5a3K17iaul72oC2F Dliznh4z7Yh1gmCpfmSQY4pVOJXNkIJKda+v1qTpbZBUcv3Xn6Sf9bwSwP0vXilXG96T oNAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=P2xvJFwBI9dmx9ZaaVbwVUHI6W0eJjWbWWEmT3FIFsI=; b=cksoD5h3yvWHBRT92E5gGe9VQ/CW6rJ+eaCnwBojVsFTkd1RmtKb67c5ZRLi2MifFd T3idBd7ZnpyAwNZivx5nS8nmFyj3lQWcBJSPYgnNApXUicqbhK8DrJckJqmkMS/J59yV YwiVWuzGqK+e+Pe02ZHn9zGt4KiBiyEidPy3xUq/tddB3XnFK7Pf3YF6VeZuKlFwFxqA k4NJnGwD6C2SjNVkKqCAZbuHQQF7+S8Z1El7ZcG+g3kj8X53pQAfHfDe2xU8p5Zp6wy5 S6YEjAXwcNtrCyS02P/gLXOWCWIGNTtpA+CBJeh6tAhmxm5d1kuyq/XmZaEu45NiOx7P A3jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=X1dSaV4o; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c8si11806066ybf.208.2022.02.09.08.36.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 08:36:15 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=X1dSaV4o; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHpx0-0002L1-IV for patch@linaro.org; Wed, 09 Feb 2022 11:36:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHnu4-0000b0-UC for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:05 -0500 Received: from [2a00:1450:4864:20::42f] (port=43663 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 1nHnu3-0001Mn-Bw for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:25:04 -0500 Received: by mail-wr1-x42f.google.com with SMTP id i14so4307261wrc.10 for ; Wed, 09 Feb 2022 06:25:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P2xvJFwBI9dmx9ZaaVbwVUHI6W0eJjWbWWEmT3FIFsI=; b=X1dSaV4oKNSpJiHTSnhpuPABlv+LpSGnzBkQ5EYXB3y0HH7N43hg27EaDgLJv+3bC/ dXLYKnYd2Cx++a6iZTEHF2EWwMd4KOvGSbkkQP7K/YR3fUqXHltBpvjeXMuFs7PQys3m ozwif3jJWbOyjJYvseQj+C9wQh+Py7bpK5EpFUgFBZrVqdYUy7nns++UxexxUnqSPaFL NsbIVX0lvIziUoQaEWcwdACf1ZshDPUOFHY2h13LdhqzfguAl4toHGMBUXP+Z5sugt0i PbPAHkhln8k13c1PF9SSSEja1xmbCiaTRMYy8qApXnp5XKYGcHXf/Y/rbFvGLN3vAOQq djZQ== 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=P2xvJFwBI9dmx9ZaaVbwVUHI6W0eJjWbWWEmT3FIFsI=; b=ZDnOEFM+RULNuAmZkM0HAngGghSyc165I1DDHCOIQa+sbUr98mUx1RukWJF9Ik1oO8 YUePHKUjdmwDL3SXM1O/oL2gf15/En5jDEZDwEmo6ep17MNizgLg6UCpxO56rSaTNovY DF8zMoYOe/OW2b8ejWFzS5ELs7SK4+9FeOevN6fGSTb1LuPBy+TMODWVodBUBsTHzz6i vWHN1g8NFq+l0JdmiDEVeZ9XiNExdsAgi9hgw+gG6iPK/O54iu9lYDnyeqQtZJlatJIj MIGxjdiaxwa1vksGq7fD/6D0vFEZyCfd7zs5lzZTDrF9nr+eWWtjoDu/lpP2XFgH7CDH Aj3Q== X-Gm-Message-State: AOAM531+zTuZyqKjzDtpwCh6Phd5DXjI+hDRf28wMG6UmGqPFZvR2717 luT5e6S6VT0i35Q+0QXAsHieMw== X-Received: by 2002:adf:a39a:: with SMTP id l26mr2375433wrb.150.1644416701970; Wed, 09 Feb 2022 06:25:01 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l10sm15774203wrz.20.2022.02.09.06.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:24:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D9B711FFD3; Wed, 9 Feb 2022 14:15:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 28/28] include/exec: fix softmmu version of TARGET_ABI_FMT_lx Date: Wed, 9 Feb 2022 14:15:29 +0000 Message-Id: <20220209141529.3418384-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209141529.3418384-1-alex.bennee@linaro.org> References: <20220209141529.3418384-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42f (failed) 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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-devel@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" TARGET_ABI_FMT_lx isn't available for softmmu which causes confusion when trying to print. As abi_ptr == target_ulong use its format string instead. Signed-off-by: Alex Bennée Reviewed-by: Peter Maydell diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index a878fd0105..da987fe8ad 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -121,7 +121,7 @@ static inline bool guest_range_valid_untagged(abi_ulong start, abi_ulong len) }) #else typedef target_ulong abi_ptr; -#define TARGET_ABI_FMT_ptr TARGET_ABI_FMT_lx +#define TARGET_ABI_FMT_ptr TARGET_FMT_lx #endif uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr ptr);