From patchwork Fri Feb 4 20:43: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: 539873 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3562240imr; Fri, 4 Feb 2022 12:46:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJzCM8CAUrkyvuuHknE8n1SEkrAkGix+hl2T1c1tIEYMzj7SnUSSvPqSpwIs4Lq3qnQ6mNPj X-Received: by 2002:a05:6902:725:: with SMTP id l5mr1047217ybt.544.1644007602183; Fri, 04 Feb 2022 12:46:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644007602; cv=none; d=google.com; s=arc-20160816; b=MbeFk6p7XPSEkh3gEqFVSpoe5DpJMVuuOw7oWIxzsUx83geryihi16uCGTGD9IimbR h/qTjcNGHr2GIxEtc3noDwdKz1BH+OQhMCaVO3nu+3UVDo3M6FokZlz0+0C0iDM1m39I FmVeq68VJBJ31S+Hq5lV4IA4AZzLM/miKbFgpDJvMpxVs6VhICR8K2ntxGCISX/cQ5gS 4wF0jP9xEoPDVajtj12uaV3YnfUGzllDNo3cyBnf8i1a0f3tRcnI1TqXkPUpLz5t4e1p SzoojY51bLiAHmqB5aT+vebiuxCXOw5MSfrR4YzDTK9gQS/3AGLGbB3g9EpcLamswacu IdxA== 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=ynFU7GIrDRiFDHdJik7DGdtoBE+darFWUPkAFAGxRwg=; b=BTiLC55HsOp3+/xdlwApco++d2tJE0fN5v4lyDn3ke8Uo5/d5Z4ThRcEWbE6v7GBF+ 6L0a2CIQ5p6uVEDe0kianQ5e7wkW5OwlCVGStSyKvvmqQtVXmgsVZwsY1bO6niA9dUlA kgJh7zazUGJ6yK8cCrCQUSIGwQNfSev4I/0p0eRtWItQjC0N0Lv4IcaC7V1sIMlgoePq W++oWCVf69z/0frsxAIfP9NeVDLNRf52Jnb/sfwU+f3HiZWxdrg3mA6/eBsBLZYiuH4z 8E8YX48ZSGTeAuVywafMDD34mu5YxrWMBqjYPaUtU/+1KIDyphzcnMcQfy7U4tZRznX/ oViA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=F0wmGj8F; 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 r11si2665600ybu.299.2022.02.04.12.46.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:46: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=F0wmGj8F; 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]:49014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5Td-0006fI-CM for patch@linaro.org; Fri, 04 Feb 2022 15:46:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5Qj-0006ds-Cb for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:41 -0500 Received: from [2a00:1450:4864:20::32a] (port=37605 helo=mail-wm1-x32a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5Qh-0007Ka-H0 for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:40 -0500 Received: by mail-wm1-x32a.google.com with SMTP id l12-20020a7bc34c000000b003467c58cbdfso10193475wmj.2 for ; Fri, 04 Feb 2022 12:43: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=ynFU7GIrDRiFDHdJik7DGdtoBE+darFWUPkAFAGxRwg=; b=F0wmGj8F0x+I8yCZLvVIzTd4ugE+QQGyCglb0V/mQo9FIlU26lmoiNnEzm9LBe/wXE qDiHiDSYXkZFngU6dzsBuU2PKtbPKnTvN6qvJjN7CDRRABESVSkuuzEBpwcHxvXJCjaN mI+KGjpyeR4AycUdzd11QrS8+S/H1y+ZPPEazA1a5LOwdSHB+URQGK4qYnXizRTAKgxX 7dLo1hy5VDm1YeBKwzT1ShK712Mznn1+st1PjQekwkDrzEyhM9zZND3VWP8gepNVQwV/ rD4y+G0UeuFPhp5CKippjgriC2QqKgaahL5JgoumBjJ7wtmFh+rOzBYTW4C3jE8WnZLn kn5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ynFU7GIrDRiFDHdJik7DGdtoBE+darFWUPkAFAGxRwg=; b=qrSqE1k3q2S3M36sHugjPug1j8ihJ0LIJ8X7AFjrts1y+i9sxMyq/lai/cLjySPirc bx+NCp4yOCaV/tOyvRrVeY5ccWk84TZs+qslgQtkNUGtg3G5vyPWXXI4ryoBXZ89UmlH yxx2KehGQPWmnq/AM6uA6xb4SlrUfC4MyTAZNygNmoxYhZZlCfX0iWsEyaj73nsYDB0X UaBv6OaXwLZ/Bw5Cf5P/YRN3N51jGpAm3uvSwSlJZYqHDbFaZIs+FQhRgPH8TNcuDvpA kbmO/DTVml2sZkuXl3FfkWE1YCcLkvv/9Hl2i1vVhOlZCXqumXJeKf9i1iQyKEmAwEBd d8ew== X-Gm-Message-State: AOAM533ggmfxFinhu8eEo/ZBlwi/VQLr79W8usuZnBFZ6pHne5QsMIxF dmpPgz+CDlp/zIoNcL854B5Sig== X-Received: by 2002:a05:600c:4808:: with SMTP id i8mr3695415wmo.23.1644007417714; Fri, 04 Feb 2022 12:43:37 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p8sm3228490wrr.16.2022.02.04.12.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 399351FFB8; Fri, 4 Feb 2022 20:43:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 01/26] tests/Makefile.include: clean-up old code Date: Fri, 4 Feb 2022 20:43:10 +0000 Message-Id: <20220204204335.1689602-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32a (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is no longer needed since 5516623020 ("meson: convert migration directory to Meson") Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220124201608.604599-2-alex.bennee@linaro.org> --- tests/Makefile.include | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 9157a57b1a..646c8b1334 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -34,10 +34,6 @@ endif ifneq ($(wildcard config-host.mak),) export SRC_PATH -# 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 Fri Feb 4 20:43: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: 539879 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3565420imr; Fri, 4 Feb 2022 12:52:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJydwh5A5S7/i4/jx7941l3kyM3422AmBHCFo6+aROWJgKRTcfe37+v8PSY5EWP2ZR1A8URY X-Received: by 2002:a25:5185:: with SMTP id f127mr986373ybb.396.1644007944818; Fri, 04 Feb 2022 12:52:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644007944; cv=none; d=google.com; s=arc-20160816; b=kHidJW00uXECKBD7Z+qr+K5dz/7YMbgVmG/mK42j3guj7q0xC5oQ1sZEQCv8mNTOlH eDJTEbunh4/M7+3VUoU8SkkiunZoxpltPKgyzBQeC8v9Gi73ufh0gMevnWcZPTw9TRcW ROgBwEQi00VemMvrhB32yTnel1+b8QS1lW88rhfBOoy3p6uCA9eV7ylYLQqNnJz/BBU/ TBA2uyjV5UQ4uSOucvJStuMBj8Qdl39TMq3JEMYK3JySrhfckdALfc/ncEHgGMsII5LO JqIGOYRZbUmUsMUlJl/FlBFqjFvGnIKZu1RWBjGFZINNJLUkgmT+R5xOmb5zPRsDKcER SDZg== 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=Vu0I9U59bZWZDRHZ0y4P2PGP4T2MyrmhsrSziIlkWNs=; b=vNUcUvzVj0mQCg+Rm93g6+EKvBIfT02oC9cvvt1dLTE/jz1vYeJyZmOq+AApHwyofS 3fWqVPcETlGgzE8++CbSsMR0WT5cs8PecP9SVx46FykcpknrY5X6BMyKxI5K4ldSF8mw ymgOvaLEKpYtpGMFjoAYOqkisXkEIYFZsdeQaJxRJZxBYB/jSE87+9fNySpslcbnR507 tmG9rn2b2D+ix+kByEw+cryu3OgMuWg8QDOzJZbpzXggqx4TMw7RMYMCZIMdM0xKfPj5 GNWPaWGDLifP4ex9mQj8QJLvl6jyjPwahOOmUgUHW8IDVWyBiB8TdwEdP5JUGWBNODm+ I9vA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=J2079BF8; 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 z15si2211519ybl.237.2022.02.04.12.52.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:52:24 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=J2079BF8; 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]:37636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5ZA-0001OM-8n for patch@linaro.org; Fri, 04 Feb 2022 15:52:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5Ql-0006ef-PD for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:44 -0500 Received: from [2a00:1450:4864:20::42a] (port=36725 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 1nG5Qj-0007Ko-3q for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:42 -0500 Received: by mail-wr1-x42a.google.com with SMTP id u15so13464200wrt.3 for ; Fri, 04 Feb 2022 12:43:40 -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=Vu0I9U59bZWZDRHZ0y4P2PGP4T2MyrmhsrSziIlkWNs=; b=J2079BF8SZVc/7fo0edE0Xp5+Y/Tj0ZT06+IUZpU00lSU91Qxg/bK5zWOTFbHze9YQ BH/wEufnkAGFwPN3Os+m2o3fexFfxjeoY/qQJgs7Rr9zzqCUTVwafrHu+ZDvP2XJOoAE 3RYRKv29Vuqo4E3VEbnef+gRLWSe6PD1KBEI8dSvGktWb+//AP3+7D3TaXzUPDbNu0kp kgllpFYIvNt3nFBtJ4esZZVxMTjc6Y3VpAzbbbZSCxciJFnHJhEnJZ5YAHvnLyDfg6Ht ZB5C9ohGupaLUQcHJpzbhf3+036L0zGhzshb6a4etMJeRVDKV5u25kpWpfPiZiRSxy56 n3EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vu0I9U59bZWZDRHZ0y4P2PGP4T2MyrmhsrSziIlkWNs=; b=JedW/dTsGH/GZkozQPJ2Q23qv6ibh1V3/vkFc0zXpQgM+5ywFvZuTjaIxN+3xYlqFd kRRkIdXdPRWXdX6nXUDx3mczzCTquiISdQPhhQTvKMVxSiIivxbxzNzHpaI+l5kpbXhh OH8xE+595R1YX4PUed3TXzS5LFcKUW+2IUPQrEC1ndXV7Gx6xrBTIwfVKsRlxTwkUpsl CjUrtK3srH7sXW/+PeotXcfw6LcLnLf0uoNStnqHTN4rAC7sPYkCAtRXGLB1FTxTV+G6 OxDERgsceobFpBl0kqTVVZoIP9dWonpto/DAxe+wrc6RdZFNYHx8ZCsOkyA7TW0rrrj4 01vw== X-Gm-Message-State: AOAM530/ALoaPCc+nwpPNvL7IYR18xSeLsKtV2BQD/g1M0imf5dBhrka mGDXHp9o9/dpK0lPS37q1ze+Cw== X-Received: by 2002:adf:de0c:: with SMTP id b12mr543861wrm.26.1644007419745; Fri, 04 Feb 2022 12:43:39 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 5sm3194631wrb.113.2022.02.04.12.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 457181FFBA; Fri, 4 Feb 2022 20:43:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 02/26] tests/qtest: enable more vhost-user tests by default Date: Fri, 4 Feb 2022 20:43:11 +0000 Message-Id: <20220204204335.1689602-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-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: fam@euphon.net, Laurent Vivier , Thomas Huth , berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net 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: <20220124201608.604599-3-alex.bennee@linaro.org> --- tests/qtest/vhost-user-test.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c index 3d6337fb5c..2a4568cd7d 100644 --- a/tests/qtest/vhost-user-test.c +++ b/tests/qtest/vhost-user-test.c @@ -995,20 +995,17 @@ static void register_vhost_user_test(void) "virtio-net", test_migrate, &opts); - /* 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 Fri Feb 4 20:43: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: 539874 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3562254imr; Fri, 4 Feb 2022 12:46:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJzECXTsC032PwCISs3tRa2cUwelVxRajRTteQ/MAjARqDfV00cJtFnWwaTFQmq/BBZmGp9x X-Received: by 2002:a25:234f:: with SMTP id j76mr958449ybj.338.1644007603395; Fri, 04 Feb 2022 12:46:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644007603; cv=none; d=google.com; s=arc-20160816; b=rRDDE7PuifLDk5FGUto5qXHQpE+ZrkrWQFwk/zhr8X1M9YW0arleSU1LCBXvivq8OU +ZEs3A6sVkhWTkd8w2eWNgPXRzhUVmw9vydkjkuxuJDPRtP1mxM5doaDdjkgBeB8VbFL SeEQGQOpAR5ZfZyYToMc7RV4UQ5MWAUzkspxgT3BNd3Gqh+M3QP3akVGwcgAsjHTSpu5 7VcCIOs3d2u4mkqkdgRehO9+WbvlqrVSGYlVKK0PTiQQ0d6it4iNfuRt3VTrPsbO/V5P GnGG9nDqwjtjtnOaBymCXOctyoKCNfTM6CbFunRnnBtrKYMEU8kVVXwTMKhOsUaVc2cs izqA== 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=jLdaq4nPs26ioB8IxHlRj4MYiTrVXXpGcD6fwPTNScM=; b=Ac7o0I9tAokaXb6gYIuZjW+36X2CFWyRWFR8Pfs9IEcBoGDpn9H0b13nyiDjbExlWN tYguciB925Og/rHNDfDRZOAEjfaCiWVp+pe0E//t9FS+/01IHCKqtRbm4jRrSUOKdmIu G8c63ag5Rz5WJR0q+yHPMO1nvK1SkwRT5lSk59iMTciboC01m5iGzwueIacThVQo41cS 3nhPNYzZ+EnFTi0FRCfaDHAxdrkjn8RFX1zaQW5fO5z0236T35MbKmByQUxWmMZoxpAD 1uChDuzTfgRqUb463GP3WgOOkptbiij6FJNNUPcK5fJwZVdL8uQgHZxXFaA1vTrAJN0I irNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="hue3tg/r"; 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 n197si2261265ybf.647.2022.02.04.12.46.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:46: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="hue3tg/r"; 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]:49094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5Te-0006if-T0 for patch@linaro.org; Fri, 04 Feb 2022 15:46:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5Qo-0006fr-Vq for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:48 -0500 Received: from [2a00:1450:4864:20::32d] (port=45817 helo=mail-wm1-x32d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5Ql-0007L6-Gk for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:46 -0500 Received: by mail-wm1-x32d.google.com with SMTP id j5-20020a05600c1c0500b0034d2e956aadso4441094wms.4 for ; Fri, 04 Feb 2022 12:43:42 -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=jLdaq4nPs26ioB8IxHlRj4MYiTrVXXpGcD6fwPTNScM=; b=hue3tg/rpwlhRHUHqIGH47ep7HTVMqN9NKHPyJCTSulkmBb1/5LpO9AJLmRVpOb4tK WlZh8lg4+1lFx3LqfBZjGAZs+NLPS7Iz9V3yFgujpTLRr+IAv/5MCs2x8TXJcw5u/9C7 kILRhBV6vPPLmEhLFtj2h8xo9OQ1AW61CZ0izrg+RCFMbr10dikgASBZWDPJHxUqIkKy ZEHKbn1doBLmrE7GGvkUQjp3bCSeLa22JWNy0Ic3EHuWKqesw58dtHqj+KSArbGc6z6l mzyffv4lkp/LisDosi39x+r3FzHN25BEUTINsrV1moci4/XpWe15TjdSnTGYbJph7+or qwdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jLdaq4nPs26ioB8IxHlRj4MYiTrVXXpGcD6fwPTNScM=; b=hdNo8zzdU23EYPePTXX/dFFQwdfQrGyHWbcEQtqhL61Z3fHLHyzkkud3sYOKO0ULlF sWc4cX3HBZnRkuM7+jDZHCk/jgbgoEYSklDNRpY+DyY1FBGwfKjQmGcKqaNrMXd7MpR6 2XvbARPIv8SkhWZiUnC6FVG7Rlspc4aFj1eujWwUUkvqQez/ZOK8rs3DVPCFC1rEgCLN QjeShXQcFrzbfhoqO56LcIysvIgVWl2u3v4aLZYntjkvk1nZnRM4p7NxYdrKqPXtQwWS ZznxGeXs9pUAajoQQdMC0fKJIb8J9ZDibrmTblBLiav32wWFl0NZloAJNbJeEgu1fEpR JoNQ== X-Gm-Message-State: AOAM531Yv0/fMBDhENIfztT4xS6gXAW4rNmjeQHXHenLW04UsEEfo9L0 h33/icB213Gk/irZQL71cUB1og== X-Received: by 2002:a05:600c:19ce:: with SMTP id u14mr3702860wmq.92.1644007421490; Fri, 04 Feb 2022 12:43:41 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n14sm2904247wri.75.2022.02.04.12.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5C04D1FFBB; Fri, 4 Feb 2022 20:43:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 03/26] Makefile: also remove .gcno files when cleaning Date: Fri, 4 Feb 2022 20:43:12 +0000 Message-Id: <20220204204335.1689602-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net 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 Message-Id: <20220124201608.604599-4-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- v2 - fix whitespace damage --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index db9a788601..e5fd1ebdf6 100644 --- a/Makefile +++ b/Makefile @@ -206,7 +206,8 @@ recurse-clean: $(addsuffix /clean, $(ROM_DIRS)) clean: recurse-clean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean || : -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) clean-ctlist || : - find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \ + find . \( -name '*.so' -o -name '*.dll' -o \ + -name '*.[oda]' -o -name '*.gcno' \) -type f \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \ -exec rm {} + From patchwork Fri Feb 4 20:43: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: 539877 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3563304imr; Fri, 4 Feb 2022 12:48:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJzhVURU0QWqgyRLlOAXYDHmj3M/tqHOLBMEkFbNlGfN1qXv7lEmqEJr6Kgp1kvuiOtQfInh X-Received: by 2002:a25:be0b:: with SMTP id h11mr998911ybk.112.1644007718439; Fri, 04 Feb 2022 12:48:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644007718; cv=none; d=google.com; s=arc-20160816; b=dKMgJLjd2XX32sFXSEWWkEhmLib1OD5mALA71M4K/khUPY1GfssqB0l/MxyMzEUkYF wQuEbVmrHJtFCbuL5Kwph/LWiLN4/TDKbFQ46IoTeULQp1EmUlpgF9QjdRi1bWkv3ukM rV56O07f8tiSHScGWtA02miKVRJBdP1q2NBb9FNL08IVo0Uow4qvhG9N21b/cwv8yN1c yKDazgsPGOyr0ea/tSeD0ZFf6nNNicyoA6IntUriLzVXjWktOJ4d15lj774Zz0cUejXV G3Dzc9bYneOoOgkn3GDUvaYgnIx+gyIalL3UkdkEcrn5oAYSqxIcPpNzQA/gOV9akJVq 6ieg== 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=dWP+twRL5MOC0yeCWZwM8XygbnhyPigiSEVdDfOE8/E=; b=De2LJATjidMVGSQafSJC3BTlEcr6+dNdLFjVi8WvRVS2u4w30UDOayTyKeZYyD/jAm pLyKEBMVIYFpCSVcXbSkW/CJ2Uzn6kFluWW1yhFOzTuKS/1joYSaFgv7S18UgbmussyO jhQgrYcHbr8EHlVM2ymxzJc0ZRiqyqRLC3dlxfQ3qBFY74X8pP8n/Q7wqu5aM+88FhYX bXJptWZEUjfs4BJtCkBaDwRYAK4zsFJ/PcSpc46azGBPfgB+Iuc4CrYmvhdA+qTvKQp3 GeaeE4i8g4h/unN0OJpYXDyudNMB/ePpPNDKMUe42ZLaPu7mJGsmDq0lNoRgpLCQOmVa sbyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KQKMbjoY; 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 y188si2181594ybc.492.2022.02.04.12.48.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:48:38 -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=KQKMbjoY; 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]:57818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5VV-0004HB-T5 for patch@linaro.org; Fri, 04 Feb 2022 15:48:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5Qp-0006gF-Ex for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:48 -0500 Received: from [2a00:1450:4864:20::330] (port=35447 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 1nG5Qn-0007LF-AR for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:46 -0500 Received: by mail-wm1-x330.google.com with SMTP id l123-20020a1c2581000000b0037b9d960079so1431948wml.0 for ; Fri, 04 Feb 2022 12:43:44 -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=dWP+twRL5MOC0yeCWZwM8XygbnhyPigiSEVdDfOE8/E=; b=KQKMbjoYGnKySgADQZuuqs/pIsNmgWa2P2kxbVfnPyiu27qkLeJciAe1NLXuv3qsT/ RJaEr2bn1j8bM8yHPTnJoF/yJBWDsuzuNmkWKMdia1Gq+tN9SnRpx8UGQjCWu2WGYy2L lj7FfFvZ9meI2fKfOwYKHE7KIp0aqGcsHZfXTtnqHiD6K4vY2fJ3VVc2lOo77RxCwZuH hhtw8aWSuZp4QMPDSXQpZ6kZ74ONKDy3HbMfM4ZgrHsLPV3WHSLG/nJVzBPjc10IyOZJ /zQQZ5NBBtysGWSl7vDSmwCCXMMFwVTYNw1wgcjAgTqDZxgBU4OnWqzcDxbuBLSI+ESg d68Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dWP+twRL5MOC0yeCWZwM8XygbnhyPigiSEVdDfOE8/E=; b=TiRpZOpwMedpo4AmKLlm+63Ig9GveaYKOr9QGrnIuInaI5pksLx3QohvGSC/LTlODh OEdWV1PvzDZh1AiQ7RVeaDg06hKYn7LuK7eKsxt0PtPprUM8LhaWhk447VsaEyKRp6e4 8imEcC9pUhjMwzC3COqkYIwWj9kr3oKJyxiNLDhaQOAhSIDH/oduNKv22KHcnyEj5bqZ IAjmiWixooJRxpWIDpUfgznxwgaE2ByaR40smRvzAt/Qgiwsi7TpFQvJkJjXKILc7RIW IdsL869iEYHKnpnkbbEFhjBwK+nnl56xFDcbifiBLzeJAguLFP5vw2j6b3J0s3fV/OvH xmVA== X-Gm-Message-State: AOAM530T+7bjQEo4xIMrvfBX9vq1ETHHkTlGL7ibhNieUB3Js4Olrw8d O0BYq7Dh6bdbYupdqLAVykJkpw== X-Received: by 2002:a05:600c:1c23:: with SMTP id j35mr414226wms.138.1644007423565; Fri, 04 Feb 2022 12:43:43 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c8sm10098358wmq.39.2022.02.04.12.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:41 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 679981FFBC; Fri, 4 Feb 2022 20:43:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 04/26] .gitignore: add .gcov pattern Date: Fri, 4 Feb 2022 20:43:13 +0000 Message-Id: <20220204204335.1689602-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-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: fam@euphon.net, berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net 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é Message-Id: <20220124201608.604599-5-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index eb2553026c..9726a778b3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ GTAGS *.depend_raw *.swp *.patch +*.gcov From patchwork Fri Feb 4 20:43: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: 539875 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3562897imr; Fri, 4 Feb 2022 12:47:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJyoSqPQdP10BATSToPeUpzbE6rA57pLImgdnecTnGRKG7dXP1FvW4r2vaJ4OXRI++MSy/qY X-Received: by 2002:a81:310:: with SMTP id 16mr772314ywd.35.1644007671946; Fri, 04 Feb 2022 12:47:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644007671; cv=none; d=google.com; s=arc-20160816; b=WBNBsozdOv3ryUyY8UTCeWHXZp/l90GlUG4KLe3Y2lq1nT8SDQe0Yo56FKBz5Df+7p e+x4PLTWXkUNskpZE6bNi8N/Gih3BK4nOshwO1KmJgqgHuGELCs/bJm5EGhxayOHQAhf D4HPrm2ZxkNCqOZUlarD89dbhh0cCPZx6bXTAdAV71JLy1gulC4xKtKrINtoQS9fEKQ2 PgNcX8HfjETqWKMAhR1CP87c4D3JmyxJcj9GFYRDcZQFbeM7M7YzGubVgj1/vPaH0xvW YseXigSWmNdPPC2eW3SDm3IVJwuSSSbQb++tUFUlMmNW61pYwjJOIt5ryWXckEm40M6l /4HA== 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=NPKrcI0/I2FVrU5Z0FCwjKvMS6pS7fJ3mwu4LQOQL2E=; b=m9DV4+HEynTFyRt/oX3iXLF6xR5SUJN+uPkiYS02VAdR3lvXUDUvDf1c3Rov4BAHYq cgPpO34kr+kXr7t4+hf9/+68mgAV2RW3U0HlHyiGBt0Q6Dgaec/GNRMs6bBfyZj8uDrD hw0/QAQz7JVSZ+V+ea6dHqDAzhta9+rOpzlDj76bN63GgTkGgqtR44Vta7SIlwgS57I1 TXTtLBeNJ99ocEK17znCzpYdPLAYCNOUmwZUHjDCH9v/ZK7D1gGwWKamQcfrSn3VNPZP 2cZAN0oEU3gTdHzQEu5vk8mS5YIl3JA35DrFbvIDcpzr20dYeHSE6cgxoWu3pEG8CtpC 2nJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qu1u2MPb; 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 a190si2407193ywh.42.2022.02.04.12.47.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:47: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=qu1u2MPb; 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]:54768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5Ul-0002HP-Df for patch@linaro.org; Fri, 04 Feb 2022 15:47:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5Qr-0006hs-Bp for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:49 -0500 Received: from [2a00:1450:4864:20::42c] (port=37423 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 1nG5Qp-0007La-Qt for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:49 -0500 Received: by mail-wr1-x42c.google.com with SMTP id w11so13442039wra.4 for ; Fri, 04 Feb 2022 12:43: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=NPKrcI0/I2FVrU5Z0FCwjKvMS6pS7fJ3mwu4LQOQL2E=; b=qu1u2MPbt1eX+jeolxO7vSa8+3NCc8Oj9wedCjtEl4NjxFBhJrFmq73su5JO8UggzX +S6Wjts5p/WW6sOesc0NdLbpUCXpwoJWgEjMePZjTiIWm0psX4i/cyaP723ScQUvN8w+ PvFUXcxrRffq87Y1dUnmwvSbqxITjM7I7Ie6+z4KGcCytxHyPCdxKdM5RbRHLIqseCQm xe85T4iAIMlMfgyZmIAJjk4ht32dJKHTbkD3LfK/LK6X6NyFKEPuEAkccC2VVaj3nQaM VhLlJ9w4F9oOY0/fcWN3NTFyK2XowOK6hawNz6dmzFSdoaCXoxeZFyW3YqKHolAUwjq7 xoiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NPKrcI0/I2FVrU5Z0FCwjKvMS6pS7fJ3mwu4LQOQL2E=; b=Kdl6MLqZNNlTGnFVhyFKW00jI7bcsiN8K5EfB1oJPP3LsCSembzaLAIClzIo50BX3w m2CM+qoXhqAbJX4kBKug8xTYDFpk1jktYunDKPDlevGQvQdiZB+zj6ein3HUFhRgpZi0 cPRarLt+PUf3J9zf+iTdCaGnvBXxabYjL/ugHEdsfpUQxOHal+Q0vN6/XoW27yOdUQep bDHrBdlQiR6CoKeC1d2DMsBnJEgoesubv/xppty0WZmfJQ3xX6IT4GiBHQlNpxhD54U5 s8wmU5QLvP8XKhEgi3T9E5tkOCDur467SLLe9gTEKTkgGTxozqiin8BW1/QtCJHdr+PX 8RcQ== X-Gm-Message-State: AOAM530WNEzQnpk7VppHD4Yywh++jENJ9Wdm6QJM7/vMKz34bAYZvfAX zKdi7prrPAZzU+J3P/OBJdtXcA== X-Received: by 2002:a05:6000:18a4:: with SMTP id b4mr514240wri.641.1644007426580; Fri, 04 Feb 2022 12:43:46 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n11sm5977885wms.3.2022.02.04.12.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:41 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7FAFD1FFBD; Fri, 4 Feb 2022 20:43:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 05/26] MAINTAINERS: Cover lcitool submodule with build test / automation Date: Fri, 4 Feb 2022 20:43:14 +0000 Message-Id: <20220204204335.1689602-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-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: fam@euphon.net, Thomas Huth , berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net 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: <20220124201608.604599-6-alex.bennee@linaro.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9814580975..b0b845f445 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3585,6 +3585,7 @@ F: .travis.yml F: scripts/ci/ F: tests/docker/ F: tests/vm/ +F: tests/lcitool/ F: scripts/archive-source.sh W: https://gitlab.com/qemu-project/qemu/pipelines W: https://travis-ci.org/qemu/qemu From patchwork Fri Feb 4 20:43: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: 539878 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3563314imr; Fri, 4 Feb 2022 12:48:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJyye6Hx8+3ii581VTn/e6jG1dKy6hOartF49MZJy8nIbEClZJMAqP0aQ6cMbF2bLvyO34db X-Received: by 2002:a25:8149:: with SMTP id j9mr1019121ybm.294.1644007719449; Fri, 04 Feb 2022 12:48:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644007719; cv=none; d=google.com; s=arc-20160816; b=KcAIO2mnxwdJNIWttQgDRA0IjtsIDwgUYU9KDzr/blsUxJW7WtenPtFES3yuL5nJr+ Cr6WfMJ2YM4aRxydR3rdhyht8RVQkDzv5UjzyXSfMKD5KKFYEB9oUZQP1C9OQ9pQvLmR Bpb+xj7j7BVvokyYp9c0kS2e0wOGXUk2uWWWQzpdlN8s/8PlKWT0lOBHTbvJyI3byXAf pHGAayLd/pwuAji/w1r0Ir/q2uWpz39eYsHBrTnpBNX6L4k44ghnJhJgHSCiscLuVhua CUT4oQUaKUhEviPZGkBOpN2faptg/CgIkySZBU/GqWq1Ye5HkdIVkmbnBlefE6AbMfBQ xw8w== 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=DaG3zQiQZ36ycjnydoAdWjsIMQZNyRhwpx1B2DtbdXE=; b=k2o+oSBuyNARyQgLWbePX47+nbTeydhF53gNRwRFJdtihCmbrtwC46mKf1dJ6NSEFq cyc3yPHBJ9nZ9iPfRLnST/1HSklq79gVyMdImhFJWQoLoVd6q26k+2TliGS6nJCUMqxG dwREYfdL2puqqLe88yAwNiOvYWmUhXc0MMt+KERozeBOnN48myTin0jwGWQt/i4p7Fgb 1Ub5thqxe2nshLTaFIjCTMe8M/e5Y2KbqWBx3CsPxc0oAuW5/R1IMI0EubjZ6h9p2lUF K5/KPBu0f1XcgDROMqF+ICovn9a2S/tqRMK936U78CWcHgy6QXvI/D2rwDNjlCOokW4o SjVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZzFoL0iY; 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 v191si2148909ywv.494.2022.02.04.12.48.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:48:39 -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=ZzFoL0iY; 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]:57640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5VW-00049l-UA for patch@linaro.org; Fri, 04 Feb 2022 15:48:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5Qq-0006gh-9K for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:48 -0500 Received: from [2a00:1450:4864:20::333] (port=42868 helo=mail-wm1-x333.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5Qo-0007LM-DQ for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:47 -0500 Received: by mail-wm1-x333.google.com with SMTP id n40-20020a05600c3ba800b00353958feb16so4464319wms.1 for ; Fri, 04 Feb 2022 12:43: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=DaG3zQiQZ36ycjnydoAdWjsIMQZNyRhwpx1B2DtbdXE=; b=ZzFoL0iYjocxs78puY+y1PrPpwe4vMde3SRZubdsFTHEBQ0J0yajyd8LlI8Xu69/6c Htqb5AxVUDrhwrjfoJQ/f7ObyrvusL+Vw6lXlPqEyOJHM7Pb5YkOPCnxbAoIa8m131Tg cfBAWu8mf9IxpCqBwWUY/Wim/JqGT/mK5fZ0DNOjuf2vMvD4bKZHSZ94RgwbXmBI6IJm rX/5di65djTamwuEikTPb+4ECr5pcBzzcgsI3YyvVViLVzk43wdYFxeYDB90QByUF9Bi Kc8cLF1xP/LZOYLckEc4a04qGjJNNg4u41ZpO/lbrdoBb4pNRuCPHJ0GvPemHDY1Zu9Y bRPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DaG3zQiQZ36ycjnydoAdWjsIMQZNyRhwpx1B2DtbdXE=; b=Aufx4ZAZKwdRgLzXk+A9tRpWn6H33BUHu2jhY354C4K23pM+72I8g/Z0x1O1bfS/0l 4ARUf7jUKqWzYWt/G4wqttrXruTRPPNyw2TYdx1qZmPo3/l78E/BJrNOCBOjeeqz01Dz D2n24xqy/aLasZbaEQqHTbdrxOhuMqvqDxZEZbwZnVdOUTgbQ2MUUV8MZQbCr2INskau oTwpTQOV7/YnOU1xdycpfEirU07scuOtErHXEb9Z9vceu1tSUijAIwhNN58xGJfrafZP MSxnjsK+xiOMJEEw654gmkrxeZgvvI6IBovtFHvomSS53pPBu2Vn3LRz4PpP96cW8Gs7 EsFw== X-Gm-Message-State: AOAM5317dlzH9HzJxaMPRmsGHZ4r27tr+EG1C6kgaJ2PUHmd2ga/VuYo FMRzPq4MyOdyVf7zFFLMbAEKYw== X-Received: by 2002:a05:600c:3ac5:: with SMTP id d5mr3727961wms.101.1644007425076; Fri, 04 Feb 2022 12:43:45 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m11sm9462721wmi.16.2022.02.04.12.43.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:41 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8B0751FFBE; Fri, 4 Feb 2022 20:43:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 06/26] gitmodules: Correct libvirt-ci submodule URL Date: Fri, 4 Feb 2022 20:43:15 +0000 Message-Id: <20220204204335.1689602-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::333 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net 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: <20220124201608.604599-7-alex.bennee@linaro.org> --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 84425d87e2..f4b6a9b401 100644 --- a/.gitmodules +++ b/.gitmodules @@ -66,4 +66,4 @@ url = 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 Fri Feb 4 20:43: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: 539880 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3565458imr; Fri, 4 Feb 2022 12:52:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9uDLeEVx9rwWPg1xclj0He/UkkpAEf9dURE+ZP5GvN5G3tp/4RQHnOTL5btga+0ePuXq8 X-Received: by 2002:a25:6a55:: with SMTP id f82mr989046ybc.1.1644007948418; Fri, 04 Feb 2022 12:52:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644007948; cv=none; d=google.com; s=arc-20160816; b=I6A4Yz4MxgIY40L6jqCJsrUX86/K9dz554eepqhalnYizq0VVqleYYKUOg/WGh604N 4ZysLxutXZz6hWhE1uYw1txvJGuVGEw3/xB4IPmpRHnGbLexNi2UKsAMNjnJxMpAqeEC NBSaqk/I84V7WIvEJuBVGm+yxGjiXlqVK2siCe2/2IXWwUQ30ikqHJhtrEmUHPossmrB MjHoVULmkBtTQYTVO1S24WcdsS3bh+g0cj8riKr1BPtdYhF81gTrK04pw7SJZ+5jVhkd JRWpfKbbZ89b4Zrc12zHD9DAhgsqaLcQovU0ay2g6XxMUnlmK+weRbee8TSJEGUQcfqo SPYQ== 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=2KHr0kxH9CLEWlHl0W4fK5P4+OBM1Yg1uq7/VVGxFQs=; b=bHfM4mLLmWyrRPKTclnYpvOse/vvWxRdJMl5dm8JO6ofH9CLfxxLnQsVatl7pExTPx v8C6Ar62/ZrPWFWS02RRTuy5LopLClTpBU9Y8S4FunDsPybCFAsLQ2EK+CbkTlnyrZid mtg8v6u4Bnj3Po6sp0/rsT3054PaNYCFCqa1ooE5qWYbKBbPegCsu4xL478FfoElycJJ lZGlnMFnEdoe34uw1WeD6Pb4MTmVE75yRG9WF5Ap1B+9vZP0mOM9xTjA+oLXB8h6B6qG eYqtB/tEudH7cu62mE+RaaneK5G6DPvOOd8E19ff6DnaDtbzmIdfx+i1Fu7V+Ke4d4P6 uIGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VHgK3jv5; 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 143si2059046ybl.723.2022.02.04.12.52.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:52:28 -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=VHgK3jv5; 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]:37976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5ZD-0001ct-Tn for patch@linaro.org; Fri, 04 Feb 2022 15:52:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5Qv-0006kn-Ci for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:53 -0500 Received: from [2a00:1450:4864:20::430] (port=41885 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5Qs-0007ML-Ik for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:53 -0500 Received: by mail-wr1-x430.google.com with SMTP id j16so13362134wrd.8 for ; Fri, 04 Feb 2022 12:43: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=2KHr0kxH9CLEWlHl0W4fK5P4+OBM1Yg1uq7/VVGxFQs=; b=VHgK3jv5bjT9aMQr3xpV3Q0JaYdy8IJeUJND5yA39HCTwIui3JHK9eV/CjuCBuoRqd VWwegHW9z5Zh25SHEtg/qpPzRbhpniWlPfK4P/DeAPMCSlY3fH89k91Ttm7FNtZtnuWx 6gBaiFep7QAOCfP98jOA8YqSfro3osFApSu1vsMYyMZHZTUIfaiCe2jKjKipa1JtZNMb sm7INTjLwvvv02E4PJFa3wqFczAUiBaHsEowXm41OVxMZrUaI1hF3bDXABTQtAD6HqcH NR6PmZwgQnqpidRxY4ZR6kwqN7SUOAZ+VvTbw5SejgmIooK2wbWOs6aZ+Cvo3p/lIJ4R 4d2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2KHr0kxH9CLEWlHl0W4fK5P4+OBM1Yg1uq7/VVGxFQs=; b=frTGMfg3VcvkrBOlF+l2kgyPFs2nSQ+Bhv+AHVqebv8A2EesUPdQssu3F3N82cu1PB FJcdEzOem8TD/fUpJzvl0PXG7q2dNxYXr3b8PmK438IQiEQbVv7bdMMhD3wNpZ9ZRcyn wtY5ThsDsU8D6qVPLOXtLx8fELqFc+cQkg4btc2hAxJGV6onyu89ShETlOhiFkPHkFk3 G7sS6n1ViosTQTWnQzheHV89VqBxz7djDwjrWyzLFvrZyESudIHu+kApTJ+Qeup3kF+V LJa2XBco7Kdo95hylbVN6SB5/L7xYzzTOmcpSasojDykZya8tN1Q3d9YiC5oA2WPsMnx viiQ== X-Gm-Message-State: AOAM5326FCEXQCC7b4Pq4TLNWiz9TkPlGMubJZ0yA/eYn0/K4ptaYe3l m2Wz41ZRFhNXzuwYR0A7ntmZfw== X-Received: by 2002:adf:ab18:: with SMTP id q24mr521536wrc.617.1644007429323; Fri, 04 Feb 2022 12:43:49 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n5sm2476762wmq.43.2022.02.04.12.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:42 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AA36C1FFBF; Fri, 4 Feb 2022 20:43:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 07/26] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Date: Fri, 4 Feb 2022 20:43:16 +0000 Message-Id: <20220204204335.1689602-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::430 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , aurelien@aurel32.net, Beraldo Leal 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: <20220124201608.604599-8-alex.bennee@linaro.org> --- tests/lcitool/refresh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 033120e223..25301f2ef0 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -62,7 +62,7 @@ def generate_dockerfile(host, target, cross=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 Fri Feb 4 20:43: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: 539882 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3565481imr; Fri, 4 Feb 2022 12:52:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJzY6s5SSUNFYi4Paw88ibqflTga5pnmGd4jPmY8e29LAiF8wnBaLbB/tE+SakORxwB7aWGY X-Received: by 2002:a0d:ed47:: with SMTP id w68mr791756ywe.420.1644007950005; Fri, 04 Feb 2022 12:52:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644007950; cv=none; d=google.com; s=arc-20160816; b=aiz1ruOy49qjt7k1iihnuw1/FZ4TbXi4e5vgqUPyyus/3XlgQPiWMxOPHo3lIKyHlf dRl6FHdAkWJOCFUdSp2ZErJkojpxv63XoonGjmc4vJDGfRaMN1tfpmaIFY19G1mP7DNJ 5cFSNccolzNj+YTgECFuDE/lieV3W/uSuAnPtda1zC4BncRqJkoYJAX/vDyBZCswCdcm Xo2gNP/qVtFPAOLCpFobIxN3KT3WYfrYxjHd3bKW0T3Zt+/26bVBFNnwOXWwdrOko1La 00u6cZ1upmknnkbwe5O+bQ6by0i2VLG55JAo3f85zP7mevdrpxl4rk2FgormDqrRTYk5 V5eg== 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=fzrsHIr2UBl/pseqKFbHnJlYZQrcZbG/aifIugk8tsI=; b=bhNJlsf0LQFVjLUYVvXVrJ/fIe8FbMSMWj/yLaV86Sc106igbvQu0Y4pw8whQravj1 kue9LAUJxqG27KlRhQ7oN1kXzfuVEgSumBxWIh6BBZeGKTiRJ1mTGVX7Uqf/J++EYe6g Wkrj28goZRf9JDygMOoFH/6Hgr2pq8us9DCh8BB3Y0vP2cQSmr7vOyq8ew0lRZHNPk8+ EEKKkqlKJhuCCGzWJwnCEiMy6fQIPT4DgxMQIxczvnPCzrM+JgXCJkD6VyU/lJ1WqBXK 4xHZZmpkJflTmRAgcbA9dN3vuz2oeJLfLw2CkHGtM4DPYV8UtzHnDDx8K7VAgJ2NfYco Fc1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OhHlu72d; 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 y195si2429370ybe.603.2022.02.04.12.52.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:52: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=OhHlu72d; 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]:37952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5ZF-0001c3-ED for patch@linaro.org; Fri, 04 Feb 2022 15:52:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5Qu-0006k2-IA for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:52 -0500 Received: from [2a00:1450:4864:20::431] (port=39529 helo=mail-wr1-x431.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5Qr-0007MA-SO for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:52 -0500 Received: by mail-wr1-x431.google.com with SMTP id r17so4363670wrr.6 for ; Fri, 04 Feb 2022 12:43:49 -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=fzrsHIr2UBl/pseqKFbHnJlYZQrcZbG/aifIugk8tsI=; b=OhHlu72dEWhPvaL63eUgRFi7Litig3J29J1BLN6Huv3854sUpau/NhvJMepYyn1ce9 XGRPAC6EKIU8VW+BGd6gkYdn6oYGhU75+yL62lPXM9kMwmsXP3qaWIWMGkDbcLM39M1d vkUd1aOGGsfYB1Jv3Gxngr/iYrg8ECSwZAD0FDM4Y5KnYaqVD5Dr9ZRig6nME5rRZv/2 EVpHh8lLN3IaynaCyBUQecrb3vtMy6fTt48YDvQbIjwyUwsf+ZfN+PTpvwOP8H99/tKo S3snEabGFoYQfiVy9+ATdO985U7uEjQYqbXopfh0DPnEiRhc6yThNLEO8pgQWmxalb+b czmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fzrsHIr2UBl/pseqKFbHnJlYZQrcZbG/aifIugk8tsI=; b=J+zNJNg978Iq6ZqQCoHMvbNer+pBYMZXaQUO75DqpoUgnck9tm6Qur7F/vy8E/7NRz E2A9a0okxi6R04cVCqn1nQg7Xin3Z1UtwcOOv82Y3/CKMrmPvNBABzcYolrLi0OXie9S nCqgwiqWWKZHJKphlk9dX+YQP19o0dVv8LkG5RFCzXIFlBtm+ZBBSGi892XwBJAjHDPP 6aHs5ZPIyosejioJDiNcVoL3iYbBYPP7xAgTzL+tBFX7xLiL023H4DnVltL99BJsUSAm vfTt+5Yhy6dkVIiCzE73iiMokuRklM3BdKdHLVmyC00bLAkbe12VriJmHXxvBSAeaKHl tePg== X-Gm-Message-State: AOAM530Sj1Hoh70lY4Ko+aXwMVYXAClncO7YymWWD8/I6LJmJmWZUE0+ K4wMgZLBo8SIJ/cOjtAyzIv/8g== X-Received: by 2002:adf:dec3:: with SMTP id i3mr529622wrn.695.1644007428493; Fri, 04 Feb 2022 12:43:48 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r8sm2765724wrx.2.2022.02.04.12.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:41 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D61391FFC0; Fri, 4 Feb 2022 20:43:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 08/26] drop libxml2 checks since libxml is not actually used (for parallels) Date: Fri, 4 Feb 2022 20:43:17 +0000 Message-Id: <20220204204335.1689602-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::431 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Peter Maydell , stefanha@redhat.com, Michael Tokarev , mahmoudabdalghany@outlook.com, "open list:Block layer core" , minyihh@uci.edu, Wainer dos Santos Moschetta , aaron@os.amperecomputing.com, cota@braap.org, Thomas Huth , Luke.Craig@ll.mit.edu, crosa@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Kevin Wolf , Vladimir Sementsov-Ogievskiy , berrange@redhat.com, Beraldo Leal , f4bug@amsat.org, robhenry@microsoft.com, Hanna Reitz , pbonzini@redhat.com, ma.mandourr@gmail.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+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: <20220124201608.604599-9-alex.bennee@linaro.org> --- meson.build | 6 ------ block/meson.build | 3 +-- meson_options.txt | 2 -- scripts/checkpatch.pl | 1 - scripts/ci/org.centos/stream/8/x86_64/configure | 1 - scripts/coverity-scan/coverity-scan.docker | 1 - scripts/coverity-scan/run-coverity-scan | 2 +- scripts/meson-buildoptions.sh | 3 --- 8 files changed, 2 insertions(+), 17 deletions(-) diff --git a/meson.build b/meson.build index 5f43355071..82db1e7e74 100644 --- a/meson.build +++ b/meson.build @@ -453,11 +453,6 @@ if not get_option('linux_io_uring').auto() or have_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 Fri Feb 4 20:43: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: 539881 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3565462imr; Fri, 4 Feb 2022 12:52:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJyL+eDjORTFZvzQuhYnvANW4+BJYLL6oWEuao8HexOnH1QfKUx/pBsXcCbq2q2SfllQqxKw X-Received: by 2002:a25:cc09:: with SMTP id l9mr1022369ybf.195.1644007948808; Fri, 04 Feb 2022 12:52:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644007948; cv=none; d=google.com; s=arc-20160816; b=vufGd4mf3CUOZCQnoHtGdtiq8cpdIYZJ5qRzO2YCkfW1rBe2Yaa8YbFM4BHxVtSxfj lfmEIk3dN4msM7wSuR6q3p8wNnABRwrsOJSr2Ffe8VoeOQfTp9n24FHaUd5LSeLTRaQU 6QWvnyTyr3QVU5pYt93PEHrNYiigIrflDeQPxXZaXTUb8ZHYgsODWEkvcRMb+j7wH7Rh GgmOIdAx3w5L/7gY8ubkGBpXxWO4XVwQTZVVT+gGKB/4cO1L+YFo6dUXaSDy6ex/O/QK JokcE1PC+rFOqv1A3zFdKqAVrye7q7LNaVgz3oBcI6DVkaFtPBgRO0anEcAchXbeSIZy MJbw== 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=OwYtA2KKG+0bbq8x95tFKhT0n1BvnQylT/23Qq8x4yM=; b=RODjNLKR+qSUjoA7gZq6rYiDJo4hmg22gtr4tVfgl0gucjnrVgpVYuZNc+Uzjz4kMi t+52fnG3fMgbfl/SfzWHUU5/RaGAdcHeNjo/i9mmr4mGzB2qQLn+ChVSMl4+cb8gHXRT ulDIp6bZ+ncItwkKKbhFLOfRBDpFnQShFHKkFkw/4ZVSvT9x2TSr5Qy3tvPMaD4Zut51 Cxy7sCkZe2Hu9yTCkidnLdu+6CQUZva59AMaq3HbGRnuaLnHilJrhIn/SzaVkJHyKMFU Clsj0X75nBlrh2o6tmYYdBrm4HP5z97jbXRw0UVNJLBZnCkWVQw6Fi+yR1tp+UW93tef Ur5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QkApTYxH; 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 w67si2438494ybg.660.2022.02.04.12.52.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:52:28 -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=QkApTYxH; 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]:38022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5ZE-0001ev-9f for patch@linaro.org; Fri, 04 Feb 2022 15:52:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5Qz-0006nO-Gw for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:58 -0500 Received: from [2a00:1450:4864:20::42c] (port=39525 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 1nG5Qw-0007My-U4 for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:56 -0500 Received: by mail-wr1-x42c.google.com with SMTP id r17so4363981wrr.6 for ; Fri, 04 Feb 2022 12:43: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=OwYtA2KKG+0bbq8x95tFKhT0n1BvnQylT/23Qq8x4yM=; b=QkApTYxHhHP0XanAKJ2Y6Qi5S2fdwAC1R86SFRJIwTGkRcstZiaFbMk4z/1TJRzLY0 LcEnLG5X4WOPxvfnfydFi/Ca7qYvr6XZ1gbJFeONyNmUeo8m4gGl/yvLE8gtwOWeUQZK rNo0m+HAefE3WSNAbx8Ltr44D6cohlKEdTQNORCqca8jOJhKjZL3gmDGPq6qgL9krsop 1xt7dbF82Ug1odJzGGWGynX5nm4r8n1uC4cDpA3Bxmeu7YDHW1vWcCiVI8bSRFv2Mv7U cDuwZcRaeb70Qr4l3YSo9T58ij3ObG8xlFBSM1uebQsjvu/N+OxfAEWSUl+cC9P6YLQB kDOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OwYtA2KKG+0bbq8x95tFKhT0n1BvnQylT/23Qq8x4yM=; b=LnHir60ZT1VhfE/l5mIxbJ10AwYH7mP9hCQjiDeGf3aIWBUILOQT2UEMjK+WMsKxWt hC1llmdB17f83sFlztQY/Z7F1ofVLGl70Pb417E/W33XzerfUq4FU8mEtnDtxAcxWZQn kNEVanRCJRLHECSxxmU04FMHdykGDmT/6OWBEfjR+opuwfVVFJB1TYCYAJf8q08Eo0qW RGKXx94HSvnaRudHhqedLsmSUaeadqbB9W+ArF3xnq2PhcHzpc2ONK9IJD5352N7vS49 WLmxt5yTBX76aDpLwzylA8k9oGesbFlvTdG9Vax4vYQmhIcC3XxTsMTp+XVtoIbDIHbD 7GRw== X-Gm-Message-State: AOAM532syMGXQKeVHx3nsPs898Aip/rSzXjI/SuByZxy35ZsEEx60fLi +XOGHZocAEpI4/DLl6q/jWNDAw== X-Received: by 2002:adf:ce8c:: with SMTP id r12mr494842wrn.623.1644007433639; Fri, 04 Feb 2022 12:43:53 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v3sm2770530wru.15.2022.02.04.12.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:42 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 059E21FFC1; Fri, 4 Feb 2022 20:43:36 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 09/26] tests/lcitool: Refresh submodule and remove libxml2 Date: Fri, 4 Feb 2022 20:43:18 +0000 Message-Id: <20220204204335.1689602-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-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: fam@euphon.net, Thomas Huth , berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , aurelien@aurel32.net, Beraldo Leal 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: <20220124201608.604599-10-alex.bennee@linaro.org> --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-11.vars | 2 +- tests/docker/dockerfiles/alpine.docker | 4 ++-- tests/docker/dockerfiles/centos8.docker | 4 +--- tests/docker/dockerfiles/fedora.docker | 4 +--- tests/docker/dockerfiles/opensuse-leap.docker | 3 +-- tests/docker/dockerfiles/ubuntu1804.docker | 3 +-- tests/docker/dockerfiles/ubuntu2004.docker | 3 +-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/projects/qemu.yml | 1 - 11 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/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 Fri Feb 4 20:43: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: 539884 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3566782imr; Fri, 4 Feb 2022 12:54:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJzkbK2JzOrLcZRLewTVROajVT9N26gKqZoDQUQ06JBRnI3OVMcn9EZDES2Esp7EbOJ8+1fR X-Received: by 2002:a0d:e0c2:: with SMTP id j185mr776468ywe.475.1644008090584; Fri, 04 Feb 2022 12:54:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008090; cv=none; d=google.com; s=arc-20160816; b=D/eKxITXDazC2XuRTc6CeCX0bLw/lOKpdrZ0RjhVKAAuzrC7I9dAuUgFjlLwThF8QO UU6e1egi+OTkrjjFGStVxNORBzdcGBwkNmkqxeIrDSCSse0Zk8jDwbmI+9K6GlmZfwkp CYprbLIL8OpQYOGMMrLmVOTb6FsVnacsoBVHwLdUu1GjFZJPe/lDcWaukGjAXJlakPZ5 HRylmRHB20U85ThZgIBdGu+c+QVTSNamrvdiAF/wHtNEUbUCbvcOagvV+9ikArz/oikj MeKxo3rX7zx4hDqwYTssy5Llrut2RPgI7JeW8mf1lup+5eJpeAo6wImknF2Hh1hijiXP 3yJg== 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=7MhMTi1pxN3EWkNN5Z96EF/V4GjjGNATp/VG7QnEpIk=; b=bKQmDZRMK4Ck+eVaVzb3wYshQLUovBqADIyAHj6k7mcPsfO/UnIbRk27XUsYvVcUem craVeKejDIl5e9KPUthYJ29SuKDbu4PsgCXtVWKQ/mK6wpJATernVdBBgGPsGCmXWZYP aSlsvMMCvLbx4x6PVXm9T0q8cS9J/1SDjRzRnjZSEVMOgObQ3yK0GfdZuUjJQIkVkrVW D6U23u3uQ3/2tIkmCsoP2vCL2uWtlR3LlfZukg3vGU5wt1AzPRx/mzt7sZPcCpNo43SZ +cqYtZn+MeSW6IraPj0TqrRZNSAnP4YJHkE6/uY62d7WB19oPdDoUnrRv4GmgXbn4+wD CKSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wNemT6mx; 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 b124si2290424ybc.450.2022.02.04.12.54.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:54:50 -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=wNemT6mx; 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]:46492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5bW-0007Fe-3k for patch@linaro.org; Fri, 04 Feb 2022 15:54:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5Qw-0006lw-I7 for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:54 -0500 Received: from [2a00:1450:4864:20::429] (port=33709 helo=mail-wr1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5Qu-0007MZ-My for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:54 -0500 Received: by mail-wr1-x429.google.com with SMTP id e8so13515540wrc.0 for ; Fri, 04 Feb 2022 12:43: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=7MhMTi1pxN3EWkNN5Z96EF/V4GjjGNATp/VG7QnEpIk=; b=wNemT6mxFr7IKrXkzBgsEm6ooGldA+qPJymPltxx4WweuNJ+aL0NBt4sLnD8WWzZN6 TTRCGVWytH7Znu9yXkRj7ikgTiN4uKB/WWXvxlzG9uCIpKve2tRNuIfyBwGiynz9WDIT K9VZQ9nYU5e6uagwNM3NdahCcoVgYCqbLX0iuaMX0k1VQ+gT9nh70Z9Pdnbpt2c9aLJw auG6K5U6KMl8+8r6ySqThgHOCzOPq0rME4/vCW0eXVLr3v/mxpyjtARBywEHj/4Ckguw FB66RNG0e93kRe5uUyzJuHvXT7ypmyMFDKaWXxuVDCnDpO3wGEISPYSYN6hkK6P8u1Mx uBaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7MhMTi1pxN3EWkNN5Z96EF/V4GjjGNATp/VG7QnEpIk=; b=irAt3Mkh2TNrR04wRe++bsXPYjyOq1DtnWznuXEM27+krxe+bxAY8GTTS9qmX+btCg Qt6x1+NSRO1so6+H199Vq9ifThsEr6xolFySqKJjutOSJzfNFYYl9N+qFc0KeW6Sjr3d LUkEeoiSNWAhpODAaaQJJjSqpwiQ/0f9kXNYLGfqr796ftNt26URh2bpjYufH5PVfqhb FMu4EP0YngYPIWh1lNdliufm8uvlNJSgqAPMJnw9jvtIO+DOd06IvUmKeOgiect9lx71 uE54jGPz8iFeKzcb8kh2/Y4tluywEPVxaRzKTAvtNFeaN5EfbdwbunVcdts+e1OhZ5t9 uvwQ== X-Gm-Message-State: AOAM533AotJ6bvCduOQoUK2Z81eazu34hyNmQo6ZnP1BG3cqCOYH1x3w yysY8epcGnbzh8NARfUUY01eAQ== X-Received: by 2002:a05:6000:1b81:: with SMTP id r1mr501826wru.609.1644007431467; Fri, 04 Feb 2022 12:43:51 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e15sm3250693wrg.6.2022.02.04.12.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:42 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 21D261FFC2; Fri, 4 Feb 2022 20:43:36 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 10/26] tests: Manually remove libxml2 on MSYS2 runners Date: Fri, 4 Feb 2022 20:43:19 +0000 Message-Id: <20220204204335.1689602-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::429 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, stefanha@redhat.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, Wainer dos Santos Moschetta , aaron@os.amperecomputing.com, cota@braap.org, Thomas Huth , Ed Maste , Luke.Craig@ll.mit.edu, crosa@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Li-Wen Hsu , berrange@redhat.com, Beraldo Leal , f4bug@amsat.org, robhenry@microsoft.com, Yonggang Luo , pbonzini@redhat.com, ma.mandourr@gmail.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+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: <20220124201608.604599-11-alex.bennee@linaro.org> --- .cirrus.yml | 1 - .gitlab-ci.d/windows.yml | 2 -- 2 files changed, 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 02c43a074a..7552d70974 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -32,7 +32,6 @@ windows_msys2_task: mingw-w64-x86_64-libgcrypt mingw-w64-x86_64-libpng mingw-w64-x86_64-libssh - mingw-w64-x86_64-libxml2 mingw-w64-x86_64-snappy mingw-w64-x86_64-libusb mingw-w64-x86_64-usbredir diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 62dd9ed832..1df1630349 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -44,7 +44,6 @@ msys2-64bit: mingw-w64-x86_64-libssh mingw-w64-x86_64-libtasn1 mingw-w64-x86_64-libusb - mingw-w64-x86_64-libxml2 mingw-w64-x86_64-nettle mingw-w64-x86_64-ninja mingw-w64-x86_64-pixman @@ -80,7 +79,6 @@ msys2-32bit: mingw-w64-i686-libssh mingw-w64-i686-libtasn1 mingw-w64-i686-libusb - mingw-w64-i686-libxml2 mingw-w64-i686-lzo2 mingw-w64-i686-ninja mingw-w64-i686-pixman From patchwork Fri Feb 4 20:43: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: 539886 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3568229imr; Fri, 4 Feb 2022 12:57:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxTIjmpo0bc7jdwU7uExLkfLg2MtQ6moT0QxKNwJi5cuxBtsUpahflOgaXqzNagv5iqHjA+ X-Received: by 2002:a25:94c:: with SMTP id u12mr1000563ybm.29.1644008245698; Fri, 04 Feb 2022 12:57:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008245; cv=none; d=google.com; s=arc-20160816; b=LgGPoRVZ3L1mQNVbBZE/maEzEynuXaJL8ygY9Xe5MqlG/2Uf+eQ726sx031m2/3Eqb ci4eqJQK62wR1SsKgwZqXSNEbl9Bb5E3Oi3ZGC5I3jN/OjHkmAqBmHxDEzfXN+4DICIy Pzui/LVb075gQVOEVsaYWMzl5Nq+zYaNPKhJyFZQ6Hth17PuDwN7IPaMuV6ecjoXkpAQ 84uDQIl3MzOaxa53SEVOFkixzJkvLA/QmgIcEIiHd367oPUnWe4oz56BMlN/7x4k58ZH hCA9+6lW4169g+HGi/EFIgPXZCLvEAb0mZcQ+XZUsavt/vZq8WM5ieM0UL/FBO9mXPq+ v5DA== 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=a3pYD4JYSVXhkyNJUs20bvFwaG/zT+sknHaI6CYVatE=; b=qt31s13p3oc43rjUTZaa7vgSrHwTNnVMDFPT/fhFJu3cGpLmH4jl9n29VVkTX23LsY Zo4PLTcmJ39kGoiV8OAd3CtotrKdMALdiurtvNPeo9YVVXWDqjXkv2IPICDUWZn8KfCe ARTL6EHW1Y1H3uGfGGjscDyuFpkgqqYmFBmMoRbfKQmFQtCif56cj3qqZBAgtYkOzccc TCZbgZ/mGBZmQgWa8Ji9gpEDknNgWexqCPWLmSwyjxZ9UVhGyOKKpMvoi3j/kCQxp2x7 WpQgwEAul9IFg4U0f+0mGnM67mpaCJpeStl4j+UFpDzy6nMgeh9lezELxPoA9kkS1PsN fy+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TA58Qzb+; 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 h4si2158540ybh.202.2022.02.04.12.57.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:57:25 -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=TA58Qzb+; 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]:54820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5e1-0004hI-7N for patch@linaro.org; Fri, 04 Feb 2022 15:57:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5R0-0006oc-Np for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:59 -0500 Received: from [2a00:1450:4864:20::42a] (port=46058 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 1nG5Qy-0007NA-Bn for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:58 -0500 Received: by mail-wr1-x42a.google.com with SMTP id m14so13364305wrg.12 for ; Fri, 04 Feb 2022 12:43: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=a3pYD4JYSVXhkyNJUs20bvFwaG/zT+sknHaI6CYVatE=; b=TA58Qzb+F8E975v/DTXedJi2piVdfVnaaWVIERqz5mmcgY0sotV6i7PI4P32L1WTA/ am1zN7oStqp5u3fZsGA1PARcC9kLp9K/cG71nMVQ9ty2U53Cy7ob+vhV3u/ogAgT8z79 ubyIda7S6yqqu/nzpaq7UhKv/uyLW/7xO1tBmDnMY+I55TAzE8j247gYkCbAaNdvQxJz ysJ2RuBGdsPP5QcY0A9oTdNFHDWxzXZLi4o4KS2S0n+YXekqsAlQeIEShW5e6XBURcQS +ufCcQfr5NyZuNdvOwldyzZflKClqvAQ89ohDU7xujNAgEyUwrp9pPlyyKBi3P3pPlrJ WCrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a3pYD4JYSVXhkyNJUs20bvFwaG/zT+sknHaI6CYVatE=; b=ZZlioydaI7VgllGny+IlnIbmtAKvigZCdxNKa+FKWhxAqDLuqhjLs5pJjtvBly+QaL LKOcbHXpEDy92aQ57rViHCd7ZS0Zo3Frj8ScQ2KYw5Eji6QIgrVTWU/wcrttit2YIiCV kONfRGCP2flu2XQxRu51f0E7AzKQWEItTeocsupf6lPOXV+4eTVI1ZBi9UHyeNStmn8u LCPj73lvQTUpsRvMjtXwfuAod5XSm+ZTGocEWnDoeSZwgwHwHLBkhMuL6hO4pGktBtjM 4+YJmHSXSNrFKxl9gtNvqQujhCBbsqL1HANKHDixAghCqBUfHV2spGDR6EZ9VfwOltc8 9HOg== X-Gm-Message-State: AOAM531gssxk/tPQ9UAzRMbsn1cljhpqlyyfk1E4a26QVdH0q816hqc8 RoDfgmnIrRidnl/ATlwv78fSoA== X-Received: by 2002:a5d:6603:: with SMTP id n3mr538074wru.20.1644007435161; Fri, 04 Feb 2022 12:43:55 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a15sm2905543wrp.41.2022.02.04.12.43.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:48 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 41B5B1FFC3; Fri, 4 Feb 2022 20:43:36 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 11/26] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Date: Fri, 4 Feb 2022 20:43:20 +0000 Message-Id: <20220204204335.1689602-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-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: fam@euphon.net, Thomas Huth , berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , aurelien@aurel32.net, Beraldo Leal 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: <20220124201608.604599-12-alex.bennee@linaro.org> --- tests/docker/dockerfiles/ubuntu1804.docker | 1 + tests/docker/dockerfiles/ubuntu2004.docker | 1 + tests/lcitool/projects/qemu.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/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 Fri Feb 4 20:43: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: 539883 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3566733imr; Fri, 4 Feb 2022 12:54:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJwIuz1kcj2Pd0CMm2fJm+AMYh/x/IAf6U2oMaTXC3tT2+N+8LQ69b+lppc49iyT6tU8U9iW X-Received: by 2002:a0d:fe43:: with SMTP id o64mr846692ywf.400.1644008084713; Fri, 04 Feb 2022 12:54:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008084; cv=none; d=google.com; s=arc-20160816; b=v6rYhtiRJYQzoljdG96n+D7TBx1LZmXpErocCFc5ZO7PrEwjKRwW51KsZhtmpA5ouM nWs453FxiDh4OpxW98elZeRsfItvjpThkrl2vhe017dLWQFAeKw2QEj0O3lCk1AZugcv CKHzpfPU5b4Mn1aYcWwDFi0btQc9tmbZyll2IVWGaMwxm73zcuDBle1eCGDULmN2iEhn hteKrajgNX+aahCeEaaWNXsrBwroWXxogH2cY+8B3dB4sA0Wqvmw2+OMhJ4BlL6asV2y eD54lf68kI6cWU7nraBFY2hKn2cfk/VMdbBX5QqLQYZ9DfkNjNo99zytK/ZeAy64oOFh /osg== 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=gqTOX28W3qt8BbsuGyKcKQO0DuOujFKh4bBIznlXNxo=; b=gGhXXLu3B97oQsGMaVe0ouBSPdUFWgr9gCkJ1IMkYVq47UGe5mH36hubvoHS9R4Ulb OKii2UAjHWx9ajOOWOZEl89tmpoTH6LoNoX+rFOan78L8jEAbOjOncK/smZ/zB6KumwG H3lK6HBaELYOCiZ9GdLg8kIhkYxe0aj4kF2A7wib42CrNVDyotgSIVxhHEmePoBpFcme VVbltcMLjYP4V31weq1VGz2cQMmqZIshy3zS6bUCk7bRzkxHCvWP0hOVcb9Q+KKxJcmJ ELR2Dp1r8m+AN5X3aCEFJhbV53+xMVzAO5d4sxPgnGhAFoG/LL96GI5NwefGAqhjNxP+ MSlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XERfYqlX; 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 p67si2243797ywd.250.2022.02.04.12.54.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:54:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XERfYqlX; 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]:46536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5bQ-0007Hm-8V for patch@linaro.org; Fri, 04 Feb 2022 15:54:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5R4-0006s3-Nx for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:44:02 -0500 Received: from [2a00:1450:4864:20::32e] (port=42864 helo=mail-wm1-x32e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5R2-0007Op-IX for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:44:02 -0500 Received: by mail-wm1-x32e.google.com with SMTP id n40-20020a05600c3ba800b00353958feb16so4464536wms.1 for ; Fri, 04 Feb 2022 12:43: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=gqTOX28W3qt8BbsuGyKcKQO0DuOujFKh4bBIznlXNxo=; b=XERfYqlXffDWIuvlKxPClCRvMXqay9t5AeXVXd+ZqWME6HTbDjuckLqIvKOP9cBH3f 1gbMRL4RLVLiZBEL61YtKUxaWlP4v2amTPf4kWhYI2QIrVMrHOpJSnyQ0c+9Wb9QupQg k0NQYI2J6HL3JztpvooUvA+lAGf8foKwb4SudCWwI2xWCMg3slHwdZeJAKkO16YXTVw7 Ex5Op9Km0M9fwCKPm8340t6lLO5pBas74rxxlG7oyuJd4CcoRel7/ewqgw2zIMrWbY3D FjYxM9F5HOzB++GSEjGOM5okm1/vqrHYS3m8GqF8s4+ZaXK8p4kwxTwOHqTNL5nzytUP izuA== 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=gqTOX28W3qt8BbsuGyKcKQO0DuOujFKh4bBIznlXNxo=; b=hTSwdjWnXv1jABtMu9m4+Rey4Vp518SMXaRWr6A/+aKbIB0mzIbdr/jVj0TnRqECt1 zkpjuCeOK+XV+oxwlYGf0iFLiTZYKhHczneY8w14pktMlOdJC4qkhsrwsGK2ZgBPj6ei AhTQdlwjoF9nWEItZg6RmLY1PAlZ1xg2LoBpADhySOeHlpb5xJDOIsI18inFAW4vbIZl YM6l7upgixyelnc5jecqlCKj4YuPyHAvfl8PlY+SwEXvB1iKwebewbhUc5qy/CctffOD /5KWQyhZwCj8BG/J8HM+jI2OMFFH7j97VsXsZuSH9tfzRRjr+u+W2ZJin05je6DeraX1 +uFw== X-Gm-Message-State: AOAM531M5Qj+vsZ5Bq8lx8+1EaUjaHHEYRErZIOVXiYsC89eCQIw3Zyv VxxVw4Ua0UUcu8nVd9myWteRmg== X-Received: by 2002:a05:600c:17d5:: with SMTP id y21mr430280wmo.102.1644007438921; Fri, 04 Feb 2022 12:43:58 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n11sm5978040wms.3.2022.02.04.12.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:53 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5D0D61FFC4; Fri, 4 Feb 2022 20:43:36 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 12/26] docs/devel: mention our .editorconfig Date: Fri, 4 Feb 2022 20:43:21 +0000 Message-Id: <20220204204335.1689602-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net 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: <20220127150159.1489286-1-alex.bennee@linaro.org> --- docs/devel/style.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/devel/style.rst b/docs/devel/style.rst index 793a8d4280..9e66d133e1 100644 --- a/docs/devel/style.rst +++ b/docs/devel/style.rst @@ -12,6 +12,10 @@ patches before submitting. Formatting and style ******************** +The repository includes a ``.editorconfig`` file which can help with +getting the right settings for your preferred $EDITOR. See +``_ for details. + Whitespace ========== From patchwork Fri Feb 4 20:43: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: 539890 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3572908imr; Fri, 4 Feb 2022 13:03:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9eWb2mglZGEb1SnObjAURzhFKXToopTtC+2f9j1YykmFyD7gBeMoFQsIUU/B2bSHFXoyf X-Received: by 2002:a25:3456:: with SMTP id b83mr1057837yba.648.1644008639563; Fri, 04 Feb 2022 13:03:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008639; cv=none; d=google.com; s=arc-20160816; b=b4V6UcCup+XMs4lfP9N3vp0GFw7JJKq7p6V7un9CAkgnylWYnOLWa88nCcf6T5lafw mQSzry+7wNTI3R2kgJWG/oyXZNDXkKz5EiMjhmWMTvqb5snNnCJvSww0341Q2riKTSur OelvmJVCd4JpG3bawckYeVfMyNIV2Qn3BlcNUx0o7r7jv9qaYDOdG4j6P+hQi97PSEWQ EbtOmn42YD0IbyFLiDbnQFLB3tSK0R1qUpSICrhfqs0IrUUhxJ+0kpvsPC3tuAeC8XBP DAjI4shfr+0nm9FzRlgGHrqGJVlmbNtjTmvuOjVyd3dXp9IfuI3q67KGl1XLd8nAfelp 7N3A== 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=PFUAsUoSTLSeQuqg2QwwUHrYnKbfkML1QApeyrZ65Rw=; b=Q18pbSgK7It+WiInw7p5SJ5EB/TyjmfKt2CJsLJ8CyWZS9ZclE9QOQ3zkqb/I29cPG CHBrVXE6SJibuDdOR46tuBDYqaK11Jrc7dgKTlsLeAxScgZ+X+UdUS6hK13XwIJHrrfQ AP6RWVJs1UomDiH8SKvkkVcwFdyISjfbUJloQ8lmg6W21rEpHWs/bJ8qUqB1GH+WiDrS ZYvhUS8QLs/7pPtd08iD+4mhGgauKl8EabbOm4jhFZAV7PodFiHtS4lhrgU6Yd5uXlzc 6uVF1HOje+ZkhUHVRT5AoyHQuM422s6pim4FJcoJmpM9z8HdCP+n1MGaLTM2Ee/nvv+8 4mpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RKvh4ljn; 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 u130si2155206ywc.492.2022.02.04.13.03.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 13:03:59 -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=RKvh4ljn; 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]:34604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5kN-00024R-2h for patch@linaro.org; Fri, 04 Feb 2022 16:03:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5R3-0006qN-Bo for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:44:01 -0500 Received: from [2a00:1450:4864:20::436] (port=39535 helo=mail-wr1-x436.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5R1-0007Oe-B3 for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:44:01 -0500 Received: by mail-wr1-x436.google.com with SMTP id r17so4364256wrr.6 for ; Fri, 04 Feb 2022 12:43: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=PFUAsUoSTLSeQuqg2QwwUHrYnKbfkML1QApeyrZ65Rw=; b=RKvh4ljnjZ7g5fAZsfYOhXqyl2TwCFsUr8YX3mahDLRLnYTBu7dvxH3DGtsLIXAD9e 3RcKPPOGc8/HTx5rBYR+7YwSnuDdMDOcOx0viVgGfCgyjSMbUDG6dRBjfOlt+BcUHFEe fZb2E/6+hL/c19SyFnA6hPYd7PVaHbWDmkZYnU7kDMpHYYhQ4RL1HvFxiUYSdoCzlcw0 Tq22WPq1CA0XM/Lyt8KybfJuRI7STFCotaTfVfOnQdTE191OMSR4jjDDGQEO4vuqL6z8 c+Bas8RVIysroFLAnFe1qux82TAZJ6SZFKpTRVI/8ZuxD5/RRqBr1LfSBYfDIxoHSpSC kJRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PFUAsUoSTLSeQuqg2QwwUHrYnKbfkML1QApeyrZ65Rw=; b=VGusM5mX5QYp74MtSE8ts/JDXU3+eJ0sKfcL9IIoIwqD1Vj4TNwNw84NK8ySsLYQ/9 /28Er0g4fcAKAuS0iE4GVm+W+K5VxOEF//qmNIoHTWdtmshu2Irk140QznSqYT4c1pN6 V32xDYc56k+w+a/m44rXU79iB3caDQodFE83zevd+m9uyIL9uHRG16A/0S5NfxcAdLxU a1kz+VizR4FDCkmDmDsl/FjuDoZNDr5uTlE4NWpmvY3QIiPgcki4cDK01PoLKS3r3sgx 5YeoXWk8iyRH+igN72yk1yCkT+Yrg/8W59LkRdrnn6JdkoMUWI5HcYEwHhUwlTXQrKFy cgwA== X-Gm-Message-State: AOAM533vzOoZB5E3ZcRyH8z9sFuZ/zbPXsU+YOwXbRt4fK7CKBN2e+Ph X/zvFgQRAFL5bPye1WH3BwhDxg== X-Received: by 2002:a05:6000:1848:: with SMTP id c8mr494163wri.241.1644007437993; Fri, 04 Feb 2022 12:43:57 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m14sm3892392wrp.4.2022.02.04.12.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:53 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6965B1FFC5; Fri, 4 Feb 2022 20:43:36 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 13/26] gitlab: fall back to commit hash in qemu-setup filename Date: Fri, 4 Feb 2022 20:43:22 +0000 Message-Id: <20220204204335.1689602-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::436 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, stefanha@redhat.com, mahmoudabdalghany@outlook.com, Gerd Hoffmann , minyihh@uci.edu, Wainer dos Santos Moschetta , aaron@os.amperecomputing.com, cota@braap.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Thomas Huth , Greg Kurz , Luke.Craig@ll.mit.edu, crosa@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn=C3=A9e?= , berrange@redhat.com, Beraldo Leal , f4bug@amsat.org, robhenry@microsoft.com, pbonzini@redhat.com, ma.mandourr@gmail.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+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 --- .gitlab-ci.d/crossbuild-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml index 10d22dcf6c..29c3c2b826 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -14,7 +14,7 @@ - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS - if grep -q "EXESUF=.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 Fri Feb 4 20:43: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: 539885 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3566793imr; Fri, 4 Feb 2022 12:54:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJxS5vfw/x9/lz4yTw7MVMj/aHu2oyGRZ+NnF//T3g3sm/DpPyp050807cLtZQhBTQO5GxgB X-Received: by 2002:a81:6fc2:: with SMTP id k185mr792268ywc.314.1644008093092; Fri, 04 Feb 2022 12:54:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008093; cv=none; d=google.com; s=arc-20160816; b=vn2JOAUCrLY2+E7bpjTj0nqxOqO0GTyMOW1HnF1RV/gX6Pbbn2KcdqzQUQehRa07rz aBsRb1ev2zWgnMb+qw58wYt/2JTJpTPQhse5OHYzzLT7uK6/jMEm5gPvIOPh5PPKzFfv pZU8vX3HEO2JdbVaGlFOHxrgN5y+JOVI5KlnMAPeNs0rvesS1LmTe4BdzZgvxsb00qrE 1DoIYz5n+WKj8eCpE9OZGcGfbTgiQ5ouJwGB68Lxqc/z4njjX4C6EOmoCBcmErYaDN+w B1RQGZP5PGrxLu+PaTMABOjN7jBFrq5gJyGZ8hStOePQDNdrGLUzzE73ajb3A+OFgP/h U72Q== 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=1u4nTPcgCnoP5nWCHXH8kN4KACknk+m+YDzrxf6W/lA=; b=J5i9QWdrMpPBXVRWvZsd23uBZpd7ej4i2Fb5ve1eaBbSdp8UPghIG9b0zZr6aWA6dv oB5xs/Sh8IBHAzduZ3Xyt/dXLs/eURhfG4zZ+CCTnk9ZoduRP6zUrE/Cr88HZFnVh1Ow d8RYXHAExYdi1ag9IAZDDIuqc5FzhNopjCduhZJW0JOS379HMZCgMKz+G0mDcSdnCWzW xEait+7krwJeoj/7mCQANSlcpMFU8aj7rG7WyM/qB9zadSlDs2+eAAsbgAtQ6MX2X8yN 49Aemw9d3yLCiMswMevYncHSbL6eqy00EslHBJ3rufIEFmBvAd1800lMFPOr2HsNvwJH WKEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iEA6tSnD; 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 a4si2396157ybn.767.2022.02.04.12.54.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:54: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=iEA6tSnD; 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]:46828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5bY-0007T1-F0 for patch@linaro.org; Fri, 04 Feb 2022 15:54:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5R1-0006ol-Ix for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:59 -0500 Received: from [2a00:1450:4864:20::431] (port=43651 helo=mail-wr1-x431.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5Qz-0007NK-C0 for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:43:58 -0500 Received: by mail-wr1-x431.google.com with SMTP id r19so2632482wrg.10 for ; Fri, 04 Feb 2022 12:43:57 -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=1u4nTPcgCnoP5nWCHXH8kN4KACknk+m+YDzrxf6W/lA=; b=iEA6tSnDsH/F9vPYjKrNzVdSng4oSLncb8uAbMG5wljA/+o8ckt9QWV4pTn4haH2bI 0+f4kfSuckQNPiwOga2s9O+rhjxPEFezYxhutYEL72B/vZ5l6BZCCngv2/YlZqX2Lyzg ykpisJPQ31WoRgXNMkxtjHubJZtMS58oBuDF2BReJ44rhgOKFsku87kJCX4rrwvIdmbL 9jepMWGrtPU78wVsyCnMF7VD87DATHugmm1jJUzz+wm3hI2NXAYEOZDtammjhiZNEnpw Q7UwSUlPaqiT99t30fETGJR68weyaIqn2cnFwlpzzP0Gf2km7kymt5sdhYBIn9lPaTXJ 7EUw== 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=1u4nTPcgCnoP5nWCHXH8kN4KACknk+m+YDzrxf6W/lA=; b=igQ4DSxC/rTFgI+UI4hM/2dUHLutJfmGOMV7iJGLKRgUFGRdrO6IcYO+nzrCUXK9i7 yMZlbkBPdougZIc8S6YTvRonYfvbDG+Q0jd6LJzLwR9vj+9vIeTdI0WVoaEDXi3ufGLn w/b7YGa5X/LViTlqPBYoLLDw9A60dU/SXZvieHD3tJL3AY+3wQj/Wk4ZgUhwBtzWXmrL 4Ik7tmhdUMnlgtnOV237CZ6Zf32xeUFX5sgT0GxPZiElEqqm1Yiag55oaSin5SvVo8Tf XLN3+0bi3x5ABncBbduHvBFiTFr2HH1oEjsCmIw0z9P7+bVskOswoxL4vZYXk4go0+/C uuAA== X-Gm-Message-State: AOAM532pL8oBzIa48kotrU60oESHD3DDUfSSgYpk1AqMVV7DbGIs0LO0 OohT15wV4l4JUyzUKkIgwxh0ow== X-Received: by 2002:a5d:458d:: with SMTP id p13mr547103wrq.580.1644007436173; Fri, 04 Feb 2022 12:43:56 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q13sm2192719wrm.58.2022.02.04.12.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:43:53 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 83A3D1FFC6; Fri, 4 Feb 2022 20:43:36 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 14/26] tests/lcitool: Allow lcitool-refresh in out-of-tree builds, too Date: Fri, 4 Feb 2022 20:43:23 +0000 Message-Id: <20220204204335.1689602-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::431 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , aurelien@aurel32.net, Beraldo Leal 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 --- tests/lcitool/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lcitool/Makefile.include b/tests/lcitool/Makefile.include index cff7c0b814..6b215adcd1 100644 --- a/tests/lcitool/Makefile.include +++ b/tests/lcitool/Makefile.include @@ -13,5 +13,5 @@ lcitool: lcitool-help: lcitool 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 Fri Feb 4 20:43: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: 539889 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3569062imr; Fri, 4 Feb 2022 12:59:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJyHn6qOIJY3I2D/WixEcH1B6CGCwHuSixDQ9ZHNBP3aeA1x+VgUs6O5cZ4dOZifvDpmxrO/ X-Received: by 2002:a81:8282:: with SMTP id s124mr853658ywf.214.1644008339988; Fri, 04 Feb 2022 12:58:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008339; cv=none; d=google.com; s=arc-20160816; b=Bd2qKJn+LQ8bIiWZO8Pj2in5AuqqHxRML+wryJHA6/rwCpUu0V9fuMXpSlYeEtEa50 iehmqJRpSvgydeH/fbu9j2ECOn2LWYDw+Vid+UaQ/TETifipIacDDjyei6YENf7GUvhN x2cJ44bwlU0JSScPIefgblNNgmIChc+mCVmOsEQHNUvSMm3C8M4B9RaNuTDVF4Njzic1 RHxNcOxb+LAG6IT2wDAZjwPWqRmqs00IGHZ9s/dN+VWaOYmh4524NRrtUFfffV8cnW6L w2amtJO2TdDz5bulBGz5JyH0c9oAob6rxU4/iaQwjLkHjDmzOat3QsAw5ZNKukvzpd4C Y2Ug== 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=fVkkKUQPZonRdh16kBqKNrhk7t0iYwqgp7ZVrXtKCFU=; b=S8enJ4inpMgsiYEIx7fnxWSSdgabovClUblme0f/2GqJloirEbBQ54xwueqVY3yHDd 48CYoOooP6F/TVz2l8fWVPnlx2XO6iQGtAMxlpivUnrxTs9OJ6Lxwcp0HmN9DuR/KVYQ pXqKmACV5+hhSWxpeeVCflG0NUvUDTwUX6sXV8AhkSSuUG+oLJr3GZzidHNPVcah2FpF kQpEUwaGqYomF0k/Z+lv3VnFsFP2IECREx5iZDGUEiBDmnoawjvBhua1nOspkZGjRxLV N7nIDji2u5veNl/AOLmLj+0XTb2n1XYrkVy8v/LzgAlWaXa1J0EGJ0z6sys9N2OiljF1 NHig== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="b/rEPXmI"; 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 203si2406339ybs.404.2022.02.04.12.58.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:58:59 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="b/rEPXmI"; 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]:56510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5fX-0005ps-Fv for patch@linaro.org; Fri, 04 Feb 2022 15:58:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5W8-0008A2-A2 for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:17 -0500 Received: from [2a00:1450:4864:20::32d] (port=35463 helo=mail-wm1-x32d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5W6-00088m-69 for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:16 -0500 Received: by mail-wm1-x32d.google.com with SMTP id l123-20020a1c2581000000b0037b9d960079so1438806wml.0 for ; Fri, 04 Feb 2022 12:49:13 -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=fVkkKUQPZonRdh16kBqKNrhk7t0iYwqgp7ZVrXtKCFU=; b=b/rEPXmIYzAmCmiIOHuIKjj5q3S8JqqmikGQtuwwOAgnljCeTkRbgpYme9Eil/6fdL gdjRYyx9i4YS8oEtHLtXrUpOi1OvwAyrxDtJGyL6dHUaPv5owxFtMdC4fp3yZIlTD6zw UZgAMqUIKRPQ6YR/9kkhDtrbuMe7Ve0COueHMDlsUf+ZCX5JU6KdzitWhkvrKuS/wfoH DukB5DkBk+CAxkmi4/GawgmiOidJ6amPFW5L4rkDqxNYKnj1x4QzZOTXPl6VOLq4OpQ7 3jiHJMBcyiLqOxG1AJSWaWjyIND10yBysuBAqzc8LbPfxi8V3vvz+cbRqM1X64p1DdnV mnXQ== 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=fVkkKUQPZonRdh16kBqKNrhk7t0iYwqgp7ZVrXtKCFU=; b=kDjRsoKLufAB7TzNJQ2Ew/3psKKsM8EFL6rTUqsraafbMOe/pv5Lo5OXzrfpYQPdqJ jY2mXa5QJbXgDwoUKzxYQUtj3gofq3lT2w+6h5uR07S7yW0BH3qClDXfrMJ+izAnVxzs 3o+dZqGXwayi/JYGBsN+M15zOUPWNR8l96dOu8JwmaOBtr8ubLLMbhV/shvWjPC3stf2 NeOz/GHeVJj/ERZGSDHYOT+26LFQEBrZQ1pqh/OXK5XRfNx5ROjIE7hXKLzxMIPRKtFM zGvlDYvyIpAiFYNpxnLuHTOT82yjTObtv+6pspgcPDDXZj0zBThxVNczjvIFeepKqVp3 T4/Q== X-Gm-Message-State: AOAM531CQPgxNyDO6eFVYcbe+UAwTCJZFL3zy2xSoK2GjgdRYAq2LxX9 gLkhxa4KOdkxoy5799ejgvTXSA== X-Received: by 2002:a05:600c:3845:: with SMTP id s5mr3705893wmr.134.1644007752906; Fri, 04 Feb 2022 12:49:12 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r2sm4234523wrz.99.2022.02.04.12.49.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:49:10 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 929A11FFC7; Fri, 4 Feb 2022 20:43:36 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 15/26] tests: Update CentOS 8 container to CentOS Stream 8 Date: Fri, 4 Feb 2022 20:43:24 +0000 Message-Id: <20220204204335.1689602-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , aurelien@aurel32.net, Beraldo Leal 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 --- tests/docker/dockerfiles/centos8.docker | 4 ++-- tests/lcitool/refresh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 Fri Feb 4 20:43: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: 539896 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3576651imr; Fri, 4 Feb 2022 13:09:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJwM0c6aa1SxHCxeV+g9cDeiaHeW5Rexic81D+EwSU1Heu7d6gjtaGhsE69m7wcFXyYytyu9 X-Received: by 2002:a25:4dd5:: with SMTP id a204mr1123820ybb.222.1644008948734; Fri, 04 Feb 2022 13:09:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008948; cv=none; d=google.com; s=arc-20160816; b=pLiQ3zShlX1nBS8+qDydSf5/4cJHpFlqg97It6K7AsVJL2pjBynq9s0VYlqdfjueXg fvf0yHRefIP7mqArjUSy6RSX0WKBZupWLvgA56aFh2lo8Rq8GNBE3Tv0ZdheemiwoFNK BqaWAOnp2q5oByb5T8o4N4YxUSdrjq4eKl7uTC3ALWuA6hMBPPl9haXKVpJtWB3BdMOw OKDkuSqoJyTatNxdRPtIECDt2OQgH+zQz+LPmu9Nczujkqk5hZBQH7yuYyDg2CiHi67v woTRxBcWR7rrrh1+1dRKU1ypbi8nLnt2Raw4Ht3e9hM5bPDBgmXsAVM+FXuj1RCuUDsz p9HQ== 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=xDJAuZNRUYETqEl8Qe7mgcrxpi3O5M6kuT0AcxY8xgk=; b=OIXBm1WfnFPyl8JCLjvba4cMF/hJVVXF5FVCnRkeiQ2ssMxc/XCkA3esbKrlwoir4g XqkkK5FnUI7E36+5EGdK7atP3UNuu2NV03ESF2/Cf6SdfXHnXO43FLQLqorYI8tEPLVn vR6+tLCvDJUJOC07SaIDUlqGIHsiN0GsDvjMJorSz1RGrnOpqZq80q6qFRMGweNDyxs2 plmmfEO5SsH2LV8b9QPIM0xPpHjoSkIyb1RqHLCYNHyIu6E1+ppicRapoX4BMubrFFRm hdx07y3WQIK/xdSZBYN4LJkKo4YgeYsNiin48C9vlaPINst0kT/eEQ9mibA7N2aTJTsP 3wDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wgjo94IB; 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 k3si2252272ybo.154.2022.02.04.13.09.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 13:09:08 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wgjo94IB; 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]:46126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5pM-0001co-5w for patch@linaro.org; Fri, 04 Feb 2022 16:09:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5WY-0008Vt-0L for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:42 -0500 Received: from [2a00:1450:4864:20::429] (port=36776 helo=mail-wr1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5WM-00089o-BJ for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:40 -0500 Received: by mail-wr1-x429.google.com with SMTP id u15so13485241wrt.3 for ; Fri, 04 Feb 2022 12:49:20 -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=xDJAuZNRUYETqEl8Qe7mgcrxpi3O5M6kuT0AcxY8xgk=; b=wgjo94IBNevQk0+32gltuKEz+UYt3sqXatWewAIxuUhmlbPEQe/mfaiF4D2q4yQ/tV VHfzRma0pQ6y5hbxg21kHsz5PvxsXjor4Ui+iTExOzWAiyMQ5wGWvkySrNEwYNut+D5y i4xDQlSMlyOkeDgl5pGkIH8Ny9v+kR0XBV0HV8+QdwwKM0lqExvRAQgpXb458KigtxXn AlUcWCywxPPJCihn/fXa3QAynL6NErU5TALPNiH3Hp28BRQXmOf7xdcCInB1OdWPkQTU PJi5qlY/5EOXey2Uyq76rTLf4aOrJHvEfH8RJiKdyTc9CZFkdgoIx78UJmjMplDr+xAU sQJQ== 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=xDJAuZNRUYETqEl8Qe7mgcrxpi3O5M6kuT0AcxY8xgk=; b=w3ZOuWAKiARSh3BsdFtwaOAx0VGU+nJ7FuOaqeC0r6jeldBPnZwu6caz4v0c3LGPOC wbTHyOleUcLcHf/+bfl/LCkOzLFN6OzRwasWLbt10QzDl/Wg7/hnyUshFU+XHZ459bbA odK9DcJ7DKauGrw6ZD1eLnOnL0SdrdOuujW4XjFjcu15fSLkxzoS48/W7cXaxMLOvVpf Tse8lOk2ALBsn9s5ii0mmjaj81fq/fzXZr5qiQDHz9Uh2+HWOwCUTUn7LXWD9Arqzf38 D4IUH8LcHeNzwPnZ0XQwHp/XdpXUHl2q5lLhlw0oV71gNFNCpqnXSlMryaZTsJjy5LYg 9P2Q== X-Gm-Message-State: AOAM53150jdJQpOmX590y9JdXX2yAD5MsQl1sdFFlOWAtr7uox3psis4 /h4vvxCMuOym2L98PKpn2YNEUA== X-Received: by 2002:a5d:554b:: with SMTP id g11mr551578wrw.168.1644007759661; Fri, 04 Feb 2022 12:49:19 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i6sm2529984wry.33.2022.02.04.12.49.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:49:17 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AA04E1FFC8; Fri, 4 Feb 2022 20:43:36 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 16/26] tests/tcg/sh4: disable another unreliable test Date: Fri, 4 Feb 2022 20:43:25 +0000 Message-Id: <20220204204335.1689602-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::429 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, Yoshinori Sato , f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net, 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é --- tests/tcg/sh4/Makefile.target | 4 ++++ 1 file changed, 4 insertions(+) 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 Fri Feb 4 20:43: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: 539899 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3583102imr; Fri, 4 Feb 2022 13:18:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJzicHwkzQrdi1tvSxd6Cj/dM6mk3fKmg7+rWEvwxp+Sl5jM+NSAtSdxAlw7Ck/zuQgOuZHf X-Received: by 2002:a0d:fb06:: with SMTP id l6mr960822ywf.44.1644009531683; Fri, 04 Feb 2022 13:18:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644009531; cv=none; d=google.com; s=arc-20160816; b=GJy8IxsiMFJG99mLObgowNr/XFaHBlIdIerdaFpIFCiSDtIca0jw+0D0CR8RFIlyuK /dk0J8lxA3KhB3COz3LXq4I4FHV+HbM2zXrZV1P5MEJ1KliVgM78vPkCApjptf25SlJ3 78UGptjHUnL9ie7J2LnCntLzRU+C/odinfww491jI7ePiBWVk5ZdZwFXh4LfQ6vXzwjA I4l513l6QX9NQwmIbBCY1n+dD0HCm1ReeTuSy58SCUqNJfMEPmkwMZdcRj+XxCqIGqJv BXfzvj2Fjq+v6QllBvxEeQZSReeY2hfP3pESiy8BAZMMsF8VNSgw0NZmiuBN6iSLkSEc HwPQ== 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=RF5y4dzhS8bG68f7NLy4ZRBD5ccx4mYs0zSlmwkW1WI=; b=rwZz5OEZQym+2K93qdPO8hDZDMvm5zmGnd0YJ+E+Fkon+E7YEG5SogdCSEio5U2wDq ailOVKxmCPoK0V9PrP1Zg8Fq/VjSmPAgMgRKncZ7yPmy+97hBkwhmdZ+/mbtnB78Faqb I2W9WfyxkaVq6HXBjw+SQhmKx7hcByg4UBYGUasEFWVp2AdnVMLz2w0h6nR0odTSkkPC 2Zj8UMm4pszGSc5THhHKbsw0EsOemkUsF568LQPMoVCKGIsdyAl37b42u7Zdt0LGhB0O G/tJ1s7dXHk/PFxGqtnCl5rU76k5/fF6Y/yEtAkV2cuWIqrglsaJQ+snP0HCua2i5iL4 mWlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZcPU6nkR; 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 u197si2496682ywu.36.2022.02.04.13.18.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 13:18: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=ZcPU6nkR; 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]:60418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5yl-00030m-3i for patch@linaro.org; Fri, 04 Feb 2022 16:18:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5Wc-0000Ah-53 for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:46 -0500 Received: from [2a00:1450:4864:20::332] (port=38580 helo=mail-wm1-x332.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5WM-0008A0-CQ for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:45 -0500 Received: by mail-wm1-x332.google.com with SMTP id o30-20020a05600c511e00b0034f4c3186f4so10202839wms.3 for ; Fri, 04 Feb 2022 12:49:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RF5y4dzhS8bG68f7NLy4ZRBD5ccx4mYs0zSlmwkW1WI=; b=ZcPU6nkRILyMXl/MEFbqzJw9PVRYUGoCq0W8XF8Yq4FxOH5WlKqsIGhqwXXraGgi1I Eu9ZokwiB0MM0OIsRYOtQCerM9vg2DroCz14rKLFmJzK/rgPwYSCM5NDgHGHxgI5Iw09 bk+Xw4K3Gx7d0N4qaiKAb4lNbyPXah4QGrEmWqIOSk0P05H9II+FefMQaHKb1bGpe5k1 n0aGImS9S0BYK8YKSBTiMGNhy1qesWQOD4pFGCUFmm08X6CB79Yg2aY/I5EFMR4j+ozF VLWYU72r032EZfHBYrpfCAFnPUU/pSmbJjA15d5R2mi8UJoOcO4+eZ+JYQPcV6OOTHhS sjAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RF5y4dzhS8bG68f7NLy4ZRBD5ccx4mYs0zSlmwkW1WI=; b=sHr+x4Fq4a8NY5TpXOWnfEY2INLWenPEuvqF9ro06rbJheJMdiqjQrlgOrAORFhpfO BYNmaiTGAL2Zhk0ODgYVIiNpel7eOg/6IxQk6d6hBfI6afwaQ1cXtO72BtQWYripTpGR oyByj2yrBwDhBTAUAFr8Jq62OZrohIgir82x3kmzumpFAGdAavzYqkxC7kDFcoe31tjW ru56y5JS0dg4zJ3dTcv9PCxlSBlhqz69wQoGJUGlgtvhbrOm0Ym6WOqLUabw7u0xYGes jEGqnwLCAeZKNc3YCQgc0ziw/2iHgrRTvFyhY6FCDmQcwnLhQsRoByHYwiV5NGE1bPHP 97/Q== X-Gm-Message-State: AOAM532H870iIPOx3z8ZmsNgbOndENxDIro6F0kMHWeB2asX/fkIEmh3 MqrVCcYtfKnbVpuEZzlgzzq3/g== X-Received: by 2002:a05:600c:8a9:: with SMTP id l41mr423230wmp.51.1644007762235; Fri, 04 Feb 2022 12:49:22 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j13sm2944100wrw.116.2022.02.04.12.49.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:49:17 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B86911FFC9; Fri, 4 Feb 2022 20:43:36 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 17/26] docs: remove references to TCG tracing Date: Fri, 4 Feb 2022 20:43:26 +0000 Message-Id: <20220204204335.1689602-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::332 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, Luis Vilanova , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net 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: <20220124201608.604599-14-alex.bennee@linaro.org> --- docs/about/removed-features.rst | 13 +++++ docs/devel/tracing.rst | 85 --------------------------------- 2 files changed, 13 insertions(+), 85 deletions(-) diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 4c4da20d0f..b0156e0f25 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -601,6 +601,19 @@ the upstream Linux kernel in 2018, and it has also 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 Fri Feb 4 20:43: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: 539891 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3573066imr; Fri, 4 Feb 2022 13:04:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJxP/rS2GyytTx77t514vtaFj2vR3z2/UPyrUbMV6qFsUloaHBHLK4UjOgjwPRmT+RPsUe3I X-Received: by 2002:a25:34c:: with SMTP id 73mr990089ybd.273.1644008650452; Fri, 04 Feb 2022 13:04:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008650; cv=none; d=google.com; s=arc-20160816; b=KLRSEARZ81Q5NmFywg5p4IxqWqZ9TX0br9nCnmZaBvTb06uyX8K/7RRenVoiA7UzOL RGv/PaqxmdCEbirv1UX2TuiT1V2HFmDaam7XjGkF55Nc8qJw6Nc1z2S/WBj7mSHTKzPh /II/Q9SYDV2VIimFOCQYXGM10PhfEeQ/dzpAgdBX+5PYziX9aIQIwsFWQbY8q3zKwE6O NllBqAmBoAtgOwhI2W9gcFpzdS/MPeOJxNJli07gdYfDBMJEA9N7JWp1cXUMsY4ni86K tRVbM4FOQZNwRhPKAh2Rpg9/pHDR9ys2cVeasH4HxA4rYvnotOBHFbNOOI5eBjIIKnhD 1iYA== 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=DphqbH55YzzN5SuaeiMXPaR3/VcRoSU7R9L31deysC0=; b=X3V4dkwZ3kTHxT/lwotifKrmVxAjvsMKxEMNyk/eYfso7GxzPwa5dEp4XxwO2f9Uhc YtgLlYxj0T7X26MskRxxaaS4LaCzp+tP+nGXKO2KPSKd3hu++DKF9wCEFlMTpfRpMCG0 X57+YVrhqWtJQUefE4KOLOk1XZsbjd7hiha2Y+8hSJ6AJjVOy2LBTZbsCAW0Xxd9zw0r sz8YmRNyUgD9nKwP/zipyhEh8YAveIUoYCWXsC934MS6RUmD192Imkqrfuf7ECacSJ3m m2Mjkxvu6VJqX6EG3ouhoifz9U7ACbtlIkESaREnOm8l7ynUqKcR8BT2KKSOtw0WU/qt AW6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Wy980dK8; 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 c15si953005ywa.328.2022.02.04.13.04.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 13:04: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=Wy980dK8; 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]:35228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5kX-0002W8-S2 for patch@linaro.org; Fri, 04 Feb 2022 16:04:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5WZ-00005x-4m for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:43 -0500 Received: from [2a00:1450:4864:20::42b] (port=42758 helo=mail-wr1-x42b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5WO-0008AE-71 for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:42 -0500 Received: by mail-wr1-x42b.google.com with SMTP id h6so431014wrb.9 for ; Fri, 04 Feb 2022 12:49:25 -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=DphqbH55YzzN5SuaeiMXPaR3/VcRoSU7R9L31deysC0=; b=Wy980dK8to6lhhj0nUi9TSHp8l8FqONvAOfJOSeEz49HYeLsELtH1/81n47ungtGFT PsV0GJs7lITsbl6AtQGQS7qSTy/da91NISHWKjILFu56nrZ5o8ROYpBjnmLx2KDeZR8A dmme/bP0OHL+PZi2jYyxa/TUqpDBhcpKTA+/PNQsh3QBXA5rFJvdyWXmBlA1AjshI9xK 6L+e6xut0E3g9wZUF6FOW/8jghZ+bJ4L9zQGwJZkkLzff2tVBahi5EIP+y6+RTtDIPlX Y3HLsJL9BK76cIZyE0ytsjtMgpR+SIP6SitTcLzK7JvPjhE7CLiZLHqavOUrT2a6CU1/ mS2w== 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=DphqbH55YzzN5SuaeiMXPaR3/VcRoSU7R9L31deysC0=; b=lDXK8W4I3TFAQFsNqeRftOWQXYTtVcNJVvIT7oWZUqa0EPafAEFLVzyyUYDZU6yWRU N+bjoVbN+vE86jHc75ANWjW2GmzcHd0LaVFhMdJjH+A7aQ2mLHitAwfZ3zCk3lKUGm7J PHXKhm6y+ZYjlsLmlE2gzREqd69H17PcFa1qxklVeukUb3Ys0K/xumN7/LVnhjdQgyvB ooLeREycPw48GD6XPvl6I5Hj+d8xZkKidVRppZDD7ww6iui7+2YhkSlWAbklF81ql3qL 8fti7WMC7qkB3SSdWlUsMc60aJ+CuclVxtfg+GZ9lQpEVKnq++UvrKemrF7IcOX0+3J8 V2Zg== X-Gm-Message-State: AOAM531/RsZYUle6kYgWiUdk1iS8tZCI2OhY9F5IDTfekaErV6n0UpVC NCwfYJWLZcxJm+G5hDGqtG3SWg== X-Received: by 2002:adf:d239:: with SMTP id k25mr546488wrh.699.1644007764930; Fri, 04 Feb 2022 12:49:24 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 11sm10791506wmx.5.2022.02.04.12.49.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:49:17 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DC51C1FFB7; Fri, 4 Feb 2022 20:43:36 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 18/26] tracing: remove TCG memory access tracing Date: Fri, 4 Feb 2022 20:43:27 +0000 Message-Id: <20220204204335.1689602-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, Riku Voipio , f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, Luis Vilanova , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net 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é Message-Id: <20220124201608.604599-15-alex.bennee@linaro.org> Cc: Luis Vilanova Cc: Stefan Hajnoczi --- accel/tcg/atomic_template.h | 12 ------------ accel/tcg/cputlb.c | 2 -- accel/tcg/user-exec.c | 14 -------------- tcg/tcg-op.c | 5 ----- accel/tcg/atomic_common.c.inc | 20 -------------------- trace-events | 14 -------------- 6 files changed, 67 deletions(-) diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h index 2d917b6b1f..fc165031e8 100644 --- a/accel/tcg/atomic_template.h +++ b/accel/tcg/atomic_template.h @@ -77,7 +77,6 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, target_ulong addr, PAGE_READ | PAGE_WRITE, retaddr); DATA_TYPE ret; - atomic_trace_rmw_pre(env, addr, oi); #if DATA_SIZE == 16 ret = atomic16_cmpxchg(haddr, cmpv, newv); #else @@ -97,7 +96,6 @@ ABI_TYPE ATOMIC_NAME(ld)(CPUArchState *env, target_ulong addr, PAGE_READ, retaddr); DATA_TYPE val; - atomic_trace_ld_pre(env, addr, oi); val = atomic16_read(haddr); ATOMIC_MMU_CLEANUP; atomic_trace_ld_post(env, addr, oi); @@ -110,7 +108,6 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong addr, ABI_TYPE val, DATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, PAGE_WRITE, retaddr); - atomic_trace_st_pre(env, addr, oi); atomic16_set(haddr, val); ATOMIC_MMU_CLEANUP; atomic_trace_st_post(env, addr, oi); @@ -124,7 +121,6 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, target_ulong addr, ABI_TYPE val, PAGE_READ | PAGE_WRITE, retaddr); DATA_TYPE ret; - atomic_trace_rmw_pre(env, addr, oi); ret = qatomic_xchg__nocheck(haddr, val); ATOMIC_MMU_CLEANUP; atomic_trace_rmw_post(env, addr, oi); @@ -138,7 +134,6 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong addr, \ DATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr); \ DATA_TYPE ret; \ - atomic_trace_rmw_pre(env, addr, oi); \ ret = qatomic_##X(haddr, val); \ ATOMIC_MMU_CLEANUP; \ atomic_trace_rmw_post(env, addr, oi); \ @@ -171,7 +166,6 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong addr, \ XDATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr); \ XDATA_TYPE cmp, old, new, val = xval; \ - atomic_trace_rmw_pre(env, addr, oi); \ smp_mb(); \ cmp = qatomic_read__nocheck(haddr); \ do { \ @@ -216,7 +210,6 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, target_ulong addr, PAGE_READ | PAGE_WRITE, retaddr); DATA_TYPE ret; - atomic_trace_rmw_pre(env, addr, oi); #if DATA_SIZE == 16 ret = atomic16_cmpxchg(haddr, BSWAP(cmpv), BSWAP(newv)); #else @@ -236,7 +229,6 @@ ABI_TYPE ATOMIC_NAME(ld)(CPUArchState *env, target_ulong addr, PAGE_READ, retaddr); DATA_TYPE val; - atomic_trace_ld_pre(env, addr, oi); val = atomic16_read(haddr); ATOMIC_MMU_CLEANUP; atomic_trace_ld_post(env, addr, oi); @@ -249,7 +241,6 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong addr, ABI_TYPE val, DATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, PAGE_WRITE, retaddr); - atomic_trace_st_pre(env, addr, oi); val = BSWAP(val); atomic16_set(haddr, val); ATOMIC_MMU_CLEANUP; @@ -264,7 +255,6 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, target_ulong addr, ABI_TYPE val, PAGE_READ | PAGE_WRITE, retaddr); ABI_TYPE ret; - atomic_trace_rmw_pre(env, addr, oi); ret = qatomic_xchg__nocheck(haddr, BSWAP(val)); ATOMIC_MMU_CLEANUP; atomic_trace_rmw_post(env, addr, oi); @@ -278,7 +268,6 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong addr, \ DATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr); \ DATA_TYPE ret; \ - atomic_trace_rmw_pre(env, addr, oi); \ ret = qatomic_##X(haddr, BSWAP(val)); \ ATOMIC_MMU_CLEANUP; \ atomic_trace_rmw_post(env, addr, oi); \ @@ -308,7 +297,6 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong addr, \ XDATA_TYPE *haddr = atomic_mmu_lookup(env, addr, oi, DATA_SIZE, \ PAGE_READ | PAGE_WRITE, retaddr); \ XDATA_TYPE ldo, ldn, old, new, val = xval; \ - atomic_trace_rmw_pre(env, addr, oi); \ smp_mb(); \ ldn = qatomic_read__nocheck(haddr); \ do { \ diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 5e0d0eebc3..82adefe574 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -2140,7 +2140,6 @@ static inline uint64_t cpu_load_helper(CPUArchState *env, abi_ptr addr, { uint64_t ret; - trace_guest_ld_before_exec(env_cpu(env), addr, oi); ret = full_load(env, addr, oi, retaddr); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R); return ret; @@ -2487,7 +2486,6 @@ static inline void cpu_store_helper(CPUArchState *env, target_ulong addr, uint64_t val, MemOpIdx oi, uintptr_t ra, FullStoreHelper *full_store) { - trace_guest_st_before_exec(env_cpu(env), addr, oi); full_store(env, addr, val, oi, ra); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_W); } diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 6f5d4933f0..8edf0bbaa1 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -250,7 +250,6 @@ uint8_t cpu_ldb_mmu(CPUArchState *env, abi_ptr addr, uint8_t ret; validate_memop(oi, MO_UB); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldub_p(haddr); clear_helper_retaddr(); @@ -265,7 +264,6 @@ uint16_t cpu_ldw_be_mmu(CPUArchState *env, abi_ptr addr, uint16_t ret; validate_memop(oi, MO_BEUW); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = lduw_be_p(haddr); clear_helper_retaddr(); @@ -280,7 +278,6 @@ uint32_t cpu_ldl_be_mmu(CPUArchState *env, abi_ptr addr, uint32_t ret; validate_memop(oi, MO_BEUL); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldl_be_p(haddr); clear_helper_retaddr(); @@ -295,7 +292,6 @@ uint64_t cpu_ldq_be_mmu(CPUArchState *env, abi_ptr addr, uint64_t ret; validate_memop(oi, MO_BEUQ); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldq_be_p(haddr); clear_helper_retaddr(); @@ -310,7 +306,6 @@ uint16_t cpu_ldw_le_mmu(CPUArchState *env, abi_ptr addr, uint16_t ret; validate_memop(oi, MO_LEUW); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = lduw_le_p(haddr); clear_helper_retaddr(); @@ -325,7 +320,6 @@ uint32_t cpu_ldl_le_mmu(CPUArchState *env, abi_ptr addr, uint32_t ret; validate_memop(oi, MO_LEUL); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldl_le_p(haddr); clear_helper_retaddr(); @@ -340,7 +334,6 @@ uint64_t cpu_ldq_le_mmu(CPUArchState *env, abi_ptr addr, uint64_t ret; validate_memop(oi, MO_LEUQ); - trace_guest_ld_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); ret = ldq_le_p(haddr); clear_helper_retaddr(); @@ -354,7 +347,6 @@ void cpu_stb_mmu(CPUArchState *env, abi_ptr addr, uint8_t val, void *haddr; validate_memop(oi, MO_UB); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stb_p(haddr, val); clear_helper_retaddr(); @@ -367,7 +359,6 @@ void cpu_stw_be_mmu(CPUArchState *env, abi_ptr addr, uint16_t val, void *haddr; validate_memop(oi, MO_BEUW); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stw_be_p(haddr, val); clear_helper_retaddr(); @@ -380,7 +371,6 @@ void cpu_stl_be_mmu(CPUArchState *env, abi_ptr addr, uint32_t val, void *haddr; validate_memop(oi, MO_BEUL); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stl_be_p(haddr, val); clear_helper_retaddr(); @@ -393,7 +383,6 @@ void cpu_stq_be_mmu(CPUArchState *env, abi_ptr addr, uint64_t val, void *haddr; validate_memop(oi, MO_BEUQ); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stq_be_p(haddr, val); clear_helper_retaddr(); @@ -406,7 +395,6 @@ void cpu_stw_le_mmu(CPUArchState *env, abi_ptr addr, uint16_t val, void *haddr; validate_memop(oi, MO_LEUW); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stw_le_p(haddr, val); clear_helper_retaddr(); @@ -419,7 +407,6 @@ void cpu_stl_le_mmu(CPUArchState *env, abi_ptr addr, uint32_t val, void *haddr; validate_memop(oi, MO_LEUL); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stl_le_p(haddr, val); clear_helper_retaddr(); @@ -432,7 +419,6 @@ void cpu_stq_le_mmu(CPUArchState *env, abi_ptr addr, uint64_t val, void *haddr; validate_memop(oi, MO_LEUQ); - trace_guest_st_before_exec(env_cpu(env), addr, oi); haddr = cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_STORE); stq_le_p(haddr, val); clear_helper_retaddr(); diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 61b492d89f..65e1c94c2d 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -27,7 +27,6 @@ #include "tcg/tcg.h" #include "tcg/tcg-op.h" #include "tcg/tcg-mo.h" -#include "trace-tcg.h" #include "exec/plugin-gen.h" /* Reduce the number of ifdefs below. This assumes that all uses of @@ -2877,7 +2876,6 @@ void tcg_gen_qemu_ld_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); memop = tcg_canonicalize_memop(memop, 0, 0); oi = make_memop_idx(memop, idx); - trace_guest_ld_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); orig_memop = memop; if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { @@ -2916,7 +2914,6 @@ void tcg_gen_qemu_st_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); memop = tcg_canonicalize_memop(memop, 0, 1); oi = make_memop_idx(memop, idx); - trace_guest_st_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { swap = tcg_temp_new_i32(); @@ -2965,7 +2962,6 @@ void tcg_gen_qemu_ld_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); memop = tcg_canonicalize_memop(memop, 1, 0); oi = make_memop_idx(memop, idx); - trace_guest_ld_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); orig_memop = memop; if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { @@ -3013,7 +3009,6 @@ void tcg_gen_qemu_st_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop) tcg_gen_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); memop = tcg_canonicalize_memop(memop, 1, 1); oi = make_memop_idx(memop, idx); - trace_guest_st_before_tcg(tcg_ctx->cpu, cpu_env, addr, oi); if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { swap = tcg_temp_new_i64(); diff --git a/accel/tcg/atomic_common.c.inc b/accel/tcg/atomic_common.c.inc index 1df1f243e9..6602d7689f 100644 --- a/accel/tcg/atomic_common.c.inc +++ b/accel/tcg/atomic_common.c.inc @@ -13,14 +13,6 @@ * See the COPYING file in the top-level directory. */ -static void atomic_trace_rmw_pre(CPUArchState *env, target_ulong addr, - MemOpIdx oi) -{ - CPUState *cpu = env_cpu(env); - - trace_guest_rmw_before_exec(cpu, addr, oi); -} - static void atomic_trace_rmw_post(CPUArchState *env, target_ulong addr, MemOpIdx oi) { @@ -28,24 +20,12 @@ static void atomic_trace_rmw_post(CPUArchState *env, target_ulong addr, } #if HAVE_ATOMIC128 -static void atomic_trace_ld_pre(CPUArchState *env, target_ulong addr, - MemOpIdx oi) -{ - trace_guest_ld_before_exec(env_cpu(env), addr, oi); -} - static void atomic_trace_ld_post(CPUArchState *env, target_ulong addr, MemOpIdx oi) { qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R); } -static void atomic_trace_st_pre(CPUArchState *env, target_ulong addr, - MemOpIdx oi) -{ - trace_guest_st_before_exec(env_cpu(env), addr, oi); -} - static void atomic_trace_st_post(CPUArchState *env, target_ulong addr, MemOpIdx oi) { diff --git a/trace-events b/trace-events index a637a61eba..bc71006675 100644 --- a/trace-events +++ b/trace-events @@ -117,20 +117,6 @@ vcpu guest_cpu_exit(void) # Targets: all vcpu guest_cpu_reset(void) -# tcg/tcg-op.c - -# @vaddr: Access' virtual address. -# @memopidx: Access' information (see below). -# -# Start virtual memory access (before any potential access violation). -# Does not include memory accesses performed by devices. -# -# Mode: user, softmmu -# Targets: TCG(all) -vcpu tcg guest_ld_before(TCGv vaddr, uint32_t memopidx) "info=%d", "vaddr=0x%016"PRIx64" memopidx=0x%x" -vcpu tcg guest_st_before(TCGv vaddr, uint32_t memopidx) "info=%d", "vaddr=0x%016"PRIx64" memopidx=0x%x" -vcpu tcg guest_rmw_before(TCGv vaddr, uint32_t memopidx) "info=%d", "vaddr=0x%016"PRIx64" memopidx=0x%x" - # include/user/syscall-trace.h # @num: System call number. From patchwork Fri Feb 4 20:43:28 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: 539898 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3579719imr; Fri, 4 Feb 2022 13:13:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJz8Mx9KRA6VRPjy6YmZEMk+IqCT03Y829OHYSS9mKzeax/V8zUF3+mqfUjnbx/aoHLyn5ut X-Received: by 2002:a81:387:: with SMTP id 129mr923359ywd.252.1644009210183; Fri, 04 Feb 2022 13:13:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644009210; cv=none; d=google.com; s=arc-20160816; b=SAul339XYNpjWnbEWQNrVMy/7cdHNJ6dr87nHTDsPFaWZU3E1TWKV8Te21eh6jRTwZ TJ1aK4WQgf4NDFfaJrdu46VnrTFqZvKTQqGEPM1NxEP36WQhfwTd6s4rgZlCKPAY7n5F RxnQTdOXwlF1CcYxCiSzoNCgh8MNBBVDlhpVur81EW5UBjLY5zu75p6Zo/hmQ/u2livN 9i52XyY+x6pY3d5PH0qTWKfJaz2XCb+mhzs9AdMMLSWnuKAtlIjYi6bSlQo2d8f6WKBX 6PJ2zbSVRDH0QFFS0Ok3ydnEm/KO+ErDKwjqqqK5TCTRnmsH6vIjkHnXPNd8LzG7AsaP 7bsw== 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=DJc74+RWn+7GCLpeFVdjhEK4yszN3h2ZPbtHnLLnDyQ=; b=M0HiEi0lQ9vvdpSPYxMpfvdciRG8mA8CVcyC9BixbfoJOrq9tFdMPKTYIxULktSVdp jiTH6jOwFcpW6LmwAFSaCEaA3yHl0sWKIv63KVDhmEQcjr0am3t3uGifPSQGg5cKsTCc hvTC1r6IJdscYpIqrfOFbkb5KSf9pXGkLodPPv0uaIx8rfqDBmty9QE7ezj0SqPePmTW kWnNaqgJoHdgxIm1wH/Cr6nNZ9neCL91PebWmBOExnQwFHZz+3G1TgoyvVxJLUNZI752 SWty3ZPh+2DAFYMxzanZr3YHJrBrLMg327XwzNr4pWDf5wCgCvSVJIwC0V9e8JCxClxd Kx4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nNQO+N1m; 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 d189si2213270ybd.456.2022.02.04.13.13.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 13:13:30 -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=nNQO+N1m; 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]:53808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5tY-0006rq-NI for patch@linaro.org; Fri, 04 Feb 2022 16:13:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5WX-0008Vp-VW for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:42 -0500 Received: from [2a00:1450:4864:20::430] (port=46781 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5WH-00089i-9B for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:40 -0500 Received: by mail-wr1-x430.google.com with SMTP id q19so1033654wrc.13 for ; Fri, 04 Feb 2022 12:49:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DJc74+RWn+7GCLpeFVdjhEK4yszN3h2ZPbtHnLLnDyQ=; b=nNQO+N1mmT879NpVswxfwQqVop5KiZOwVemk9eov7KsWoXZMefYFGa4LhKPqvPaGMN KwlyIfShqA8T4fikCJzt0ikAkvMR+VT+cLlVq2oQqelXYw0icc0ypR29chI8OdhjKf0v TUFoE/wHfcGxbKpQfNmcrCEzjdcw7o7cnI2Ot7fXk+9O28PMsuL8HNNQAIggHYZSa2pa +Rp4f/CgQyaPCKD4RF4i0ZmWGk5nqvNLLfVmdjpE89hO3pFsIKFMGc37SEzrYmlF5qKZ KFUVk4fUjMtlagJDWJnWD9DadeodB/rSfdqRewa0Ri2YD8NhFl2arQRBwsagqMJ2AXbg EyZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DJc74+RWn+7GCLpeFVdjhEK4yszN3h2ZPbtHnLLnDyQ=; b=mNOmT+1ZuTo2DB9dZUUwxuXY3KIR9XhtG2tZDPgMLeSKg3cx8FRDDex43ZJ5eqnt9p /cvy5VSdo8xlTgeMHh3ElGQ4vz9h4VzQ8861txTNulBx2UiFUcp7lGUcBc+1GHMlKJKi OqFXZR9DuYWMxruzCPFquIIIwgPDBO+Jgy+Sp2kJk5twdO8+u23C9iyClAcpTn0+rdmN plN4FLFC+5xFhq+KtA4MfLFZ0iX9IyhnJjzQRPKskKXbcSB1HOkCQrLAskGEo+h/QYco njuHmhwTJkbyYaBx6yzUfctGQdnFbDwuzz/sqUeOWaeaxDKCrU8QrrmCQoOz61DNhIQ7 Rn2A== X-Gm-Message-State: AOAM532v5spRQRqBpda0X633EioIxkE+juhUSu4B1rd0+JF3UlSN9lSO oBqW4p7hIpCtSlEyIlZVPVIwNA== X-Received: by 2002:adf:fb0f:: with SMTP id c15mr587693wrr.42.1644007758720; Fri, 04 Feb 2022 12:49:18 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t3sm858463wrv.103.2022.02.04.12.49.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:49:17 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 05CC31FFCA; Fri, 4 Feb 2022 20:43:37 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 19/26] tracing: remove the trace-tcg includes from the build Date: Fri, 4 Feb 2022 20:43:28 +0000 Message-Id: <20220204204335.1689602-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::430 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, Luis Vilanova , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net 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: <20220124201608.604599-16-alex.bennee@linaro.org> --- include/exec/helper-proto.h | 1 - include/exec/helper-tcg.h | 1 - include/trace-tcg.h | 6 ------ trace/meson.build | 1 - 4 files changed, 9 deletions(-) delete mode 100644 include/trace-tcg.h diff --git a/include/exec/helper-proto.h b/include/exec/helper-proto.h index ba100793a7..c4b1bda632 100644 --- a/include/exec/helper-proto.h +++ b/include/exec/helper-proto.h @@ -38,7 +38,6 @@ dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), 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 Fri Feb 4 20:43: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: 539897 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3579253imr; Fri, 4 Feb 2022 13:12:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJyMCEpD/yb7CwYAP381ECGg7uPU58EnOisYTynjZi7nJ+YMmscWrplWFWQzrOWOWeiy9E5j X-Received: by 2002:a81:e55:: with SMTP id 82mr824854ywo.393.1644009165960; Fri, 04 Feb 2022 13:12:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644009165; cv=none; d=google.com; s=arc-20160816; b=sR52OGsrSsbcsrHCaTtQ/cJ5RyCAXBM59AzRw7Tg+i0UfP5/a0Yzisff8DQdYwhsFx BVcHCV+OW7o2BEZfkHFMdmvR1ZgcfXpDynKNLpHps8IwE6BXtt9MqI2Ubb0XXXrw8xjT LclA7jwBiGNaJB/cnXj/AP43jNjoeVSUCUO9dP3djKUEpFhBXBIy/GpohjC0VkNQpB1l UH5iBHM/dWuNuqv7TTbLNKLyBKuthM4+ohp7cuDtRgUsTvyVsLsWsplxkBlMCUBqrPO/ ng4PH+DaOe6TDKiXXgu8tjDBBTlU/OOPVePLJ4mLCgSAwU70WSs1/JX+EQV9u9ZqlfJz brlQ== 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=8/rWurmul+sbv2Gj26JHhst6/kFendjAqbxz9LYeY1U=; b=DIOM66h+ndGYGYfmRqZxNJtH6jGXv9DC2ZyYTzStHcUiK9pgsfKMjFh2zi1r7giaCd 0xJ6NYDWSFnCwnO2s6ygAcb2q6JJhDGtiQ1d1PCFkTxAKJm642JrxsJ5ckghNxUTTULl 7wXGBEqPLLr1fp36MAeFBUDOvBc4rStGW386GGnPxCgXSlOyH6t/S0GDoNkpbcjYhlvT 36q+sMtJ/mE+o5sbPCCyLRvC4ZviCwekcf4/5lAKLj1se4sm/zQ+K1SKtipXSqxoSaRe B+uhb+yesMOvIEzvR4u33Vh/FqGaJC/HsBVNN1+tJExz3affwul9itDJFjtyg/DZJW5m Jn1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="OHi/BahQ"; 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 f84si2100572yba.697.2022.02.04.13.12.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 13:12:45 -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="OHi/BahQ"; 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]:52016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5sr-0005g6-Cn for patch@linaro.org; Fri, 04 Feb 2022 16:12:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5WN-0008J8-LX for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:32 -0500 Received: from [2a00:1450:4864:20::42f] (port=34603 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 1nG5WA-00089F-Ga for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:21 -0500 Received: by mail-wr1-x42f.google.com with SMTP id f17so13491478wrx.1 for ; Fri, 04 Feb 2022 12:49:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8/rWurmul+sbv2Gj26JHhst6/kFendjAqbxz9LYeY1U=; b=OHi/BahQ0zXJI80Y3eAZNvTsXtmQFitckKf/WJZJs7a7Twg/M3gpmXUd2GX2rXcVpY bno7MRtZ+FV+BVnQjBdni2is0Omzese/JiJSjmqmt9Eeza5W4L2EkaTfr1NKhRREvCMZ zknMwhoP8YMmxX8kdqsDOh9b6mUtk4YrNEWnvdEL/7Ca9lQAKQ0wv/2SDSDRkzG9qXQV LGTgJZhyoaxWz44unkAEbcVt8YyBrv268sQDbpkKSn1OqlQ4KLJuz+PFYlGqoH+b6xgR ZWvFdklTbrOtSj7Z+DBsQM8dKs5KBFFous6Oj116MzheZmxvIbEi9KkEtzYiKHBUDs7p wkKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8/rWurmul+sbv2Gj26JHhst6/kFendjAqbxz9LYeY1U=; b=ahg87C6znqNH+lVvh2cjLa/2TaZTmGoengs4IVct7hchVDDimJtW1iIgf7t6BBtpnX C6qcOfIbLRviW5ItKsF6bVxTZKgWyTZMWAevqsWjgKr+kO9y377DyZWtpYCxRnKx8LQe eUzAKAVMmgQ5h7XwHayEZFiVO3HFJ1FClPUjd1Z31DnfKlz4mj8V2yhRc0lJoP9+woAs sjheB3cj2zliICa/vahUWtCAQhRoDxdLZzqmn1r2JNGaOTXjK9be1YHPwR+n8PTrc/10 9Iuq/eA+OFkBjfY9N+BFCjlOr9vW8B1Lg4mJHw/CXSaW4fftUYjaRvtqm4M2ZGiUtlA4 uWbw== X-Gm-Message-State: AOAM533I+AJjfuCW26B+82HfVCh6GuDxd8JCsrUS3usvt4zWsjuswfCX LHb12g/P5VS+Jzg6dYsQZUYUDg== X-Received: by 2002:a5d:518c:: with SMTP id k12mr530073wrv.169.1644007757077; Fri, 04 Feb 2022 12:49:17 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o12sm3403319wry.115.2022.02.04.12.49.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:49:10 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1F8F01FFCB; Fri, 4 Feb 2022 20:43:37 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 20/26] tracing: excise the tcg related from tracetool Date: Fri, 4 Feb 2022 20:43:29 +0000 Message-Id: <20220204204335.1689602-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-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: fam@euphon.net, berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, Luis Vilanova , mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net 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: <20220124201608.604599-17-alex.bennee@linaro.org> --- meson.build | 4 - include/exec/helper-gen.h | 2 - scripts/tracetool/__init__.py | 41 +-------- scripts/tracetool/format/tcg_h.py | 83 ------------------- scripts/tracetool/format/tcg_helper_c.py | 79 ------------------ scripts/tracetool/format/tcg_helper_h.py | 48 ----------- .../tracetool/format/tcg_helper_wrapper_h.py | 70 ---------------- scripts/tracetool/vcpu.py | 14 +--- trace/meson.build | 13 --- 9 files changed, 4 insertions(+), 350 deletions(-) delete mode 100644 scripts/tracetool/format/tcg_h.py delete mode 100644 scripts/tracetool/format/tcg_helper_c.py delete mode 100644 scripts/tracetool/format/tcg_helper_h.py delete mode 100644 scripts/tracetool/format/tcg_helper_wrapper_h.py diff --git a/meson.build b/meson.build index 82db1e7e74..ae5f7eec6e 100644 --- a/meson.build +++ b/meson.build @@ -2357,19 +2357,15 @@ tracetool_depends = 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 Fri Feb 4 20:43:30 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: 539892 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3573371imr; Fri, 4 Feb 2022 13:04:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvdK0PzpJsdrpg/fqGzwxS4bVN8m/CtlYi+fsLIuOMza/4kFvo9EPI8wkii/lmfKKaTHVE X-Received: by 2002:a25:2681:: with SMTP id m123mr623256ybm.290.1644008675864; Fri, 04 Feb 2022 13:04:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008675; cv=none; d=google.com; s=arc-20160816; b=iHp2k90uq5lG1IrBUsjSMFmJyn1LAsj8+Y4HKXQWakHGsEqWu6m3G7Okeq1X5Q9F8t C/EtRXxBbNdA+RqL61CksBHmD+L8RSEo8TR+GePG6UH9uT0bwrcWrUxAqVmYwCrweFyG 8CetMI+7W8Z09q17EGYURmeZJe8OxBn7yxZc7OA5kCzCTvnYGfo7o9VnygbO6VqKpD1j uU9zHRo8z6S6/p8rhh/Y6XCZrKWnIFQH96fl9TMOaJIY681R5lbZfpCx2Iy8tUWw4wf0 tHWTRc4RP28w5BdxAhh0OMEsy21ZBRyKjW0O8cSX6uRdKll6RnNWlD5ky0eanEcrrAK7 2kAg== 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=da6jV7ssI57KmcBhG8Rp7dSTF6JhOxitKuzZ72qggwU=; b=Rrm75U5KLQKmflggd2sLDKkhjR2cZO3bbTnjXzDb8KKX5Fu9wRnYQsXOXvXQ2dcuYo 4PO6hSAgSeBJWpwW7ZR/QpOxHlPMmmOq3+vMNU+GH3iWwcoRH3RM2/38l5uQ9YzP0x+7 iI0shBfMrouvi0HyUx45uFBnOqbWl1CUqhdRwUvG9aHVAAWxpulS3UENuMmlEQ6ZKqEi vABLKJKTPZm0nZRk2gp1bxcmDivdm/L19/dn7aK88UnbISaMxtB7QRsqpcwdOAEBt+yA 3oPYgPPWlxvto6YT0lzXOgm2C5+hwDjr7KqK3ch7rAxmAXqKQ6utGmT36NYyFqq/g8gG 4gLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Vztg5W6P; 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 71si2171550ywn.327.2022.02.04.13.04.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 13:04: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=Vztg5W6P; 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]:36454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5kx-0003Ku-9G for patch@linaro.org; Fri, 04 Feb 2022 16:04:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5W7-00089r-Vv for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:17 -0500 Received: from [2a00:1450:4864:20::32a] (port=42873 helo=mail-wm1-x32a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5W5-00088j-Oe for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:15 -0500 Received: by mail-wm1-x32a.google.com with SMTP id n40-20020a05600c3ba800b00353958feb16so4470276wms.1 for ; Fri, 04 Feb 2022 12:49:13 -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=da6jV7ssI57KmcBhG8Rp7dSTF6JhOxitKuzZ72qggwU=; b=Vztg5W6PP2KHy+hzXnhRZdknYzLw+LVJOuPFkmP5B3tgcxebSXaSS5SvVZwEOREMBA 23Cp72kLZ6GALG3GUBokMTrhIOgUlKozAiAuA6qFZfAPcOc58ag/sZywyH4EGpknrCSh NhKG10xOXe8RORkLgilFg43C+Irm4eQAr/mhmW/Owlofbd7ysYlARSZgbv9nbtEZ9xr8 AMN/xcZRQgqJw4uAVsNBWmEhGdi+8Bsd+y6jJ80b1q8T+P+DDJZ8ar7RE3/jhDoe8PoT ZytVZ2I2s6kCAkLxEZ0bHmcdM4rDt4tZOivoaCZsr6AZs68d9UeL65dDMLs88PrTG4hF 2OlQ== 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=da6jV7ssI57KmcBhG8Rp7dSTF6JhOxitKuzZ72qggwU=; b=ZqcINl6FcKt+BeWcRGAPk/Qr9Gj9CbbZIIKhfZjLBMBOG1879Eb5Brmifuk8xhTkfp B76UR5Zy1QMXc5tOJ4iUZNSVnB3FmaoGxR1jfRRBVDYiqH9DH43UX1+SLfv8PlZlkZYL Om5QIYUc7iZ2W0KU/cz9ul7bszxrW4KI+19ggFrDgRO56R5lEXWKH+tOuXw41lOWo4uz UFk4JRn4la6achJr3agArsqAMMDG6gqca/I1yB+SRTewWMXfDaDw8S8EjQCQl2MY3GbT cJCZ5hb/wsylDN7Ip7+Sm9uT0k+e2xs8A3JD46De8LTvHZ2jl7+QO70BBh/C7bDAn3kZ kYxw== X-Gm-Message-State: AOAM532XuEgubzSpXebvT4Gd1rpXkjDAjBkqDr5fpaxQiuSOEgoXnBw/ VIljqvPyzsinqBcejX5oAKda7g== X-Received: by 2002:a7b:c148:: with SMTP id z8mr442700wmi.38.1644007752141; Fri, 04 Feb 2022 12:49:12 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y15sm4262941wry.36.2022.02.04.12.49.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:49:10 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5A81E1FFCC; Fri, 4 Feb 2022 20:43:37 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 21/26] plugins: add helper functions for coverage plugins Date: Fri, 4 Feb 2022 20:43:30 +0000 Message-Id: <20220204204335.1689602-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32a (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Ivanov Arkady , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Alexandre Iooss , =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net 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: <20220124201608.604599-18-alex.bennee@linaro.org> ---- v3 - #ifdef around loader.h to avoid BSD compile fail --- include/qemu/qemu-plugin.h | 34 +++++++++++++++++++++++++ plugins/api.c | 48 ++++++++++++++++++++++++++++++++++++ plugins/qemu-plugins.symbols | 4 +++ 3 files changed, 86 insertions(+) diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h index 5f1017201f..535ddbf0ae 100644 --- a/include/qemu/qemu-plugin.h +++ b/include/qemu/qemu-plugin.h @@ -590,4 +590,38 @@ void qemu_plugin_outs(const char *string); */ bool qemu_plugin_bool_parse(const char *name, const char *val, bool *ret); +/** + * qemu_plugin_path_to_binary() - path to binary file being executed + * + * Return a string representing the path to the binary. For user-mode + * this is the main executable. For system emulation we currently + * return NULL. The user should g_free() the string once no longer + * needed. + */ +const char *qemu_plugin_path_to_binary(void); + +/** + * qemu_plugin_start_code() - returns start of text segment + * + * Returns the nominal start address of the main text segment in + * user-mode. Currently returns 0 for system emulation. + */ +uint64_t qemu_plugin_start_code(void); + +/** + * qemu_plugin_end_code() - returns end of text segment + * + * Returns the nominal end address of the main text segment in + * user-mode. Currently returns 0 for system emulation. + */ +uint64_t qemu_plugin_end_code(void); + +/** + * qemu_plugin_entry_code() - returns start address for module + * + * Returns the nominal entry address of the main text segment in + * user-mode. Currently returns 0 for system emulation. + */ +uint64_t qemu_plugin_entry_code(void); + #endif /* QEMU_PLUGIN_API_H */ diff --git a/plugins/api.c b/plugins/api.c index b143b09ce9..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 Fri Feb 4 20:43:31 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: 539894 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3575776imr; Fri, 4 Feb 2022 13:07:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJzXDmYDR6Bq9Ofal9aeDJlxUC3dQKqtv+/SbFP4smy4sZpuedmC1rLNMni+ITTXzdwpjbm8 X-Received: by 2002:a05:6902:154a:: with SMTP id r10mr1113936ybu.327.1644008864201; Fri, 04 Feb 2022 13:07:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008864; cv=none; d=google.com; s=arc-20160816; b=HV4hCxsuMUQg/iAfmLai19FPFfiz8mTcUNh8Pz/HyaiWk9qmggo9fBme4p5hBVknTt acjEprapv6QQ369dX7/6Sqy+0IDQojhdeq9AWwj6iybCSxDDJ0YBBEzmLTuCJsVUNKU2 kKnPlJzVqi7wDY2FT/arDWTjPM8EZ2MNkKyWqQXgqNoHWTJKVO7bVev+M7LVX4oHX0TO qfctTEyVVrIWU65tE+l9Bf5T7w55oqyokvruQQb4vRrGQvPAZGj7fC1WoajEysEPYOOP +se/VMn5apQOeBrTaY1XSVSKO43E//PHT4yTqHBFWeSUB6I23BjCaXNvwmWVCWHDF3vN r3FQ== 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=WxxlAQjFne43H7oMKEwUdOkD0mNmEgn9CffHZbyJIkk=; b=HdMAg6NeO/DtnTiSgnD+5yAYsi9Y+4ym8IRyugt52qUYAvolni4cctgf/8tZUWMLCB lgSfqmfnFdxTNB4stAc2BtQpZZBaz+TrCb5hhEfugCN3+VzmnvJxLTyU+Cfjn9yBerxz mi351LNqpqALcNkGNhguug2dp3BG8SNZE60y/rA8xhU8l13cp3izCJ15YkvSVWfnhEW7 rSzFYowX/dhlJlUUb1Z5ZQjYVmSty5dDkj8F9QwFprxV3qB3QGiuyz3ZcvI++4XHNMKp Y+dKhBq1ANZWXWiLmzeVPHcw2y8CdFnF9w66UpCqmpVXvxab8WF1X4y3WTWIy0xmGa59 JoMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UzRVsQz9; 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 p5si2309075ybl.273.2022.02.04.13.07.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 13:07:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UzRVsQz9; 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]:43260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5nz-000897-KZ for patch@linaro.org; Fri, 04 Feb 2022 16:07:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5WB-0008Bb-AW for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:19 -0500 Received: from [2a00:1450:4864:20::330] (port=37629 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 1nG5W8-000896-NE for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:18 -0500 Received: by mail-wm1-x330.google.com with SMTP id l12-20020a7bc34c000000b003467c58cbdfso10200236wmj.2 for ; Fri, 04 Feb 2022 12:49:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WxxlAQjFne43H7oMKEwUdOkD0mNmEgn9CffHZbyJIkk=; b=UzRVsQz9zPiMKQ6ioAnEp4PADRQH/s7ScGW0iv/6zk+siafbvjvqJ6iJVTlIbSxX8j V4PAv9Vt43CkasVi/HSX1oWIEb1TIuXyGpkp4cXlzfi4Y8JaRlXOTdEVBv8AjGM+kVOx wG45zohfpFbypSUMCE9jPDCNkFlbDnRlCWjhd0T0UGKXoP9gffK5ejAiHIIiM19RAfx2 +BRwzv7e7xfQS20OyLmmx2N6CE24uZdSEgO10NO0hYRWfi5E+jo5TWvu5ogNrxLWEeo7 C2C8WxHlou3pgoNc8aaWSfF67YytXeAHLb0kL0MIHFOubeWDs8QPqJ7XgL9RbFt2DBgC OlkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WxxlAQjFne43H7oMKEwUdOkD0mNmEgn9CffHZbyJIkk=; b=oIwx/HLeadZWW5oAnBLK4eiqtH92V0WOSrgxe7LJ9J/5qvWozDCiTIYSli/7IkmkUf bUMOWcTDNv7kAEAj/9WyWSFgrBvZGm6SerA9SXG5aSnw8MvbnCJZNB0pbox0UNGm/SFT hemBKEEZ3mA/Gfw+x2TF9Q5tuYJiCGYXF+eQT1FP+DSSAkHCGKmAK4hIZGt7hQJkVLfr 2WpJ8pDBvzvgt55nCwh0OS7NraqD0PzAHmeOaNmICDjS54GEhBkiQz8duwJHuDPu8/c5 8QOf4k4Y2nXpKW89jj9Com5FcHWoe2CqT1eN4mO55wIefVZqnLQik6QkofSZV0lCq4DA 9jyA== X-Gm-Message-State: AOAM533Gt2jNijETp8xgZCyGs7/byUQ1L8KwrcThyENCuUajFGoLOFoJ I77a/rz81AI+DMUKo9CPciNqmg== X-Received: by 2002:a1c:f413:: with SMTP id z19mr3725525wma.144.1644007755476; Fri, 04 Feb 2022 12:49:15 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n2sm3241338wrw.63.2022.02.04.12.49.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:49:10 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6FF0D1FFCD; Fri, 4 Feb 2022 20:43:37 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 22/26] contrib/plugins: add a drcov plugin Date: Fri, 4 Feb 2022 20:43:31 +0000 Message-Id: <20220204204335.1689602-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-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: fam@euphon.net, berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Ivanov Arkady , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Alexandre Iooss , =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net 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: <20220124201608.604599-19-alex.bennee@linaro.org> --- contrib/plugins/drcov.c | 163 +++++++++++++++++++++++++++++++++++++++ contrib/plugins/Makefile | 1 + 2 files changed, 164 insertions(+) create mode 100644 contrib/plugins/drcov.c diff --git a/contrib/plugins/drcov.c b/contrib/plugins/drcov.c new file mode 100644 index 0000000000..b4a855adaf --- /dev/null +++ b/contrib/plugins/drcov.c @@ -0,0 +1,163 @@ +/* + * Copyright (C) 2021, Ivanov Arkady + * + * Drcov - a DynamoRIO-based tool that collects coverage information + * from a binary. Primary goal this script is to have coverage log + * files that work in Lighthouse. + * + * License: GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +QEMU_PLUGIN_EXPORT int qemu_plugin_version = 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 Fri Feb 4 20:43:32 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: 539888 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3568410imr; Fri, 4 Feb 2022 12:57:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJwdHlcSGx8z/FbpuhOu5p7FFih81yKbYfbXr7CF4q2lBmZMj6aeLilSvD1rkYru7IguEYLd X-Received: by 2002:a25:1845:: with SMTP id 66mr1023432yby.196.1644008263785; Fri, 04 Feb 2022 12:57:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008263; cv=none; d=google.com; s=arc-20160816; b=KSIAUoF70XkL57GeGs904o/gzLjO7TaBcY0AcgQ5YzM/ORQmRFjR0PP9FDj0FAM4rw 68tfT66Owwa5PX+yK+B26/P+AiJI1lEXbTN9vgqKmj8Y3ba2FhH/Pw+aRiyKHyDqzBgR eVzbjnour3yBf3Ai1EIdkDF4jfj7J7cwGKAfBiUnBUzAzrVmMYg+7nyK9AtY6C99jV03 d1AVGSpIkie35RXwsd+WAfvjCmld9EtZK4fKXoNB3loBLpLgTuyLoy7oChnlIL1Fj9GH Q3zWTFZ2Wkt9QTsCUXuATXRe+RDXTFjW6OQM1l6wfGgIxLjbW/0DHkd5Dk9ERJ4XLGQF 3pyg== 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=LLRQf+EGiKb17sWi1iAuAKfuIJINjiQ+nmXe1hdPRTE=; b=cRfzldexMgNEvnihdFoln/1Gmle1h7695138hmcbi7M/YdNsheV5W7lfUvCDze1dTe g1K17Ezap/UWZl7mm6eBUNXPYXY60iSkKQ84UxeKjDfVHI/W/8R2J8LPWUV1tzz1HByP 3bdu8iQPyXUKq8u8W8GefY8RVFTnnk8A1r/q9MSL92ho+VorzCEUbyGUV17lqC+RFIZ+ ZnKKmueFe2RiQ2cQqqmdIyEzwlJCz4iU9zNUOS4D/Q8tJiBflO6a8nVVr91R9L1BiWL/ blQ83fwXEjcvRUtOrTMwZnIsGw4Qycncrtte4QrDOyCbD22c71HBQBpeoNIx9WtwlMhF b9Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VRVByL+d; 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 h65si2582813ybi.23.2022.02.04.12.57.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:57: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=VRVByL+d; 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]:55336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5eJ-00052E-9u for patch@linaro.org; Fri, 04 Feb 2022 15:57:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5WY-00004q-B4 for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:42 -0500 Received: from [2a00:1450:4864:20::433] (port=44659 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 1nG5WN-0008A8-HV for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:42 -0500 Received: by mail-wr1-x433.google.com with SMTP id k18so13422900wrg.11 for ; Fri, 04 Feb 2022 12:49:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LLRQf+EGiKb17sWi1iAuAKfuIJINjiQ+nmXe1hdPRTE=; b=VRVByL+d/k68NmkgxLc8pLyACmxVuBDNdJ4EdI+LKnr8WiP+t/UikQs0vjgb2E8oZ7 zr9YCJKAIFfF9HRGxlUXiyqcDgkqP6p3pUCSMq1tAwqcrQifujdk8+qIICaieSTegP2y zQS6pEu7iFTARr+ii8662Kgvf+d8a87uQa/TZVuHPJGEH5853THzSzt5gN6yT3eXuZfy +cxWKv4mo0ERhfYzvsyTTjya/JuODX78Y46bDL1QXjy2Y4Jg3r5IFSD29UdXcaN2KQi8 Rh4sK0VuOKF7fHMlUlHNuaoLcErZopvudCqWO/fG5S6ZxnaaEAQ8eHV0eKKSzQKpamn+ KXag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LLRQf+EGiKb17sWi1iAuAKfuIJINjiQ+nmXe1hdPRTE=; b=v3jDkIe/TtvZKlb7+KwwFGUoar/eDe7+ZuzADUvwIJzZn65E3b6DnqrreC1ThCAar6 RTluMX3nvAZd8kkLl6je0Y3KIPGFPOb3DRLKRSLRbV81RUNdFX7LU9H8ojv/T8MWoJkA B2iyRcLxiqXqthy1cypNeoOMY2wa9AfzCB5j0jnyfjNkHtvFOS3nVQu7/INmgb1T60vh 5E7zieMGDMNZPOiiJWfyg+hDK7t0qQHDuk0Ytw3deZI+I4rUS5FEstZ0GLB835s6zLcT 7wjGCse1gxzw71XN0GOvIe5BSv+He1rQOG2GAttcvBNb1ppkLDnGKX5XWmelPARw6jjN NdFQ== X-Gm-Message-State: AOAM532L8ptkzeF5Nw/J/6szQLQlg3DHYwpx2a2RDbHS64Zv+PWhBA3k z2xu6vA8SHZ/UHT+S6aNk9hufg== X-Received: by 2002:a5d:4703:: with SMTP id y3mr553243wrq.277.1644007763957; Fri, 04 Feb 2022 12:49:23 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e13sm3276118wrq.35.2022.02.04.12.49.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:49:17 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 86AA81FFCE; Fri, 4 Feb 2022 20:43:37 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 23/26] tests/plugin: allow libinsn.so per-CPU counts Date: Fri, 4 Feb 2022 20:43:32 +0000 Message-Id: <20220204204335.1689602-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-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, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Alexandre Iooss , =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net 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 Message-Id: <20220124201608.604599-20-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé --- tests/plugin/insn.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/tests/plugin/insn.c b/tests/plugin/insn.c index d229fdc001..d5a0a08cb4 100644 --- a/tests/plugin/insn.c +++ b/tests/plugin/insn.c @@ -16,22 +16,33 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION; -static uint64_t insn_count; +#define MAX_CPUS 8 /* lets not go nuts */ + +typedef struct { + uint64_t last_pc; + uint64_t insn_count; +} InstructionCount; + +static InstructionCount counts[MAX_CPUS]; +static uint64_t inline_insn_count; + static bool do_inline; static bool do_size; +static bool do_frequency; static GArray *sizes; static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata) { - static uint64_t last_pc; + unsigned int i = cpu_index % MAX_CPUS; + InstructionCount *c = &counts[i]; uint64_t this_pc = GPOINTER_TO_UINT(udata); - if (this_pc == last_pc) { + if (this_pc == c->last_pc) { g_autofree gchar *out = g_strdup_printf("detected repeat execution @ 0x%" PRIx64 "\n", this_pc); qemu_plugin_outs(out); } - last_pc = this_pc; - insn_count++; + c->last_pc = this_pc; + c->insn_count++; } static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) @@ -44,7 +55,7 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) if (do_inline) { qemu_plugin_register_vcpu_insn_exec_inline( - insn, QEMU_PLUGIN_INLINE_ADD_U64, &insn_count, 1); + insn, QEMU_PLUGIN_INLINE_ADD_U64, &inline_insn_count, 1); } else { uint64_t vaddr = qemu_plugin_insn_vaddr(insn); qemu_plugin_register_vcpu_insn_exec_cb( @@ -66,9 +77,9 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) static void plugin_exit(qemu_plugin_id_t id, void *p) { g_autoptr(GString) out = g_string_new(NULL); + int i; if (do_size) { - int i; for (i = 0; i <= sizes->len; i++) { unsigned long *cnt = &g_array_index(sizes, unsigned long, i); if (*cnt) { @@ -76,8 +87,20 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) "len %d bytes: %ld insns\n", i, *cnt); } } + } else if (do_inline) { + g_string_append_printf(out, "insns: %" PRIu64 "\n", inline_insn_count); } else { - g_string_append_printf(out, "insns: %" PRIu64 "\n", insn_count); + uint64_t total_insns = 0; + for (i = 0; i < MAX_CPUS; i++) { + InstructionCount *c = &counts[i]; + if (c->insn_count) { + g_string_append_printf(out, "cpu %d insns: %" PRIu64 "\n", + i, c->insn_count); + total_insns += c->insn_count; + } + } + g_string_append_printf(out, "total insns: %" PRIu64 "\n", + total_insns); } qemu_plugin_outs(out->str); } From patchwork Fri Feb 4 20:43:33 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: 539893 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3573832imr; Fri, 4 Feb 2022 13:05:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJzlsTu88S8LWW8uHo7r+kzf5zUmMLtGDNd3V9e408FG19Uxhqq1gBz42DMPVyiImecOwnnf X-Received: by 2002:a81:8c7:: with SMTP id 190mr868539ywi.516.1644008713090; Fri, 04 Feb 2022 13:05:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008713; cv=none; d=google.com; s=arc-20160816; b=iOwlQXHkFKiOH9s2c4DarLbd9DX86xhsXxjZkrd4NhEBsKw9XUKDoArdDQnDX4HcFZ 4agmKg8Uu/KfhD9ZP9ckoWc36X8ZbtkWDx7tCVmqyTFznCkagAI9bzIPztVQYsAhZ7w6 X8WOxN8oVYuq+ssaJhdWrRgPjhgIr9j/U4l4boQ/SThcAoBgxq5nWTV0F+kgECLGRrtc rqKxR0EcoILxTOFzieM12KoUV5QcFf3sIk3GCAlihTd51k5xqHGZAMShgQ7ALQtb5YEY x0OwUXVikTqFPDZx42lK1uIYmwy79HBM3vSUK0uJWLLz7RTHqKPzYs3SD7uUnU3TrnaD oD+w== 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=JEfEtb4g9JFuRdRoJCsBM6RTHKvLT1onRYy1y1hxc1E=; b=xKXQbv2KdrIJN0gFVt5Z4J+kFr/gzUMFRubkfIP/nrRt8hzqLs6j+tGTrRfUTPPZYb q2HnOL6eB4inyZ81tCvtzK0mnGUC6vxVMp4PH8Aau47a/SZ6a7oMEv5lSbsi0rd1nT3X 9ruonT92fAjldlmGeJsZMYCEZiYKHop/DtqKh8yrlV8hUtemDQ4bl/Wht7j/Hfx20nHi ZAwsl/XLy7I8cIKXb9mglrGluTVTqk5uF52S0TQ3cR+S6Nxb28CfTXQ0vX+eJOZQSekU 077pVbYt/8fOk9jre++zQuzbCOj8rhv82I1OMZOZszIjEEpHyVbQPcD8rckd1Y41r5TL Y6lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=a5oew5cP; 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 n197si2192908ywd.295.2022.02.04.13.05.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 13:05:13 -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=a5oew5cP; 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]:37692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5lY-0004CJ-JN for patch@linaro.org; Fri, 04 Feb 2022 16:05:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5W9-0008Af-Uh for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:18 -0500 Received: from [2a00:1450:4864:20::333] (port=54994 helo=mail-wm1-x333.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5W7-00088v-QU for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:17 -0500 Received: by mail-wm1-x333.google.com with SMTP id c192so5358699wma.4 for ; Fri, 04 Feb 2022 12:49:15 -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=JEfEtb4g9JFuRdRoJCsBM6RTHKvLT1onRYy1y1hxc1E=; b=a5oew5cPIgnaxJ6WOl++/JN8xWmGLaWelJSjkYiYkNaq0de3shdsIYQug9SUkGa08c diBNvjToWUp+CMOFiIPVsU67Xiya+TC9iH4Cb6Ej/Wyv6CjT7jppofRmoMCOuEKINqAl MsTDh5aDP446/F5f3F8/fqZ9ZtWUXQ2G1Y6xnLmnVMHgTkMFUY3DTn/vi1kANXl3S4oI Od1sbKrzWIsD4VyI+78xyAsJ5SBvwGgDDVfYdHgRi0fqLuomOVYPN0MLxnLesm8R2Pto syiYQxE3U4srLGXlCazDxdIeG6M9FZjXAUGFeg9/+ymr9mnWzhyS5lW9aaslxQlOsecU JYBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JEfEtb4g9JFuRdRoJCsBM6RTHKvLT1onRYy1y1hxc1E=; b=0X6wmcKLUomS83j8RQbr+hpsUWvVNYGJS0HcQ+WATudlBQsLrSESSxPcvDBnaDjfNP PBhLsGVStUVWaxxcosn43ZQTa1Tbj2tNhmhif8eNs9zZveH7XtnLhhQ+hcqMtaMVWy/D /OWFBylO3nHFPVP47vj3ApFPACGVLlQyDIa+sHh7VF7fsa7Qh3c2FaeN7CTu/dJsGRPD DGTy8teTa5G1bruzvLk0mbinxW1+50jiRQ1eXOVVa5KjnEd+ooMreRrwzf2gdh8Iq24y cOqqfvXXvCZIKFyEoGYgiowXxQCqIYLzwwk1h5np+tAj0dHz8Q//xYqUspI3Uc/eqOlo I2aw== X-Gm-Message-State: AOAM531r1fc3ksj2hN2vXFHDIzussriDJHcTsO4nfXNGKbJOn4nyiG/p gdtus6O9HAyGkK8hfKLs5KZG5A== X-Received: by 2002:a05:600c:35d4:: with SMTP id r20mr3653316wmq.147.1644007754545; Fri, 04 Feb 2022 12:49:14 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k20sm11928096wmi.36.2022.02.04.12.49.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:49:10 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9440B1FFCF; Fri, 4 Feb 2022 20:43:37 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 24/26] tests/plugins: add instruction matching to libinsn.so Date: Fri, 4 Feb 2022 20:43:33 +0000 Message-Id: <20220204204335.1689602-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::333 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, Vasilev Oleg , f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, Alexandre Iooss , =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , aurelien@aurel32.net 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 Message-Id: <20220124201608.604599-21-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé --- v2 - quote disassembly - try and improve formatting --- tests/plugin/insn.c | 89 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/tests/plugin/insn.c b/tests/plugin/insn.c index d5a0a08cb4..cd5ea5d4ae 100644 --- a/tests/plugin/insn.c +++ b/tests/plugin/insn.c @@ -28,9 +28,25 @@ static uint64_t inline_insn_count; 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 Fri Feb 4 20:43:34 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: 539895 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3576196imr; Fri, 4 Feb 2022 13:08:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQ6IZKidAXXOwiJuXD4+GfAAtuKXnBQLVMa4qNfmb1sK9Jl8R0pPPmYaT4oQf940djA39y X-Received: by 2002:a81:df0b:: with SMTP id c11mr910881ywn.49.1644008905643; Fri, 04 Feb 2022 13:08:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008905; cv=none; d=google.com; s=arc-20160816; b=jWXDqh0WiE3mSzSuTMIZi/0lTc301tjTfQCY0l7XfXGeYzn/FBXXjCuN/M+7J3oG/w +tbrGqxa9Ul6w91NXbsoWFUzL/gY7WCss+yJJNuB8DIRXc/V2nUYh7gBzaZHlUcLwZS9 Dw6PfCpsNaMf/+4kGCmPvEA82URxVjt4zD8/X+NfdLe3PKenvLMXKgPeyJ2m0A4FFBoy m1RDomFB8j4RqobfxH2kgDOSVRqfTDRAKKTpxo48N8iOYFq3+LnPhjLdxCRps6B61POt u7pDnPxC/ldSUYLCQRake/B8i0HM3yKDn6WpAlkSn5cWmKGLN6h+fSXyUBx5PqPfwYXY D//A== 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=CJ53Uj6U+FB2fJ+hgAKxvbRBEP4EFyNBAoP2qiY8QbM=; b=fa+0TwD19Df5WmeRExOwAOGRJiz7yAQW3tPHdfMEfubmwrxBk695w5NSx9LP6kIw1z Fs5cgOueXUHO38ZGLyBMk97zcbLduvC+r592lNbJ1Q92be8b3AWQ+VED0LenU+jiyxXn WhWgxndEmVso6ba5wT3/iX6sNRLnv7qpJlx6XVao0ZAvJIMANNgWSYf0MG0uvPmP2BzJ 6EOFd7A/PENdXA6o9drxj47ytUVairW7yV+P6YzWJ9cN0IWtSk6D4gqpcmNzyUXr2hix jRsZ2sCtIKJknrJPCY/lZyniRcxGj2m2iuBSyKTjPZmy3LIm2M7NWjFFVORCKx7o4XW3 YRsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="VIR/wlTj"; 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 124si2099442ybb.266.2022.02.04.13.08.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 13:08:25 -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="VIR/wlTj"; 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]:45116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5of-0000xb-5j for patch@linaro.org; Fri, 04 Feb 2022 16:08:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5WX-0008Vi-UY for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:42 -0500 Received: from [2a00:1450:4864:20::42d] (port=44653 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 1nG5WM-00089w-CI for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:49:40 -0500 Received: by mail-wr1-x42d.google.com with SMTP id k18so13422748wrg.11 for ; Fri, 04 Feb 2022 12:49:22 -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=CJ53Uj6U+FB2fJ+hgAKxvbRBEP4EFyNBAoP2qiY8QbM=; b=VIR/wlTjqEtbrmTlSp7XM9IFtB3NBGY8PkdM/hgplre1n9zAxCt5oybyIRn11iIHIM QUU3CXJwr0rAa5ekxc4I97dVfnQlaGSMKWKkkt10RMiMiQlN82DHRsfv1wWJRdy1Te0J cbAnpC9MgGIbix8BPpOGlq9/yozGTBv9s9J2Xyu5zlsFocSRBHmNSHrBic7Q9AlN0rw6 pkI+9FlqDY2S3Vge/9Sgdd074Jf/O6/8kxELWVa89q+KBbq3xWO+aUfh/6O5+zfxWaUO z7EC9gQ72IBPGE1NnS2tr5n3OBMoriwAdXaYPm1hm6Mt2BKSisOsmxcAwl4iAySE9dea 7pIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CJ53Uj6U+FB2fJ+hgAKxvbRBEP4EFyNBAoP2qiY8QbM=; b=1Zolal57Vnn3wcouC6pUJP3ldDlYykVDUB2Xv3K+FLzYBVSMpb2GjIsa8BKEBG2Qoo +mWTaRpawAbHFfUmevlYxMJFaSLPK4gAB4Gqa4f9wFnZaN6o/AmotuI+db0i8H1AIz/2 08YDLJKiKdLFVqL21fv/C9TM/lupRHzMgHPDRw11ccLySl09SqMOzGJJOWS3zvwWZRAc 2zfQQIox9uRlQV677AwrGyumA3ZWXIpSZVRlnRK58JEuc6NG9GULzRX5H2L1UrrN/GPs EHLIfeZI2VpjJyaN63KfClhr3QyxhwVMc7Ih6PAWVyYSgrUxZtZ2eg5aY3/RKTqEQUuW /FWQ== X-Gm-Message-State: AOAM530u/xokuIKWwWe6waWsZWABjeeFLhl6tgqLn9xoE+De71lsRQ0V +ktiOZBHHJaZ/yVuP8hIy6govg== X-Received: by 2002:adf:ff83:: with SMTP id j3mr561469wrr.618.1644007761315; Fri, 04 Feb 2022 12:49:21 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u14sm2866860wmq.41.2022.02.04.12.49.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:49:17 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AC04A1FFD0; Fri, 4 Feb 2022 20:43:37 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 25/26] target/i386: use CPU_LOG_INT for IRQ servicing Date: Fri, 4 Feb 2022 20:43:34 +0000 Message-Id: <20220204204335.1689602-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-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, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_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: fam@euphon.net, Eduardo Habkost , berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net 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: <20220124201608.604599-22-alex.bennee@linaro.org> --- target/i386/tcg/sysemu/seg_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/tcg/sysemu/seg_helper.c b/target/i386/tcg/sysemu/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 Fri Feb 4 20:43:35 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: 539887 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp3568251imr; Fri, 4 Feb 2022 12:57:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwWmNO4szt8q92rmDWmZ/S4aRdVEQRFjq7urs0/DX01XE7g1WoAEhv7sPyLcNVahbNdHDC8 X-Received: by 2002:a25:4842:: with SMTP id v63mr1069494yba.21.1644008247270; Fri, 04 Feb 2022 12:57:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644008247; cv=none; d=google.com; s=arc-20160816; b=pmyoMbriYywRDiG5V1yMrYpPQ5CO9O70y+ybJtYCpiNKnHP8ZnCWK6+E8/TrtFyUuj zfIWwgNByZI9Iur7S5bUbl2vpRjEWZcYM2dVQeV9tEDl4RmJb9yZAc9E6iau/0CCYeCV szxe5N/lfwQmm6GlzlF4g/a093s2f3ahDx4oMIAJSwMrKwOdiaEeL0LkQqy6NqzpnLB2 Fw1YwOmpZTFtG0y9rxixc2yZ9uZj0Y40G8pE9AvgBZJsfexSGc2X2U5xvNyi2AFhijQ5 AJlzDgCR+b7oPgwDUNTuIQCvHvhbrha/fvbJ9NNby+FUxIzH4Wv8/df29JyynRE4sKKA FO+w== 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=EhmXOO/6q9XmPV09312oaXBgVpi24xyzc4IO4oCe4TQ=; b=kc96dOvtUSp2BR/ybt1oj+Ck3yAk7McQvNHx/5ODo8gVbzOuwB+Irm4S0fB0k4TtHP wffBqyK8HHtCE8j0bqLeMQFm9QNUpuTH8bHsflIGvKR7rTeYt97dUkVg3AKAljsCi9v5 LwzJEco66df/ffsnUVFWdEfd+r8QskAEYYobOHWvMsOwVfQZzqIih2CAuI9Ejflsfff0 bhR7yYtUrPJlgGUrfsZpT6RZLRTikfZOG6hzzy/puVKlp6durUM7i2cmm3pygWY/I6Io 91cT5WRS58iKd047yWfeWN/Wd1hy5oskWHDaOaVcFcRs1Iofy4XfG+VauXwiqJPwYGVJ fedg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kNfY0pBz; 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 l1si2226487ybm.282.2022.02.04.12.57.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Feb 2022 12:57:27 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kNfY0pBz; 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]:54956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG5e2-0004mF-Ok for patch@linaro.org; Fri, 04 Feb 2022 15:57:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG5R6-0006vf-C7 for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:44:04 -0500 Received: from [2a00:1450:4864:20::42b] (port=34550 helo=mail-wr1-x42b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG5R4-0007P4-7O for qemu-devel@nongnu.org; Fri, 04 Feb 2022 15:44:03 -0500 Received: by mail-wr1-x42b.google.com with SMTP id f17so13471889wrx.1 for ; Fri, 04 Feb 2022 12:44:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EhmXOO/6q9XmPV09312oaXBgVpi24xyzc4IO4oCe4TQ=; b=kNfY0pBzjxqa/tYlSv6xJMFD+J71gGGqieuTG2j5WigVe7pKOX2ZETHCVYrLigqlm3 FnqJyLQawQ6LlhZIu5iGsw0lnfVfOABgvTI6uJd4bqf3MZsSa8fgLFVsltHZtBErTN5F xMJTJSvyqWrzuabVtJ0tTL91pggfwWPORMEd1xY/Zl+fp/f1+4O0ej1peWwJrq7mXWui LBi9MGT7in+C6J16bciLo9P5JkgdR8Bp6GEk0dZHiqmeQ5WvAmZrYd/MwDmatZ6x3xus rghbVDKeeTUecfHfNcl7BfTWocJlyO8B6ddyr/rRqlGCH5VYpowrmkrbnO6rOsMmFQsb f3gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EhmXOO/6q9XmPV09312oaXBgVpi24xyzc4IO4oCe4TQ=; b=Sd+Aze75WpMPPxlJHwIOxiPz5zV4sXmTX0eSY7tKeXXft9hwCXYZMU9OV43rKdfGia P7DYR7iQhFtvzNYER6Vm7HvmvtpZ4GbPOm/G8LNPjYSQ7FZE4NWMViz+27R2PEDDxFvA ZGtVN+mnwVyxCVHZ9k4cdHBR87U31UQ/Zv1wB6ocs7QngdyvaNwI3JU4oNRBfNAR5oHx t+dNDMZ60eRTmlFTqNzGBsd0oskL8peyjP4O25BvKsAnlV1ogVt5Dc2ynuIb7CPEvmJY nuH4co1C1OIoQV6071rmF9QhG0MFKNc3AljIU/2/5K1YtUxuz/uypaXcqrduQARa6QHt OfdQ== X-Gm-Message-State: AOAM530vSnES0ZEkkdRX9mHm7hF2BPXpoRUg8Wln7vBU+FAocXfN9998 vB43ToA8Vg+FcK3AnH1Bffw6Ag== X-Received: by 2002:a5d:5445:: with SMTP id w5mr536939wrv.680.1644007440926; Fri, 04 Feb 2022 12:44:00 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d2sm2773031wru.40.2022.02.04.12.43.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 12:44:00 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B8CEB1FFD1; Fri, 4 Feb 2022 20:43:37 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PATCH v3 26/26] plugins: move reset of plugin data to tb_start Date: Fri, 4 Feb 2022 20:43:35 +0000 Message-Id: <20220204204335.1689602-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220204204335.1689602-1-alex.bennee@linaro.org> References: <20220204204335.1689602-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Luke.Craig@ll.mit.edu, kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com, aaron@os.amperecomputing.com, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can't always guarantee we get to the end of a translator loop. Although this can happen for a variety of reasons it does happen more often on x86 system emulation when an instruction spans across to an un-faulted page. This caused confusion of the instruction tracking data resulting in apparent reverse execution (at least from the plugins point of view). Fix this by moving the reset code to plugin_gen_tb_start so we always start with a clean slate. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/824 Signed-off-by: Alex Bennée Message-Id: <20220124201608.604599-23-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- accel/tcg/plugin-gen.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 22d95fe1c3..ae70e4a5b0 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -854,10 +854,21 @@ static void plugin_gen_inject(const struct qemu_plugin_tb *plugin_tb) bool plugin_gen_tb_start(CPUState *cpu, const TranslationBlock *tb, bool mem_only) { - struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; bool ret = false; if (test_bit(QEMU_PLUGIN_EV_VCPU_TB_TRANS, cpu->plugin_mask)) { + struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; + int i; + + /* reset callbacks */ + for (i = 0; i < PLUGIN_N_CB_SUBTYPES; i++) { + if (ptb->cbs[i]) { + g_array_set_size(ptb->cbs[i], 0); + } + } + ptb->n = 0; + tcg_ctx->plugin_insn = NULL; + ret = true; ptb->vaddr = tb->pc; @@ -904,23 +915,19 @@ void plugin_gen_insn_end(void) plugin_gen_empty_callback(PLUGIN_GEN_AFTER_INSN); } +/* + * There are cases where we never get to finalise a translation - for + * example a page fault during translation. As a result we shouldn't + * do any clean-up here and make sure things are reset in + * plugin_gen_tb_start. + */ void plugin_gen_tb_end(CPUState *cpu) { struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; - int i; /* collect instrumentation requests */ qemu_plugin_tb_trans_cb(cpu, ptb); /* inject the instrumentation at the appropriate places */ plugin_gen_inject(ptb); - - /* clean up */ - for (i = 0; i < PLUGIN_N_CB_SUBTYPES; i++) { - if (ptb->cbs[i]) { - g_array_set_size(ptb->cbs[i], 0); - } - } - ptb->n = 0; - tcg_ctx->plugin_insn = NULL; }