From patchwork Tue Nov 7 14:23:32 2023 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: 1861112 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=HZFRFXp0; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPr9J2Zb1z1yQg for ; Wed, 8 Nov 2023 01:25:40 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0Mzu-0004Dm-S0; Tue, 07 Nov 2023 09:24:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0Mzr-0004Bv-Db for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:03 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Mzl-0007Xm-W1 for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:03 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-407c3adef8eso49307815e9.2 for ; Tue, 07 Nov 2023 06:23:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367036; x=1699971836; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LDHFJerErM6xeZ3usM1xoRVcULOAJ0pzTqiA9XHIBaQ=; b=HZFRFXp0wF86z52t+Dys8iV09jCCLHp26buOGkEcGsqcHXe9/GMyRZL8VI2gzzC+c3 +Z009xaUWQo2zo+3wFutIEY5NZb47CvJYXryiKMgVzsbzlH/nrRBWYy7t5GqQnrTXZFu pWDCzafzJPhESClPwXEcFmBxln9sOwTnQ+93kNkumyxjyKa84l5Zlhnk2uI6MqsstI1B EvLbiDKpE/El1FHPGupHMMmybcNJtu+0Mcx15bkmBnJ/YzdJP16KsD3v/enqvquVmzwr alGJ6rzlqosB6fYd8l9Dy6uyUtEtIv7jDQizJ9rdNtfLruUHPyDozZbiUdWWoelRNLvK OQ2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367036; x=1699971836; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LDHFJerErM6xeZ3usM1xoRVcULOAJ0pzTqiA9XHIBaQ=; b=ETjwR06RzWWs+q4fOupn1KKWATmbr7O7nfzc71gZD+hvoKEBXtyP9wvDhgsYtKmc4P eZV6PllFQUEZwxSa99yJl1Nlcw27KjhaTUPtdahKP1Pmslsj7vmUZGCF9BmNceRVkd9H BRV4Hh0LbUjoGskGECLs37TKrAyrj3t6lpg6csUQXNNn3OWRpwb+1MOywsvxix+RnsR+ 0t5439S0DDWBHzx9t3egKpAahQkx1cEGQizQIYYdCgsLSY48DONmR28GHXarLQ3rt7Zp GVGVcqUpv3h312MQsMw3suC4W06YAQKKyK1vyOd2ZZ8njcBs2F72iWylTgJg9eiXKQnY 7dlw== X-Gm-Message-State: AOJu0YxhMBFvYVAtnzoDZ+ejyBLp/rf7hn3m7M9BcVCForpkoIt78g4X 8K8ICQtGfcArmXVv2JQw177p8/7bNe7MrkohQ1aXQg== X-Google-Smtp-Source: AGHT+IEWSkYYzVtB6ObTIcoALU5XKaTGtZH1iIk9LzRizmL5ccvoNh2TVvdNk9WwkrB09TrizCPlHQ== X-Received: by 2002:a05:600c:1ca1:b0:405:1bbd:aa9c with SMTP id k33-20020a05600c1ca100b004051bbdaa9cmr2113233wms.34.1699367035718; Tue, 07 Nov 2023 06:23:55 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o25-20020a1c7519000000b003fe1c332810sm15497725wmc.33.2023.11.07.06.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:23:55 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B563B6572D; Tue, 7 Nov 2023 14:23:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Laurent Vivier Subject: [PULL 01/23] default-configs: Add TARGET_XML_FILES definition Date: Tue, 7 Nov 2023 14:23:32 +0000 Message-Id: <20231107142354.3151266-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Akihiko Odaki loongarch64-linux-user has references to XML files so include them. Fixes: d32688ecdb ("default-configs: Add loongarch linux-user support") Signed-off-by: Akihiko Odaki Message-Id: <20231030054834.39145-6-akihiko.odaki@daynix.com> Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson [AJB: remove base32 from list] Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-2-alex.bennee@linaro.org> diff --git a/configs/targets/loongarch64-linux-user.mak b/configs/targets/loongarch64-linux-user.mak index 7d1b964020..d878e5a113 100644 --- a/configs/targets/loongarch64-linux-user.mak +++ b/configs/targets/loongarch64-linux-user.mak @@ -1,3 +1,4 @@ # Default configuration for loongarch64-linux-user TARGET_ARCH=loongarch64 TARGET_BASE_ARCH=loongarch +TARGET_XML_FILES=gdb-xml/loongarch-base64.xml gdb-xml/loongarch-fpu.xml From patchwork Tue Nov 7 14:23:33 2023 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: 1861121 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=YDznwLNW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrFx6RT3z1yQg for ; Wed, 8 Nov 2023 01:29:41 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0I-0004Qu-21; Tue, 07 Nov 2023 09:24:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0Mzu-0004Di-N5 for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:06 -0500 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Mzp-0007YK-IE for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:05 -0500 Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2c6ec78a840so75737391fa.1 for ; Tue, 07 Nov 2023 06:23:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367038; x=1699971838; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+KyRQEuJeZ5+LF5Izx85Idqn9Hk1tbv3l5q5snV79uA=; b=YDznwLNWe3UKxKoDve/DpMKTNXEehztN4sqOTd8KJ5m+4o/JaMeTYIGETjue5ibHGa inwWE0PKXNdNnNIekEqY8wKUh89o7Cw/a69GtRdLV1WEtGRxSvxZgrP9RGMsq4BB6Cvv CwR9qnKA3steGP88+75CJ0x4TbUplqAYlC2imlz8RBGYPMT5DlLXFGiz3yYjeQ6C2Xux M4uahpAiZNVLLth68Jzxf6MUukrFXMt/vP/FMUgQIbkPsF/yLfEQOqP1Ek4naRXE7A1C uSF73su/Z4WVG7Vu3F+XVZmd09KbzEMkUtjgPj0wVDdVK9bSbkaXIOdxN/Ael+qk9wIY UsPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367038; x=1699971838; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+KyRQEuJeZ5+LF5Izx85Idqn9Hk1tbv3l5q5snV79uA=; b=NWNyeTRW8aHNoqHn51430+7S6zDuwzrAHA33d8JSxYDYyjhtLIVoLtL4yhuILlocV5 /AKCYgnAKP9LCBrmtfl5gD8fkMxOP96QsY0+MlokhSabN4tCS5kG7+6R5v+MZgnWN6cA sKCzxwbZXfMrlFMJbXgko63Dx2x26soMjFxli+QObLIVs0y5xcIyA8MeDkoLvkVJXcfr yfuqrntjKuLMaU9JfCiHn2IhZx2pK5zYH8sB9Fh0gTV4hxSrsvpz6w32cAe8r0J2V6n4 3A5/px77BPecz0r44DSuaJof4tYfD6kzIjOiF0uEGpT91eET5PfQDNxAsEImpx6g8XIo 0BIQ== X-Gm-Message-State: AOJu0YxRjvZ3n+LVG9f1UatoUb9va3xaEaA8wK38DYUO1vhYsrJA2P2N gBUumAozf/2mQaEBVWFgVYGpnw== X-Google-Smtp-Source: AGHT+IFvA9EGGAgLalD0baceZah4j7cTIwcT3v5+IgMAvyo8XgYE+tZlS3YChKiO/qfXQHrI0EfEqA== X-Received: by 2002:a2e:8681:0:b0:2b6:cff1:cd1c with SMTP id l1-20020a2e8681000000b002b6cff1cd1cmr24078385lji.34.1699367038678; Tue, 07 Nov 2023 06:23:58 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id t10-20020a05600c198a00b004064ac107cfsm15793487wmq.39.2023.11.07.06.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:23:55 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C8D786573E; Tue, 7 Nov 2023 14:23:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PULL 02/23] gdb-xml: fix duplicate register in arm-neon.xml Date: Tue, 7 Nov 2023 14:23:33 +0000 Message-Id: <20231107142354.3151266-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22e; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x22e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Reviewed-by: Richard Henderson Fixes: 56aebc8916 ("Add GDB XML register description support") Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-3-alex.bennee@linaro.org> diff --git a/gdb-xml/arm-neon.xml b/gdb-xml/arm-neon.xml index 9dce0a996f..d61f6b8549 100644 --- a/gdb-xml/arm-neon.xml +++ b/gdb-xml/arm-neon.xml @@ -76,7 +76,7 @@ - + From patchwork Tue Nov 7 14:23:34 2023 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: 1861116 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=vL+05MG3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrBk74d7z1yQg for ; Wed, 8 Nov 2023 01:26:54 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0Mzu-0004DH-DG; Tue, 07 Nov 2023 09:24:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0Mzr-0004Bw-Ht for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:03 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Mzl-0007Xq-LN for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:03 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40859c466efso41702375e9.3 for ; Tue, 07 Nov 2023 06:23:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367036; x=1699971836; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YJ73BpswQluAmFSEM4Kf5oYPeB5xmrt2szkO33mu3lQ=; b=vL+05MG3TG1xK0L5/XtUWmm5ti21hJt8b1mfYXh3QxqChZ5vcuIKuQ1QvdfypdX6lJ dteZQNiDrJIJtuqACkfNXosA34bKlrphVE6sLwxnc3tcsXTFVzBerPtxNzdjtfpg9lsN cjGeNXeHLhEwyT2FMtWMeJ2EVGqWDCZXuWfvAq+9MXoSkGsjW1JsQZWq4+T1ZUjeW/Qp 1ut8xyqwiEtsu4WlljEfQkr0iEp+aYX+EzKHMLejPc1xl/TU7Bq6KnLpU4q/qNEg7hhu YC0SQkf6PN+1pt5OiTd4iHslKuEgDniTTjojeD8sfjm5KZmJ2h09ffN53SVybREYFIIV AT1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367036; x=1699971836; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YJ73BpswQluAmFSEM4Kf5oYPeB5xmrt2szkO33mu3lQ=; b=dKqL/Z3DSB4shQ+8QjWhc5cbjKqhvLl3MpnpLnKMaU250G33AtCq1YKl4Yc+d2DLp6 yu5xhTOWrQwVxWLJLdam7Mx29j+PgcnP2bjMPJkNWW38cvinfIGJU+Ca8I4bUGLG5WDF tl8ymMaHv+/bad7KtQ7JcI00IMNqL74t9w4aLvYvBdTB3K/4dU8t81XSYegYpbInVkFQ qZjWANN0TZCz+nOtsD06y5jTlHgdFUbjxM6ghL3Zb5lZHZwNOw/KXI2Zw5EQ9BjpnPYG 9XPcOw/0GTmSuFmc+hYJYMMBpvO3GxxlU9AnPY2a2U32VcQt0EjGSyvb3bm9Qd2whJ03 1jbg== X-Gm-Message-State: AOJu0Yyt4b+JskoOxz4/er9wP2iiKzhihb/sNX9jvDSDLjJsriTWPDtV SGBDqmrXIGByk0/uu6qqlm1M9g== X-Google-Smtp-Source: AGHT+IHE4KNYPhuOvdaTyJCWC6VhIPnSENhQ4pPNx8XnkxKjso9qigbi/Ex1YyVqMRILQLOZL4Nx2Q== X-Received: by 2002:a05:600c:1c9d:b0:407:5ad0:ab5b with SMTP id k29-20020a05600c1c9d00b004075ad0ab5bmr2117838wms.8.1699367036027; Tue, 07 Nov 2023 06:23:56 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id c7-20020a5d4cc7000000b0032fa66bda58sm2495423wrt.101.2023.11.07.06.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:23:55 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id DEF596573F; Tue, 7 Nov 2023 14:23:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PULL 03/23] target/arm: mark the 32bit alias of PAR when LPAE enabled Date: Tue, 7 Nov 2023 14:23:34 +0000 Message-Id: <20231107142354.3151266-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We also mark it ARM_CP_NO_GDB so we avoid duplicate PAR's in the system register XML we send to gdb. Suggested-by: Richard Henderson Signed-off-by: Alex Bennée Reviewed-by: Peter Maydell Message-Id: <20231107105145.2916124-1-alex.bennee@linaro.org> diff --git a/target/arm/helper.c b/target/arm/helper.c index 5dc0d20a84..6acd87f5b9 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -3722,20 +3722,6 @@ static void ats_write64(CPUARMState *env, const ARMCPRegInfo *ri, } #endif -static const ARMCPRegInfo vapa_cp_reginfo[] = { - { .name = "PAR", .cp = 15, .crn = 7, .crm = 4, .opc1 = 0, .opc2 = 0, - .access = PL1_RW, .resetvalue = 0, - .bank_fieldoffsets = { offsetoflow32(CPUARMState, cp15.par_s), - offsetoflow32(CPUARMState, cp15.par_ns) }, - .writefn = par_write }, -#ifndef CONFIG_USER_ONLY - /* This underdecoding is safe because the reginfo is NO_RAW. */ - { .name = "ATS", .cp = 15, .crn = 7, .crm = 8, .opc1 = 0, .opc2 = CP_ANY, - .access = PL1_W, .accessfn = ats_access, - .writefn = ats_write, .type = ARM_CP_NO_RAW | ARM_CP_RAISES_EXC }, -#endif -}; - /* Return basic MPU access permission bits. */ static uint32_t simple_mpu_ap_bits(uint32_t val) { @@ -8904,6 +8890,27 @@ void register_cp_regs_for_features(ARMCPU *cpu) define_arm_cp_regs(cpu, generic_timer_cp_reginfo); } if (arm_feature(env, ARM_FEATURE_VAPA)) { + ARMCPRegInfo vapa_cp_reginfo[] = { + { .name = "PAR", .cp = 15, .crn = 7, .crm = 4, .opc1 = 0, .opc2 = 0, + .access = PL1_RW, .resetvalue = 0, + .bank_fieldoffsets = { offsetoflow32(CPUARMState, cp15.par_s), + offsetoflow32(CPUARMState, cp15.par_ns) }, + .writefn = par_write}, +#ifndef CONFIG_USER_ONLY + /* This underdecoding is safe because the reginfo is NO_RAW. */ + { .name = "ATS", .cp = 15, .crn = 7, .crm = 8, .opc1 = 0, .opc2 = CP_ANY, + .access = PL1_W, .accessfn = ats_access, + .writefn = ats_write, .type = ARM_CP_NO_RAW | ARM_CP_RAISES_EXC }, +#endif + }; + + /* + * When LPAE exists this 32-bit PAR register is an alias of the + * 64-bit AArch32 PAR register defined in lpae_cp_reginfo[] + */ + if (arm_feature(env, ARM_FEATURE_LPAE)) { + vapa_cp_reginfo[0].type = ARM_CP_ALIAS | ARM_CP_NO_GDB; + } define_arm_cp_regs(cpu, vapa_cp_reginfo); } if (arm_feature(env, ARM_FEATURE_CACHE_TEST_CLEAN)) { From patchwork Tue Nov 7 14:23:35 2023 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: 1861107 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=KevyJCli; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPr7l3C5Hz1yQK for ; Wed, 8 Nov 2023 01:24:19 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0Mzx-0004Ed-Px; Tue, 07 Nov 2023 09:24:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0Mzs-0004Cr-SJ for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:04 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Mzp-0007YF-Gj for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:04 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-32deb2809daso3403279f8f.3 for ; Tue, 07 Nov 2023 06:23:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367038; x=1699971838; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jKa4ph+IbACrmLp/l7KUj2enSm3dMfUXc05KWX4jlJA=; b=KevyJCliE4PnLVzDXFLJ/yNUU6KBLmNzK19OACMFRlH1hWCXzMBIZdZxUZxu8fcEbl a4e2frxF/7gUBVI4AL13aQnJ3SRdFfyhcll7Br9XqsOvHTMkSZPNmTMyTegWch4I1ve8 6MBTSXvVw4kwsXwu2cRttjrD2s57FqPN0w7G1pegNq9+LMjO1aPX+Wl/lOjbY10KE5t9 +ELsJ/RzkQeJrIOa0WyZreMuqzgQ6jSUafXyMKd1IiCYbeupfdxT57D8mS/Sokb+Tfzm f9va9TClpL5D1SJoQVL2Ik56FPvAUGhQB6qDOMlrsxAo3jAZOLB3v00UhX48DRrnbAHu 5w8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367038; x=1699971838; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jKa4ph+IbACrmLp/l7KUj2enSm3dMfUXc05KWX4jlJA=; b=OZDWAh9lH4B59vDG/XTTsgndryAhO9FMTAkdiWBSm12aZHW08feT4sFJNDCIe2582V 3fnj7beab7M0RyxisFk5gCWpJ21ULwm5Elx1xbOqPILZFWp5nd+u0TNiyZSRqm7Vfv4C K8w/UWjwBm90rvICdtdJDzVbWOOrXtx2YGN77XoaJ5ujzdfWLlDslxjMZDqgqKR+zXx6 OV7tArWeHdelG67NinVl42/0YYj2+bLi/gxmWvuZ4K6A+rjwm16lPc+BsY7XoFjhrWFu 2ETz2sRc4wexJ/xRnCNCaf/k1wO7W9HUu6j3I6+Wim3sZWiz0tTx49eAdOcu5Ba7EYTb eVzw== X-Gm-Message-State: AOJu0YyftLqFR3xkOhIb9f3KjIU5mtxjKUGI22FgBjfJ3AwK3bpcyoiA LIEjhmjvVjArTcBAP4W8OwymaA== X-Google-Smtp-Source: AGHT+IE7qYprY1z7qR1PiFwugXJZRofeFzSTVcJ17QkUYqJaL+LpOmdwsuWR6+a8uX6wVcuIsQuL1g== X-Received: by 2002:a5d:47c7:0:b0:32f:932b:e02f with SMTP id o7-20020a5d47c7000000b0032f932be02fmr19117539wrc.55.1699367038435; Tue, 07 Nov 2023 06:23:58 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id h6-20020adfe986000000b003200c918c81sm2457299wrm.112.2023.11.07.06.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:23:55 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id F344365759; Tue, 7 Nov 2023 14:23:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PULL 04/23] target/arm: hide all versions of DBGD[RS]AR from gdbstub Date: Tue, 7 Nov 2023 14:23:35 +0000 Message-Id: <20231107142354.3151266-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This avoids two duplicates being presented to gdbstub. As the registers are RAZ anyway it is unlikely their value would be of use to someone using gdbstub anyway. Acked-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-5-alex.bennee@linaro.org> diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c index 79a3659c0c..cbfba532f5 100644 --- a/target/arm/debug_helper.c +++ b/target/arm/debug_helper.c @@ -937,14 +937,14 @@ static const ARMCPRegInfo debug_cp_reginfo[] = { */ { .name = "DBGDRAR", .cp = 14, .crn = 1, .crm = 0, .opc1 = 0, .opc2 = 0, .access = PL0_R, .accessfn = access_tdra, - .type = ARM_CP_CONST, .resetvalue = 0 }, + .type = ARM_CP_CONST | ARM_CP_NO_GDB, .resetvalue = 0 }, { .name = "MDRAR_EL1", .state = ARM_CP_STATE_AA64, .opc0 = 2, .opc1 = 0, .crn = 1, .crm = 0, .opc2 = 0, .access = PL1_R, .accessfn = access_tdra, .type = ARM_CP_CONST, .resetvalue = 0 }, { .name = "DBGDSAR", .cp = 14, .crn = 2, .crm = 0, .opc1 = 0, .opc2 = 0, .access = PL0_R, .accessfn = access_tdra, - .type = ARM_CP_CONST, .resetvalue = 0 }, + .type = ARM_CP_CONST | ARM_CP_NO_GDB, .resetvalue = 0 }, /* Monitor debug system control register; the 32-bit alias is DBGDSCRext. */ { .name = "MDSCR_EL1", .state = ARM_CP_STATE_BOTH, .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 2, .opc2 = 2, @@ -1065,9 +1065,11 @@ static const ARMCPRegInfo debug_cp_reginfo[] = { static const ARMCPRegInfo debug_lpae_cp_reginfo[] = { /* 64 bit access versions of the (dummy) debug registers */ { .name = "DBGDRAR", .cp = 14, .crm = 1, .opc1 = 0, - .access = PL0_R, .type = ARM_CP_CONST | ARM_CP_64BIT, .resetvalue = 0 }, + .access = PL0_R, .type = ARM_CP_CONST | ARM_CP_64BIT | ARM_CP_NO_GDB, + .resetvalue = 0 }, { .name = "DBGDSAR", .cp = 14, .crm = 2, .opc1 = 0, - .access = PL0_R, .type = ARM_CP_CONST | ARM_CP_64BIT, .resetvalue = 0 }, + .access = PL0_R, .type = ARM_CP_CONST | ARM_CP_64BIT | ARM_CP_NO_GDB, + .resetvalue = 0 }, }; static void dbgwvr_write(CPUARMState *env, const ARMCPRegInfo *ri, From patchwork Tue Nov 7 14:23:36 2023 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: 1861113 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=QV+53/hu; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPr9J2w5Dz1yRH for ; Wed, 8 Nov 2023 01:25:40 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0E-0004Lg-0R; Tue, 07 Nov 2023 09:24:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0Mzu-0004Dh-NH for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:06 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Mzq-0007YQ-2i for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:05 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40850b244beso43394485e9.2 for ; Tue, 07 Nov 2023 06:24:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367039; x=1699971839; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X6TivXK1QWn2IjcuBDpLpSu+yTjCXvnnkWK/ZS63otI=; b=QV+53/hul0ahXtkH1gbYKDpBP0vuVj6CSaHUSxjqSLE9ws95X3Jb5Mjo2eG1xpQM3F avD6wTseNzsG0WorQDweQkeU07W/DSMyubU4m5TPJ2cEJ0rHrbhFQyyhsJouaqGHeiJN FPlfEo4NPeHBswGV/+yJXK/HD25+thi4q3dBAxEGjg5jN59dXRZjiv/d8nDYJf6gdAyl THxIDPCdT3pbpQP/EE6+FLiPBUbgsQQXitmPSwe47FqHsNRAHiyZLFaKs4NE7VlUXX7Z Rr//Ttankqz7hbbEI2XBGu8hRedU6+ljs+gRrkEDp7If0EVW607omxpga8djSbmZxAlW XPLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367039; x=1699971839; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X6TivXK1QWn2IjcuBDpLpSu+yTjCXvnnkWK/ZS63otI=; b=xLd+UBUYe0vxaqGCu0+hWZypl+4PwJn6f6nGtXUnci8COfhYSO7EC2f4f6hZ/RS/KC +/+rWTIj9HGANniB4RTdSs22q3RhEfaCQdGh1srFdKFbENNquyn/p7cFhaGIADrQtxHV adcIKeVQBf4WTax+fJfoxwJyH4YFUv2c97TkYN6KknENfEIQ5OTx8n/GqD/cibLS2wdv 61rVX3x4/qwI7/vmmSOyfvW+H1NZBzZcHeR3juPZj24hG+3RjROZ/cbVElRWyzR0JRFA 95vcaYVHBDEQCZOnINLsc691KV2OsUK5hiQ+HGbgP11feK82/MYZ3ckFtde7NxoXqzdt PncA== X-Gm-Message-State: AOJu0YzaY67dLhdUXiIgF6latfceE6hBFD89mZXGE7d6vCc61Hf2COl0 xpamQ1GyzK0sOwisYCktlKJN0X3ezY1OAj/Qr7cZEg== X-Google-Smtp-Source: AGHT+IHLrvKxauX65NkKzDbgI5IQE725HayVhU+u+m6wg2sjfSMca0X03L+R1ImXtZ074pOLaWMXWQ== X-Received: by 2002:a05:600c:4451:b0:409:5a1a:fe16 with SMTP id v17-20020a05600c445100b004095a1afe16mr2604121wmn.28.1699367039043; Tue, 07 Nov 2023 06:23:59 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id iv12-20020a05600c548c00b0040641a9d49bsm16047128wmb.17.2023.11.07.06.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:23:58 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 13CB66575A; Tue, 7 Nov 2023 14:23:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PULL 05/23] target/arm: hide aliased MIDR from gdbstub Date: Tue, 7 Nov 2023 14:23:36 +0000 Message-Id: <20231107142354.3151266-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is just a constant alias register with the same value as the "other" MIDR so it serves no purpose being presented to gdbstub. Signed-off-by: Alex Bennée Reviewed-by: Peter Maydell Message-Id: <20231106185112.2755262-6-alex.bennee@linaro.org> diff --git a/target/arm/helper.c b/target/arm/helper.c index 6acd87f5b9..ff1970981e 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9000,7 +9000,7 @@ void register_cp_regs_for_features(ARMCPU *cpu) .type = ARM_CP_CONST, .resetvalue = cpu->revidr }, }; ARMCPRegInfo id_v8_midr_alias_cp_reginfo = { - .name = "MIDR", .type = ARM_CP_ALIAS | ARM_CP_CONST, + .name = "MIDR", .type = ARM_CP_ALIAS | ARM_CP_CONST | ARM_CP_NO_GDB, .cp = 15, .crn = 0, .crm = 0, .opc1 = 0, .opc2 = 4, .access = PL1_R, .resetvalue = cpu->midr }; From patchwork Tue Nov 7 14:23:37 2023 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: 1861125 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=DI5z4Pdk; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrH760cvz1yQL for ; Wed, 8 Nov 2023 01:30:43 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0M-0004XG-B8; Tue, 07 Nov 2023 09:24:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0Mzy-0004FH-FP for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:12 -0500 Received: from mail-lj1-x235.google.com ([2a00:1450:4864:20::235]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Mzv-0007ac-JY for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:10 -0500 Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2c6b30aca06so75539991fa.3 for ; Tue, 07 Nov 2023 06:24:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367045; x=1699971845; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Mkk1WmfSZh50CCsgGgBZhn4Gb3d1L0DReMlnN2yJA0U=; b=DI5z4PdkfLN5+HF+Kn+ylfbrRoYZ3oL9Exex3vpbASa9RfVt1itfGTmHyXXMN6+PRX fNFMzdLxZf7Z7mXE2vWLenO4h4f/u6SnH4QhBa8cTBvxdSsMXws9+ZYD9KlHI/DGHa9P GTurQM81PC0yI+nvBQ+Ow/JE8e7Le45uwH50gATMKf3Tbxa5sk0kSaU86Mr3QSVFrJRv jG/PpKeVrv2h9QDpFyu3JM0oILaTtb0qsVlMN1Q7C5zmljuSWOWuFSByiDJODfIQr5mG LwaPNUWhk+rg8VKhGADY8pUVxTEMn3UP0hiDH0yd0HOgEqbnGUUwuCkRyPsBKJC5npXj TvTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367045; x=1699971845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Mkk1WmfSZh50CCsgGgBZhn4Gb3d1L0DReMlnN2yJA0U=; b=ZdJnPU/RaXTNOGX6JPJQjvSroILbszLM/ZSnKIkCU5rsJXxrVC8W1c2VseQHqiUQUZ 6reoUwAXWbC8NFX22VdBEiAATAjTHRITTe+JhBqhou+PusMaqlMjK8NjZqdejyrIHwet fDoijQ+GiAAd/2aV4cTCf5cVz845zKtKsOkzTDnayE1zEXmxQnH7Sd0x2ZKuKhATMNW+ TEbm63ZwnWJbpAj8R01rwij2Tq2iaIeD/QgQIpGOlpeXuy6ErzmX5ibhmPcITlHqFk/r ZVnOOwcVnd6KzKWN1zxWnCgh46AoWnVe71PbKiqXXiv1/TTzv1oDoo6RBnTGrUMkWqDn Didw== X-Gm-Message-State: AOJu0Yxpvo+Z97JN75G83olfckNCizSDscrc7zvGBZDuRjKXsELH+Pf/ if0KnhAZQzIxjon6AlGOcFmjcPoK4BDyaeobixjUEQ== X-Google-Smtp-Source: AGHT+IGF+cDd0DfVLJsGrcHnkcOHnRnY4YkegBIYKLTe4aEDjKvYA1l2LKG12XxpAaktyxe0Yp779g== X-Received: by 2002:a05:651c:2109:b0:2c2:c1f6:3097 with SMTP id a9-20020a05651c210900b002c2c1f63097mr33089719ljq.22.1699367045439; Tue, 07 Nov 2023 06:24:05 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m26-20020a05600c3b1a00b00407752bd834sm16056503wms.1.2023.11.07.06.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:23:58 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2F7386575C; Tue, 7 Nov 2023 14:23:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Akihiko Odaki , Luis Machado , Ilya Leoshkevich , qemu-s390x@nongnu.org, Nicholas Piggin , Daniel Henrique Barboza , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?C?= =?utf-8?q?=C3=A9dric_Le_Goater?= , Richard Henderson , David Hildenbrand Subject: [PULL 06/23] tests/tcg: add an explicit gdbstub register tester Date: Tue, 7 Nov 2023 14:23:37 +0000 Message-Id: <20231107142354.3151266-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::235; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x235.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We already do a couple of "info registers" for specific tests but this is a more comprehensive multiarch test. It also has some output helpful for debugging the gdbstub by showing which XML features are advertised and what the underlying register numbers are. My initial motivation was to see if there are any duplicate register names exposed via the gdbstub while I was reviewing the proposed register interface for TCG plugins. Mismatches between the xml and remote-desc are reported for debugging but do not fail the test. We also skip the tests for the following arches for now until we can investigate and fix any issues: - s390x (fails to read v0l->v15l, not seen in remote-registers) - ppc64 (fails to read vs0h->vs31h, not seen in remote-registers) Cc: Akihiko Odaki Cc: Luis Machado Cc: Ilya Leoshkevich Cc: qemu-s390x@nongnu.org Cc: Nicholas Piggin Cc: Daniel Henrique Barboza Cc: qemu-ppc@nongnu.org Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-7-alex.bennee@linaro.org> diff --git a/MAINTAINERS b/MAINTAINERS index b86ea7f75a..26e7633346 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2927,7 +2927,7 @@ F: gdbstub/* F: include/exec/gdbstub.h F: include/gdbstub/* F: gdb-xml/ -F: tests/tcg/multiarch/gdbstub/ +F: tests/tcg/multiarch/gdbstub/* F: scripts/feature_to_c.py F: scripts/probe-gdb-support.py diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index f3bfaf1a22..d31ba8d6ae 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -93,12 +93,21 @@ run-gdbstub-thread-breakpoint: testthread --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(MULTIARCH_SRC)/gdbstub/test-thread-breakpoint.py, \ hitting a breakpoint on non-main thread) + +run-gdbstub-registers: sha512 + $(call run-test, $@, $(GDB_SCRIPT) \ + --gdb $(GDB) \ + --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ + --bin $< --test $(MULTIARCH_SRC)/gdbstub/registers.py, \ + checking register enumeration) + else run-gdbstub-%: $(call skip-test, "gdbstub test $*", "need working gdb with $(patsubst -%,,$(TARGET_NAME)) support") endif EXTRA_RUNS += run-gdbstub-sha1 run-gdbstub-qxfer-auxv-read \ - run-gdbstub-proc-mappings run-gdbstub-thread-breakpoint + run-gdbstub-proc-mappings run-gdbstub-thread-breakpoint \ + run-gdbstub-registers # ARM Compatible Semi Hosting Tests # diff --git a/tests/tcg/multiarch/gdbstub/registers.py b/tests/tcg/multiarch/gdbstub/registers.py new file mode 100644 index 0000000000..ff6076b09e --- /dev/null +++ b/tests/tcg/multiarch/gdbstub/registers.py @@ -0,0 +1,197 @@ +# Exercise the register functionality by exhaustively iterating +# through all supported registers on the system. +# +# This is launched via tests/guest-debug/run-test.py but you can also +# call it directly if using it for debugging/introspection: +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import gdb +import sys +import xml.etree.ElementTree as ET + +initial_vlen = 0 +failcount = 0 + +def report(cond, msg): + "Report success/fail of test." + if cond: + print("PASS: %s" % (msg)) + else: + print("FAIL: %s" % (msg)) + global failcount + failcount += 1 + + +def fetch_xml_regmap(): + """ + Iterate through the XML descriptions and validate. + + We check for any duplicate registers and report them. Return a + reg_map hash containing the names, regnums and initial values of + all registers. + """ + + # First check the XML descriptions we have sent. Most arches + # support XML but a few of the ancient ones don't in which case we + # need to gracefully fail. + + try: + xml = gdb.execute("maint print xml-tdesc", False, True) + except (gdb.error): + print("SKIP: target does not support XML") + return None + + total_regs = 0 + reg_map = {} + frame = gdb.selected_frame() + + tree = ET.fromstring(xml) + for f in tree.findall("feature"): + name = f.attrib["name"] + regs = f.findall("reg") + + total = len(regs) + total_regs += total + base = int(regs[0].attrib["regnum"]) + top = int(regs[-1].attrib["regnum"]) + + print(f"feature: {name} has {total} registers from {base} to {top}") + + for r in regs: + name = r.attrib["name"] + regnum = int(r.attrib["regnum"]) + try: + value = frame.read_register(name) + except ValueError: + report(False, f"failed to read reg: {name}") + + entry = { "name": name, "initial": value, "regnum": regnum } + + if name in reg_map: + report(False, f"duplicate register {entry} vs {reg_map[name]}") + continue + + reg_map[name] = entry + + # Validate we match + report(total_regs == len(reg_map.keys()), + f"counted all {total_regs} registers in XML") + + return reg_map + +def crosscheck_remote_xml(reg_map): + """ + Cross-check the list of remote-registers with the XML info. + """ + + remote = gdb.execute("maint print remote-registers", False, True) + r_regs = remote.split("\n") + + total_regs = len(reg_map.keys()) + total_r_regs = 0 + + for r in r_regs: + fields = r.split() + # Some of the registers reported here are "pseudo" registers that + # gdb invents based on actual registers so we need to filter them + # out. + if len(fields) == 8: + r_name = fields[0] + r_regnum = int(fields[6]) + + # check in the XML + try: + x_reg = reg_map[r_name] + except KeyError: + report(False, f"{r_name} not in XML description") + continue + + x_reg["seen"] = True + x_regnum = x_reg["regnum"] + if r_regnum != x_regnum: + report(False, f"{r_name} {r_regnum} == {x_regnum} (xml)") + else: + total_r_regs += 1 + + # Just print a mismatch in totals as gdb will filter out 64 bit + # registers on a 32 bit machine. Also print what is missing to + # help with debug. + if total_regs != total_r_regs: + print(f"xml-tdesc has ({total_regs}) registers") + print(f"remote-registers has ({total_r_regs}) registers") + + for x_key in reg_map.keys(): + x_reg = reg_map[x_key] + if "seen" not in x_reg: + print(f"{x_reg} wasn't seen in remote-registers") + +def complete_and_diff(reg_map): + """ + Let the program run to (almost) completion and then iterate + through all the registers we know about and report which ones have + changed. + """ + # Let the program get to the end and we can check what changed + b = gdb.Breakpoint("_exit") + if b.pending: # workaround Microblaze weirdness + b.delete() + gdb.Breakpoint("_Exit") + + gdb.execute("continue") + + frame = gdb.selected_frame() + changed = 0 + + for e in reg_map.values(): + name = e["name"] + old_val = e["initial"] + + try: + new_val = frame.read_register(name) + except: + report(False, f"failed to read {name} at end of run") + continue + + if new_val != old_val: + print(f"{name} changes from {old_val} to {new_val}") + changed += 1 + + # as long as something changed we can be confident its working + report(changed > 0, f"{changed} registers were changed") + + +def run_test(): + "Run through the tests" + + reg_map = fetch_xml_regmap() + + if reg_map is not None: + crosscheck_remote_xml(reg_map) + complete_and_diff(reg_map) + + +# +# This runs as the script it sourced (via -x, via run-test.py) +# +try: + inferior = gdb.selected_inferior() + arch = inferior.architecture() + print("ATTACHED: %s" % arch.name()) +except (gdb.error, AttributeError): + print("SKIPPING (not connected)", file=sys.stderr) + exit(0) + +if gdb.parse_and_eval('$pc') == 0: + print("SKIP: PC not set") + exit(0) + +try: + run_test() +except (gdb.error): + print ("GDB Exception: %s" % (sys.exc_info()[0])) + failcount += 1 + pass + +print("All tests complete: %d failures" % failcount) +exit(failcount) diff --git a/tests/tcg/multiarch/system/Makefile.softmmu-target b/tests/tcg/multiarch/system/Makefile.softmmu-target index dee4f58dea..32dc0f9830 100644 --- a/tests/tcg/multiarch/system/Makefile.softmmu-target +++ b/tests/tcg/multiarch/system/Makefile.softmmu-target @@ -48,9 +48,20 @@ run-gdbstub-untimely-packet: hello $(call quiet-command, \ (! grep -Fq 'Packet instead of Ack, ignoring it' untimely-packet.gdb.err), \ "GREP", file untimely-packet.gdb.err) + +run-gdbstub-registers: memory + $(call run-test, $@, $(GDB_SCRIPT) \ + --gdb $(GDB) \ + --qemu $(QEMU) \ + --output $<.registers.gdb.out \ + --qargs \ + "-monitor none -display none -chardev file$(COMMA)path=$<.out$(COMMA)id=output $(QEMU_OPTS)" \ + --bin $< --test $(MULTIARCH_SRC)/gdbstub/registers.py, \ + softmmu gdbstub support) else run-gdbstub-%: $(call skip-test, "gdbstub test $*", "need working gdb with $(patsubst -%,,$(TARGET_NAME)) support") endif -MULTIARCH_RUNS += run-gdbstub-memory run-gdbstub-interrupt run-gdbstub-untimely-packet +MULTIARCH_RUNS += run-gdbstub-memory run-gdbstub-interrupt \ + run-gdbstub-untimely-packet run-gdbstub-registers diff --git a/tests/tcg/ppc64/Makefile.target b/tests/tcg/ppc64/Makefile.target index 5721c159f2..1d08076756 100644 --- a/tests/tcg/ppc64/Makefile.target +++ b/tests/tcg/ppc64/Makefile.target @@ -38,4 +38,11 @@ PPC64_TESTS += signal_save_restore_xer PPC64_TESTS += xxspltw PPC64_TESTS += test-aes +ifneq ($(GDB),) +# Skip for now until vsx registers sorted out +run-gdbstub-registers: + $(call skip-test, $<, "BROKEN reading VSX registers") +endif + + TESTS += $(PPC64_TESTS) diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.target index 826f0a18e4..49af091c38 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -100,6 +100,10 @@ run-gdbstub-svc: hello-s390x-asm --bin $< --test $(S390X_SRC)/gdbstub/test-svc.py, \ single-stepping svc) +# Skip for now until vx registers sorted out +run-gdbstub-registers: + $(call skip-test, $<, "BROKEN reading VX registers") + EXTRA_RUNS += run-gdbstub-signals-s390x run-gdbstub-svc endif From patchwork Tue Nov 7 14:23:38 2023 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: 1861123 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=we8g5SAT; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrFz32pLz1yQg for ; Wed, 8 Nov 2023 01:29:43 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0N-0004XT-6d; Tue, 07 Nov 2023 09:24:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0Mzu-0004Dk-PB for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:06 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Mzr-0007Yt-6o for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:06 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4083f61322fso41718905e9.1 for ; Tue, 07 Nov 2023 06:24:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367042; x=1699971842; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nzv3ijX6aA4Ef+mTXMoyBo/VonVr+hfDPrYo/eu8U5o=; b=we8g5SATC0f0WEFU9jotrEvpRra6ESAJnbd8lK4+nPSN/63kBLwJhyzyACgIDbhk0B giIxJKY73UcmTwFW6cr3iFdUKi4XVq6d/+VJu+xQIi1XnON6ZMxXYpanUO/+i+e4pA64 DxrZbY3vFlw+FDVKMUMVDjhXdaGQmkgUZVhMpXyYDS/3ghEsCETCsjdkyWCu3Q9dFla/ FFyakwtB7oQo1MHWnhxBy42w+j8mgakKshxM37IwLYwrMX0syu8LKswpLRFXlHRnQ8VA adnWlF53qqVzULZo27rDsx4QoiZI2uYAX3K68GJ1n2/QFUiClkr1kMRtAR5PIe0c+6P2 61gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367042; x=1699971842; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nzv3ijX6aA4Ef+mTXMoyBo/VonVr+hfDPrYo/eu8U5o=; b=WSkQAbKGPQRwNNl4ot+Mkc2xDQ7+yRz+OC7N5Ng9GNv5G9JY/ikXZDHFK8FYaLQfiH ztyULz8HMFq5ysL87UCbvFaasrIo0Rfs0usPAi162WfyE0RVIYTlkZEc1qJVTC1iq1u7 itKrpSzLwjXV4RzDzm4bYUFbP1TW6GR3ut/5znI7YYCZF8ZnEwr6A796JN7Jl4q3hSUW vgaqZ35GkGRrtfuhxZjHQPx/HTsrSwYpXfDEvXTpf3qkk+YHOyxCnNIfO8r8QO/e9lJO e0jHgsMzvpZq80L1/GkxLYxtNNbSCSeJTbUQKpJQ5qoE7al7HqQUOLlZP/HeG9XpW8Hq cghw== X-Gm-Message-State: AOJu0YyOfbBBwJiVWgo5xWWOcRJ2wJEc6c7v/RYMsiDQs+gIuZrELPjo Wg8coIbAkZ/ceae8Cr/9OVi3Kg== X-Google-Smtp-Source: AGHT+IHZiFbBOEiNHd37XNfd2owQyZh8LDB/c88LQs83ZvXb0iXDzn61N0UjYDur5ymwOZIlxbmtDw== X-Received: by 2002:a05:600c:4fc8:b0:404:f9c1:d5d7 with SMTP id o8-20020a05600c4fc800b00404f9c1d5d7mr2354983wmq.25.1699367041931; Tue, 07 Nov 2023 06:24:01 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id bh5-20020a05600c3d0500b004094e565e71sm16446623wmb.23.2023.11.07.06.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:23:58 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 446516575D; Tue, 7 Nov 2023 14:23:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Alexandre Iooss , Mahmoud Mandour , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 07/23] tests/avocado: update the tcg_plugins test Date: Tue, 7 Nov 2023 14:23:38 +0000 Message-Id: <20231107142354.3151266-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org There are a number of things that are broken on the test currently so lets fix that up: - replace retired Debian kernel for tuxrun_baseline one - remove "detected repeat instructions test" since ea185a55 - log total counted instructions/memory accesses Acked-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-8-alex.bennee@linaro.org> diff --git a/tests/avocado/tcg_plugins.py b/tests/avocado/tcg_plugins.py index 642d2e49e3..15fd87b2c1 100644 --- a/tests/avocado/tcg_plugins.py +++ b/tests/avocado/tcg_plugins.py @@ -54,13 +54,11 @@ def run_vm(self, kernel_path, kernel_command_line, class PluginKernelNormal(PluginKernelBase): def _grab_aarch64_kernel(self): - kernel_url = ('http://security.debian.org/' - 'debian-security/pool/updates/main/l/linux-signed-arm64/' - 'linux-image-4.19.0-12-arm64_4.19.152-1_arm64.deb') - kernel_sha1 = '2036c2792f80ac9c4ccaae742b2e0a28385b6010' - kernel_deb = self.fetch_asset(kernel_url, asset_hash=kernel_sha1) - kernel_path = self.extract_from_deb(kernel_deb, - "/boot/vmlinuz-4.19.0-12-arm64") + kernel_url = ('https://storage.tuxboot.com/20230331/arm64/Image') + kernel_sha256 = 'ce95a7101a5fecebe0fe630deee6bd97b32ba41bc8754090e9ad8961ea8674c7' + kernel_path = self.fetch_asset(kernel_url, + asset_hash=kernel_sha256, + algorithm = "sha256") return kernel_path def test_aarch64_virt_insn(self): @@ -88,6 +86,10 @@ def test_aarch64_virt_insn(self): m = re.search(br"insns: (?P\d+)", s) if "count" not in m.groupdict(): self.fail("Failed to find instruction count") + else: + count = int(m.group("count")) + self.log.info(f"Counted: {count} instructions") + def test_aarch64_virt_insn_icount(self): """ @@ -111,9 +113,13 @@ def test_aarch64_virt_insn_icount(self): with plugin_log as lf, \ mmap.mmap(lf.fileno(), 0, access=mmap.ACCESS_READ) as s: - m = re.search(br"detected repeat execution @ (?P0x[0-9A-Fa-f]+)", s) - if m is not None and "addr" in m.groupdict(): - self.fail("detected repeated instructions") + + m = re.search(br"insns: (?P\d+)", s) + if "count" not in m.groupdict(): + self.fail("Failed to find instruction count") + else: + count = int(m.group("count")) + self.log.info(f"Counted: {count} instructions") def test_aarch64_virt_mem_icount(self): """ @@ -145,3 +151,5 @@ def test_aarch64_virt_mem_icount(self): callback = int(m[1]) if inline != callback: self.fail("mismatched access counts") + else: + self.log.info(f"Counted {inline} memory accesses") From patchwork Tue Nov 7 14:23:39 2023 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: 1861111 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=B+ZRwc0j; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPr8T4ym4z1yQK for ; Wed, 8 Nov 2023 01:24:57 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0I-0004R2-9T; Tue, 07 Nov 2023 09:24:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0Mzu-0004Dj-OE for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:06 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Mzr-0007Yl-4X for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:06 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40859c464daso42043375e9.1 for ; Tue, 07 Nov 2023 06:24:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367041; x=1699971841; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZHYLdqoLGtFuY3dzHamisw3eOa1TzTuGsjgcCCYH8rk=; b=B+ZRwc0jSuS7pL+pbu6p+1u56svsNITOIZO7mX/W1AOjza7u9SQxsEuiluArzou7iV kQjRjfUfMpWZBrxyAu8n89xNJQgLM90oBoQN+aCq2fS/F0LzXKE+AZ4xr33SCm9vmQM1 gXGSLAA0MXRaMRNL2EKHOSwQmFhkTE4gcPoBTCySPsxcyV5BYQXwXAY5dUWlG7P9/kjK ETHwwteBrXsOUZRS7wnTke/KF+qigglngO5VZSIfhT7m9P8CDCgpPe1SCjydUV1i2gXj Jc5HhRE2RPd/FGc/UON5XyYjbeBhqdYgrsj5ra4VQ8lJDKDl8TPym3Z9lukthtgBquMS 2vcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367041; x=1699971841; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZHYLdqoLGtFuY3dzHamisw3eOa1TzTuGsjgcCCYH8rk=; b=pX8yda0ROjKuoA7uJLb8Tu5Zq4fyBQQ5K9uRhV0+0r7hfWEKne6BbZJCv+tQUHbtAQ jmgDOM5gCSf3Gtq67z3qTSQlzZgKFSychzrELUc0jnk51SWGhxsFZOaTyARECsuJlNL+ 8va+wIJpM3fGdtCPB7YHro1GNucgDcaNXiAQd84U2V2Qr0fKnwijs2pD84bZkaB5I3Be GYmjtKsoZe8sGtnuy4aiVGFhEC2bWHEuBcTiOMw/6QRVCC3CwoalIywjcCOfkx2N7AE9 0hvF/CnmBzqKmARQS2HbixGCmn1TYakowEM/+MrngRx8EA+ugbhDD5B38ZRZF8KhH1q5 bDrA== X-Gm-Message-State: AOJu0YzQ0BGgHqxWDcckWvfR52afZDuonnk20K7JcOc5/B9/0C68NEcJ uzp1jSHaF0sL+i8lBdck4BpJ2Q== X-Google-Smtp-Source: AGHT+IHFzcgOpGKvgzMhPvspSFjR6W5wrvnbTAt03RpnisTb9217TmjSFRIDesppNjEquQ31/l5y9Q== X-Received: by 2002:a05:6000:381:b0:32d:ae31:458c with SMTP id u1-20020a056000038100b0032dae31458cmr25341665wrf.33.1699367041668; Tue, 07 Nov 2023 06:24:01 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id i16-20020a5d55d0000000b0032d8354fb43sm2504414wrw.76.2023.11.07.06.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:23:58 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 59C636575E; Tue, 7 Nov 2023 14:23:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , John Snow , Cleber Rosa Subject: [PULL 08/23] gdbstub: Add num_regs member to GDBFeature Date: Tue, 7 Nov 2023 14:23:39 +0000 Message-Id: <20231107142354.3151266-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Akihiko Odaki Currently the number of registers exposed to GDB is written as magic numbers in code. Derive the number of registers GDB actually see from XML files to replace the magic numbers in code later. Signed-off-by: Akihiko Odaki Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20231025093128.33116-2-akihiko.odaki@daynix.com> Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-9-alex.bennee@linaro.org> diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index 1a01c35f8e..a43aa34dad 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -13,6 +13,7 @@ typedef struct GDBFeature { const char *xmlname; const char *xml; + int num_regs; } GDBFeature; diff --git a/scripts/feature_to_c.py b/scripts/feature_to_c.py index bcbcb83beb..e04d6b2df7 100644 --- a/scripts/feature_to_c.py +++ b/scripts/feature_to_c.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # SPDX-License-Identifier: GPL-2.0-or-later -import os, sys +import os, sys, xml.etree.ElementTree def writeliteral(indent, bytes): sys.stdout.write(' ' * indent) @@ -39,10 +39,52 @@ def writeliteral(indent, bytes): with open(input, 'rb') as file: read = file.read() + parser = xml.etree.ElementTree.XMLPullParser(['start', 'end']) + parser.feed(read) + events = parser.read_events() + event, element = next(events) + if event != 'start': + sys.stderr.write(f'unexpected event: {event}\n') + exit(1) + if element.tag != 'feature': + sys.stderr.write(f'unexpected start tag: {element.tag}\n') + exit(1) + + regnum = 0 + regnums = [] + tags = ['feature'] + for event, element in events: + if event == 'end': + if element.tag != tags[len(tags) - 1]: + sys.stderr.write(f'unexpected end tag: {element.tag}\n') + exit(1) + + tags.pop() + if element.tag == 'feature': + break + elif event == 'start': + if len(tags) < 2 and element.tag == 'reg': + if 'regnum' in element.attrib: + regnum = int(element.attrib['regnum']) + + regnums.append(regnum) + regnum += 1 + + tags.append(element.tag) + else: + raise Exception(f'unexpected event: {event}\n') + + if len(tags): + sys.stderr.write('unterminated feature tag\n') + exit(1) + + base_reg = min(regnums) + num_regs = max(regnums) - base_reg + 1 if len(regnums) else 0 + sys.stdout.write(' {\n') writeliteral(8, bytes(os.path.basename(input), 'utf-8')) sys.stdout.write(',\n') writeliteral(8, read) - sys.stdout.write('\n },\n') + sys.stdout.write(f',\n {num_regs},\n }},\n') sys.stdout.write(' { NULL }\n};\n') From patchwork Tue Nov 7 14:23:40 2023 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: 1861122 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=Bh2YMPwM; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrFy0w6Bz1yRH for ; Wed, 8 Nov 2023 01:29:42 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0O-0004Xo-1V; Tue, 07 Nov 2023 09:24:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0Mzv-0004EG-Q8 for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:08 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Mzt-0007Zq-3Q for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:07 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4084de32db5so49506185e9.0 for ; Tue, 07 Nov 2023 06:24:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367043; x=1699971843; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TCUM1KTtV0lNE+xPv3unN8jBYCV0t3kSWslOuRVU4wE=; b=Bh2YMPwMJ9VvykRZuhJmijisaurKqngaibw903L0mlBYmKvSkBjX4iRdEsW7H56s8W e0qwSDwT2oLXz13nUOGTKOPqUleR6PnUgCp3hH3K2ZgBvN4nm8UWZR9zAzbMdSuCSF5T 1/+cl+9MR1FI15gV+Zeia3LDVtwwgkuOnHS9RZcq534q1IUKvw6/A1o77/0kkyxRJH9Z LtivUpUCe/zkJsYbQZVhu/DE296jNxsKadj3RXuMxRdrKQ6Zwb4QKCFuejlpzLt9Vry7 nnf3kY1TuCYrZJMF+JKkyoydXUNwuWFgDdUacM06lO6RPvPt86QMYOx6DlJZ7FN32kLR 2wnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367043; x=1699971843; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TCUM1KTtV0lNE+xPv3unN8jBYCV0t3kSWslOuRVU4wE=; b=ltdjqQmTCJoNxqvgcOTRFvxIj1G0FHZ0Y8+zss3SlP5FSrpZXKhI1T05q/LkiQFHHA bNf5pb7L/pQAC8iW8kXzZBPVNvV/WUYi2OPVWUQNlTw0scm/ufRMlP2SdPXUXnJYNNJn DFqIli6REzE1ikaTMCUmNs7bbhISvJfsAkHuR50iHqsqTgCA7Vp16FfHCZXtdB0eEkBe 3tLxL4+lNFPoVRxfCE/oywp89Qri5KasyDFaxcVQV7hynzpr5f0yw9/P1JIa/gH1Nqh+ 2heWDTi+bPa0jSc0aq51Wvnxavaa1MN6SDyd/yNvmdDXCeXsRLkRc8Vpvf/I22ndRAQ5 tKcA== X-Gm-Message-State: AOJu0Yz/n092WJJGNb1HtrMysRwp+Yl17fjgkTi+SHkTEhKXdMKZis8M I8BvD3ahcKPYl0qUAu0gwWWoog== X-Google-Smtp-Source: AGHT+IGNGzOHaSt6b31r5NrSrgouRNywPuUkZrufKsro3l21Cc0nuWH8a7g5Rn6/ePcjI3rCNcThDw== X-Received: by 2002:a7b:c5cc:0:b0:404:4b6f:d705 with SMTP id n12-20020a7bc5cc000000b004044b6fd705mr2484239wmk.17.1699367043500; Tue, 07 Nov 2023 06:24:03 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id e22-20020a05600c109600b0040523bef620sm6709710wmd.0.2023.11.07.06.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:23:58 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 6E4466575F; Tue, 7 Nov 2023 14:23:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Subject: [PULL 09/23] gdbstub: Introduce gdb_find_static_feature() Date: Tue, 7 Nov 2023 14:23:40 +0000 Message-Id: <20231107142354.3151266-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Akihiko Odaki This function is useful to determine the number of registers exposed to GDB from the XML name. Signed-off-by: Akihiko Odaki Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20231025093128.33116-3-akihiko.odaki@daynix.com> Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-10-alex.bennee@linaro.org> diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index a43aa34dad..7fe00506c7 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -44,6 +44,14 @@ void gdb_register_coprocessor(CPUState *cpu, */ int gdbserver_start(const char *port_or_device); +/** + * gdb_find_static_feature() - Find a static feature. + * @xmlname: The name of the XML. + * + * Return: The static feature. + */ +const GDBFeature *gdb_find_static_feature(const char *xmlname); + void gdb_set_stop_cpu(CPUState *cpu); /* in gdbstub-xml.c, generated by scripts/feature_to_c.py */ diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 29540a0284..ae24c4848f 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -422,6 +422,19 @@ static const char *get_feature_xml(const char *p, const char **newp, return NULL; } +const GDBFeature *gdb_find_static_feature(const char *xmlname) +{ + const GDBFeature *feature; + + for (feature = gdb_static_features; feature->xmlname; feature++) { + if (!strcmp(feature->xmlname, xmlname)) { + return feature; + } + } + + g_assert_not_reached(); +} + static int gdb_read_register(CPUState *cpu, GByteArray *buf, int reg) { CPUClass *cc = CPU_GET_CLASS(cpu); From patchwork Tue Nov 7 14:23:41 2023 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: 1861108 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=Cznd68PX; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPr8810SNz1yRH for ; Wed, 8 Nov 2023 01:24:40 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0D-0004Lh-Vp; Tue, 07 Nov 2023 09:24:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0Mzw-0004EP-HI for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:09 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Mzu-0007Zy-CT for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:07 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-32fe1a29010so368037f8f.0 for ; Tue, 07 Nov 2023 06:24:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367044; x=1699971844; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=suLqpGfBVG7ThOgluqJcKn5BkWpm3J+H+wT05/2ihKs=; b=Cznd68PXxEL7z4536zKvT++fj9n8RO6iWRMHjidE7WuRnTqtUPEVavj9lOoWigUi4d ggrzbvs4wLpDgtGXSTlSewi0YJB8G6gTsNghbvhHqqj686i9/xBDF9SKlT0i8L9JXLN8 30VzxIJ8I5hJTuai6qp/RCVc/M8K4BZO467yrfZDa0gOewfWjnZJdTp7nUVKkZkzzkbV yCvpPoF+3LPUEiIa2nVXYWcbjBc9SfbJWP7L28F+VBsj/jS/btUINid9eFeZsYbHVKQw LUQzWp6Lx4fnZrWo7GvfSlWjjyizaCBW5FseF6Ooq4lYJ4KMNeoMz7lyARfmGxsj72Un tEzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367044; x=1699971844; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=suLqpGfBVG7ThOgluqJcKn5BkWpm3J+H+wT05/2ihKs=; b=AX3C7GHxUp03dLEYjiKWaC1VQEgonp33Syo14DCtRtdGv3IZ+7Ws8OxHjaWyJA/eRs Nfa26oRJ/yB6TpvDCbRcN3mS9HKjmdDANEBt4KJysIxfSR7BvxItZTLbP8Mstb8MrvVs BuFXcwXMcHMfEzFmJT/C3XL9Ff8sQyL6NYlny+Yywt5uKEe6pJd7JQHe3eOx6liKND32 xVfc+ihAdKhJ5/2r2/pf6fDXDsrzBGCTQPkc7xCJn8Hh0h+XKHrkvZa8f85XHtJWLvam 76raY6caqdzr12KsiA/ATaj5russlp2KUbRTu1pfGw/gtjbrI3eKqTi2T4M1Qe/0hlF2 upUg== X-Gm-Message-State: AOJu0Yy9ijaxiYfURrZ33I2gEtzxnV4C2Hkc9aXTJMtcB161Tlv4XyW7 j4RU/QeoYJGkShGfEl/fCJ9IMtHbZmvWm9+xHbjwTw== X-Google-Smtp-Source: AGHT+IHeTXbWBDNTzOC/eVcBG4Fodiejunaa/nTrFLntnTKFfMJzmDi8WIeDLjkD3DjzuD/YXgzcgw== X-Received: by 2002:a5d:6051:0:b0:32d:a4c4:f700 with SMTP id j17-20020a5d6051000000b0032da4c4f700mr22864163wrt.38.1699367043779; Tue, 07 Nov 2023 06:24:03 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l2-20020a5d4bc2000000b0032da319a27asm2497290wrt.9.2023.11.07.06.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:23:58 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 82E4765760; Tue, 7 Nov 2023 14:23:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Akihiko Odaki , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 10/23] gdbstub: Introduce GDBFeatureBuilder Date: Tue, 7 Nov 2023 14:23:41 +0000 Message-Id: <20231107142354.3151266-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Akihiko Odaki GDBFeatureBuilder unifies the logic to generate dynamic GDBFeature. Signed-off-by: Akihiko Odaki Reviewed-by: Richard Henderson Message-Id: <20231025093128.33116-4-akihiko.odaki@daynix.com> Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-11-alex.bennee@linaro.org> diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index 7fe00506c7..d8a3c56fa2 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -16,6 +16,12 @@ typedef struct GDBFeature { int num_regs; } GDBFeature; +typedef struct GDBFeatureBuilder { + GDBFeature *feature; + GPtrArray *xml; + int base_reg; +} GDBFeatureBuilder; + /* Get or set a register. Returns the size of the register. */ typedef int (*gdb_get_reg_cb)(CPUArchState *env, GByteArray *buf, int reg); @@ -44,6 +50,50 @@ void gdb_register_coprocessor(CPUState *cpu, */ int gdbserver_start(const char *port_or_device); +/** + * gdb_feature_builder_init() - Initialize GDBFeatureBuilder. + * @builder: The builder to be initialized. + * @feature: The feature to be filled. + * @name: The name of the feature. + * @xmlname: The name of the XML. + * @base_reg: The base number of the register ID. + */ +void gdb_feature_builder_init(GDBFeatureBuilder *builder, GDBFeature *feature, + const char *name, const char *xmlname, + int base_reg); + +/** + * gdb_feature_builder_append_tag() - Append a tag. + * @builder: The builder. + * @format: The format of the tag. + * @...: The values to be formatted. + */ +void G_GNUC_PRINTF(2, 3) +gdb_feature_builder_append_tag(const GDBFeatureBuilder *builder, + const char *format, ...); + +/** + * gdb_feature_builder_append_reg() - Append a register. + * @builder: The builder. + * @name: The register's name; it must be unique within a CPU. + * @bitsize: The register's size, in bits. + * @regnum: The offset of the register's number in the feature. + * @type: The type of the register. + * @group: The register group to which this register belongs; it can be NULL. + */ +void gdb_feature_builder_append_reg(const GDBFeatureBuilder *builder, + const char *name, + int bitsize, + int regnum, + const char *type, + const char *group); + +/** + * gdb_feature_builder_end() - End building GDBFeature. + * @builder: The builder. + */ +void gdb_feature_builder_end(const GDBFeatureBuilder *builder); + /** * gdb_find_static_feature() - Find a static feature. * @xmlname: The name of the XML. diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index ae24c4848f..ebb912da1b 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -422,6 +422,71 @@ static const char *get_feature_xml(const char *p, const char **newp, return NULL; } +void gdb_feature_builder_init(GDBFeatureBuilder *builder, GDBFeature *feature, + const char *name, const char *xmlname, + int base_reg) +{ + char *header = g_markup_printf_escaped( + "" + "" + "", + name); + + builder->feature = feature; + builder->xml = g_ptr_array_new(); + g_ptr_array_add(builder->xml, header); + builder->base_reg = base_reg; + feature->xmlname = xmlname; + feature->num_regs = 0; +} + +void gdb_feature_builder_append_tag(const GDBFeatureBuilder *builder, + const char *format, ...) +{ + va_list ap; + va_start(ap, format); + g_ptr_array_add(builder->xml, g_markup_vprintf_escaped(format, ap)); + va_end(ap); +} + +void gdb_feature_builder_append_reg(const GDBFeatureBuilder *builder, + const char *name, + int bitsize, + int regnum, + const char *type, + const char *group) +{ + if (builder->feature->num_regs < regnum) { + builder->feature->num_regs = regnum; + } + + if (group) { + gdb_feature_builder_append_tag( + builder, + "", + name, bitsize, builder->base_reg + regnum, type, group); + } else { + gdb_feature_builder_append_tag( + builder, + "", + name, bitsize, builder->base_reg + regnum, type); + } +} + +void gdb_feature_builder_end(const GDBFeatureBuilder *builder) +{ + g_ptr_array_add(builder->xml, (void *)""); + g_ptr_array_add(builder->xml, NULL); + + builder->feature->xml = g_strjoinv(NULL, (void *)builder->xml->pdata); + + for (guint i = 0; i < builder->xml->len - 2; i++) { + g_free(g_ptr_array_index(builder->xml, i)); + } + + g_ptr_array_free(builder->xml, TRUE); +} + const GDBFeature *gdb_find_static_feature(const char *xmlname) { const GDBFeature *feature; From patchwork Tue Nov 7 14:23:42 2023 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: 1861117 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=jAq1zHgV; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrBz4FXbz1yQg for ; Wed, 8 Nov 2023 01:27:07 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0K-0004Tr-2e; Tue, 07 Nov 2023 09:24:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0N02-0004GF-GZ for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:14 -0500 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Mzw-0007bk-VE for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:13 -0500 Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-507a29c7eefso7247857e87.1 for ; Tue, 07 Nov 2023 06:24:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367047; x=1699971847; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mtDpNZGc7bpiPdq3AvEGwADJunLb29I37B0SspqL8mk=; b=jAq1zHgVNomIUNYWFsRslqsJp/z8QqpxKSjDjPZnJ2zNX1dWVxwf+DJogxQNUMbNxG no7zJD6V5d938UXIbdhL7ZgNqD5P6h8qHUi4Ux0Vz7en5K9gVSMbXejrE/kzYthUzFLs /BOsul3TvoWxH3HEuqUIiUCTXc8ypNUSr/yR3amzAyphuENusZL16b6yHJnjd8Wlt6dW l03zFNRnSw3QyljmZGDAKKMUqXY3bOtRW2cY3P7ozlogH4fpMxKIHIy5nw6sAp6yH6W2 mDWYI2v0v+q+o0duaMS8563tjQn1iol4aOuqhcz0RwfANRSw1yaAdXOARpFeRNpHfwW8 bVAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367047; x=1699971847; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mtDpNZGc7bpiPdq3AvEGwADJunLb29I37B0SspqL8mk=; b=Veuq8fDVGTFE8Dw/PwGqxzJBZY85dMNJNc3ygg1a/sQ+T79YGIVb7DCZIdFP8oqd0X xiIDcgGELRh/auDno3W4+6q66KE8q06bhsiPEV9o4oogogIMoYscWb3TdScUZopnbtOU 0LRR8kD9mIqe2Y3kT4qY5TxJNQcuG3qAlnNqIDYhmWgiUfQ/bsqJQ0SyqN1JAObsHJ0c FCxGa6fgVJl2QpJunld4ZoB2d19CEGmjrC4F3tWVyH+7m32zG/U9VhV3CNn9WFy4Jktp 9f/qvrB3tcAaYIP4JKbIaTQ2WbTPUckmSqsTPPJ0Wg1tNieaeZmG8nPx/vEVuFAcuMCS +BKQ== X-Gm-Message-State: AOJu0YwQyRj3+WTdkSVVvHdvWfZ3SCC6z9x6yD4omApgkoVw6o9HaFOY 1Va4hqTtCbEoVVncxMrAHgmtCw== X-Google-Smtp-Source: AGHT+IE03XZ9iSIcJzaUdtGRjAZF9pH2QqmGqwEAcVTF99Awdh5aDcxYkQW8/wYPgG1DDcHk+rP/OA== X-Received: by 2002:a05:6512:1085:b0:509:458a:6c1 with SMTP id j5-20020a056512108500b00509458a06c1mr15561705lfg.19.1699367047239; Tue, 07 Nov 2023 06:24:07 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id x4-20020adfdd84000000b0032fb0e2087asm2492340wrl.82.2023.11.07.06.23.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:24:03 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 989BB5F790; Tue, 7 Nov 2023 14:23:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Akihiko Odaki , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini Subject: [PULL 11/23] cpu: Call plugin hooks only when ready Date: Tue, 7 Nov 2023 14:23:42 +0000 Message-Id: <20231107142354.3151266-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12a; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x12a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Akihiko Odaki The initialization and exit hooks will not affect the state of vCPU outside TCG context, but they may depend on the state of vCPU. Therefore, it's better to call plugin hooks after the vCPU state is fully initialized and before it gets uninitialized. Signed-off-by: Akihiko Odaki Reviewed-by: Alex Bennée Message-Id: <20231025093128.33116-16-akihiko.odaki@daynix.com> Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-12-alex.bennee@linaro.org> diff --git a/cpu-target.c b/cpu-target.c index 79363ae370..00cd7f4d69 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -42,7 +42,6 @@ #include "hw/core/accel-cpu.h" #include "trace/trace-root.h" #include "qemu/accel.h" -#include "qemu/plugin.h" uintptr_t qemu_host_page_size; intptr_t qemu_host_page_mask; @@ -143,11 +142,6 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp) /* Wait until cpu initialization complete before exposing cpu. */ cpu_list_add(cpu); - /* Plugin initialization must wait until cpu_index assigned. */ - if (tcg_enabled()) { - qemu_plugin_vcpu_init_hook(cpu); - } - #ifdef CONFIG_USER_ONLY assert(qdev_get_vmsd(DEVICE(cpu)) == NULL || qdev_get_vmsd(DEVICE(cpu))->unmigratable); @@ -174,11 +168,6 @@ void cpu_exec_unrealizefn(CPUState *cpu) } #endif - /* Call the plugin hook before clearing cpu->cpu_index in cpu_list_remove */ - if (tcg_enabled()) { - qemu_plugin_vcpu_exit_hook(cpu); - } - cpu_list_remove(cpu); /* * Now that the vCPU has been removed from the RCU list, we can call diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index bab8942c30..0acfed4c0f 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -209,6 +209,11 @@ static void cpu_common_realizefn(DeviceState *dev, Error **errp) cpu_resume(cpu); } + /* Plugin initialization must wait until the cpu is fully realized. */ + if (tcg_enabled()) { + qemu_plugin_vcpu_init_hook(cpu); + } + /* NOTE: latest generic point where the cpu is fully realized */ } @@ -216,6 +221,11 @@ static void cpu_common_unrealizefn(DeviceState *dev) { CPUState *cpu = CPU(dev); + /* Call the plugin hook before clearing the cpu is fully unrealized */ + if (tcg_enabled()) { + qemu_plugin_vcpu_exit_hook(cpu); + } + /* NOTE: latest generic point before the cpu is fully unrealized */ cpu_exec_unrealizefn(cpu); } From patchwork Tue Nov 7 14:23:43 2023 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: 1861120 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=BncrT1aN; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrFw72L3z1yQg for ; Wed, 8 Nov 2023 01:29:40 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0J-0004TU-E1; Tue, 07 Nov 2023 09:24:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0N02-0004GH-Ip for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:14 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Mzw-0007bY-JE for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:13 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-32f78dcf036so4126585f8f.0 for ; Tue, 07 Nov 2023 06:24:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367047; x=1699971847; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L+uCrfcDLt4fP6JkGcpQPZ8E5/aRDEJ/o5oc6OzqeNw=; b=BncrT1aN9J4wtWe+xtgLd4oubu3vZ54lt/OUZjYY2YdbfD7lx3cwctNvHYAxoOYhke LNc5vhGRbqsmJDx7VpfsSgwJp0Bk7e7T6tAockLGxNR0ZoqRvchy4x83DmD8arhxuaFr LQdYLgIitUz5Aq8dcUouubsJrqreL2JYOg2nsNh/JLl5Xa3K5q5e2hq6NqzM2A7uF3vi QQIl8ZbiOzRRtmei8q9b0QvIO9Ny0NRagPdRtXGC8NsxuloIJYvHkRMqcP+zIPqunHot YCqegBzUxaziq2O2tDfl3RHyh4c7jciRE7eno75Lmtr+gywhYqu2yNVaI50QOyQGEWIA Oajw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367047; x=1699971847; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L+uCrfcDLt4fP6JkGcpQPZ8E5/aRDEJ/o5oc6OzqeNw=; b=iM0NYeWeitIU88F9Gr66/xNgkMlLuRTFfn7xLKRJbu+sfM0DWxgd51njZ6g6Tv3OT5 HtrHn7C+qUpy1Kxtj4UaLYWdYUXNAa8PSWqVWI7os7ofKxFxMpTTRQan69kuCUpFsP/6 rv3IA4Ov45ai8pmPdPkC9haHpOPT3QVQ6n8RQZHJ5OOcINaYhfN9HCgcr5QTL9GcrpOd rdaILUwk87wSzH0NPb0VZA/cEb/XFWX6J6Lv8qui4gTGQGSfFHdTE+47hCttxb2if4r2 RfExyW/loVRCdYUveVHg2IRk5D0W1PxdY2QbNre+B8F59d8iu0iRdurPkH2h90D9eCAX 4b0w== X-Gm-Message-State: AOJu0YwnJb1ipciRSvMs35XTy88Npx2r6NTKsoTa35qvcWzSn83zcz74 f6hBIgIoygyqBVxGq7xhLDZN/A== X-Google-Smtp-Source: AGHT+IFyGIq7dVuMDH1EOvoNleUoy+5cFOjmba3M9Lcmq7y/mU25lAAhiCt9//oX/8BhI6QOBPzwQA== X-Received: by 2002:a5d:4585:0:b0:32d:a4d0:1364 with SMTP id p5-20020a5d4585000000b0032da4d01364mr3064173wrq.29.1699367047017; Tue, 07 Nov 2023 06:24:07 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id iv12-20020a05600c548c00b0040641a9d49bsm16047254wmb.17.2023.11.07.06.23.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:24:03 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id AAEB565761; Tue, 7 Nov 2023 14:23:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Greg Manning , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 12/23] configure: tell meson and contrib_plugins about DLLTOOL Date: Tue, 7 Nov 2023 14:23:43 +0000 Message-Id: <20231107142354.3151266-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To cleanly handle cross-building we need to export the details of dlltool into meson's list of cross binaries and into the contrib/plugins/ make configuration. Cc: Greg Manning Reviewed-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-13-alex.bennee@linaro.org> diff --git a/configure b/configure index f1456f6123..cd6c521bd8 100755 --- a/configure +++ b/configure @@ -309,6 +309,7 @@ fi ar="${AR-${cross_prefix}ar}" as="${AS-${cross_prefix}as}" ccas="${CCAS-$cc}" +dlltool="${DLLTOOL-${cross_prefix}dlltool}" objcopy="${OBJCOPY-${cross_prefix}objcopy}" ld="${LD-${cross_prefix}ld}" ranlib="${RANLIB-${cross_prefix}ranlib}" @@ -1659,6 +1660,9 @@ echo "SRC_PATH=$source_path/contrib/plugins" >> contrib/plugins/$config_host_mak echo "PKG_CONFIG=${pkg_config}" >> contrib/plugins/$config_host_mak echo "CC=$cc $CPU_CFLAGS" >> contrib/plugins/$config_host_mak echo "CFLAGS=${CFLAGS-$default_cflags} $EXTRA_CFLAGS" >> contrib/plugins/$config_host_mak +if test "$targetos" = windows; then + echo "DLLTOOL=$dlltool" >> contrib/plugins/$config_host_mak +fi if test "$targetos" = darwin; then echo "CONFIG_DARWIN=y" >> contrib/plugins/$config_host_mak fi @@ -1764,6 +1768,7 @@ if test "$skip_meson" = no; then test -n "$cxx" && echo "cpp = [$(meson_quote $cxx $CPU_CFLAGS)]" >> $cross test -n "$objcc" && echo "objc = [$(meson_quote $objcc $CPU_CFLAGS)]" >> $cross echo "ar = [$(meson_quote $ar)]" >> $cross + echo "dlltool = [$(meson_quote $dlltool)]" >> $cross echo "nm = [$(meson_quote $nm)]" >> $cross echo "pkgconfig = [$(meson_quote $pkg_config)]" >> $cross echo "pkg-config = [$(meson_quote $pkg_config)]" >> $cross @@ -1869,6 +1874,7 @@ preserve_env CC preserve_env CFLAGS preserve_env CXX preserve_env CXXFLAGS +preserve_env DLLTOOL preserve_env LD preserve_env LDFLAGS preserve_env LD_LIBRARY_PATH From patchwork Tue Nov 7 14:23:44 2023 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: 1861119 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=tLjavIgl; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrF026zlz1yQg for ; Wed, 8 Nov 2023 01:28:52 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0K-0004UI-97; Tue, 07 Nov 2023 09:24:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0N06-0004JZ-BD for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:20 -0500 Received: from mail-lf1-x12c.google.com ([2a00:1450:4864:20::12c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0N02-0007cU-9M for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:17 -0500 Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-507a29c7eefso7247902e87.1 for ; Tue, 07 Nov 2023 06:24:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367049; x=1699971849; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ua8AI/feWes7WKGpR0iK2DJxyzyGPmZR7VA8v8f6v4Q=; b=tLjavIgl0ib5OfFRKtlxFyow3ClD7bWJjWbGE+wC9fZN7+p9dSfw8Mqa43rGjcKgUH E+/hYurQDkbo3P4c56t0Nb7F8WEOICvPG15/THcTTE6lA5G6DxAwiKvYOU84IxtxC/FJ +H/5fqQXXlOUZhU1FiC67F14AqY+LsYVAvojkMKMn3n1JZd6R3UAp33it/Aak9ucxLRw LnElX/8AjeCQFUyOnXJEb9C0DHG4rol7UGupq0Ec5yIBVkGcL7JViCopWmSvIEd9GBlD tGe30J7YPFSXgWmYL4vQdvVzEm0DCMZ96tHGNS/WUpojSre5s+Mejl70vzBClqLJYZdZ 7MHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367049; x=1699971849; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ua8AI/feWes7WKGpR0iK2DJxyzyGPmZR7VA8v8f6v4Q=; b=lTbcD7V2ktU/FwAeSoi282VZUhU6cD949LWaQYZH9bpVWM8TG7NgXS2MhWdzIU7fO3 ffaKYrB6XMUVwW2hdfLPPCcWi7jEC4QBnHtNjxveGtd/N9uQqPdKAmF1rQKVomTq0x6Q w5C8gcoE6Qj+M3Zdj/tqBy8wS0Ljm1yj4HggWjflzZFUWUfoKFmO6+j4tuuaPP7H+v+6 y0PkPTNjVM2p1SjikyIoTdRuL3rcUVeJ9TZ7FSFGdeBRXxGYg7Nr96sjq70f24kwLIMJ 19sdEodgCFPJPVYDDThcWvM57Y7udO5H+6ufRp63cWwPOHiwJBmAkX3TYfvPn3P5m1t9 tHKA== X-Gm-Message-State: AOJu0Yz7dHSqsD3KSXDIlS+Os2S4NlAEdosB6dMhU+fut8kJSip76JPv AypPuVwql5wQAnV2f7NMqY7MuQ== X-Google-Smtp-Source: AGHT+IFTWCUKsjGiU5nLGQwVWWcw0pYzdFn8m4xUDQVh6UTDhW5zBWGsDQRs0z/K0TlkYVbvrYZI6A== X-Received: by 2002:ac2:561a:0:b0:508:268b:b087 with SMTP id v26-20020ac2561a000000b00508268bb087mr22600335lfd.26.1699367049543; Tue, 07 Nov 2023 06:24:09 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id k8-20020a05600c1c8800b004081a011c0esm15962291wms.12.2023.11.07.06.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:24:05 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BF8C565762; Tue, 7 Nov 2023 14:23:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Greg Manning , =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 13/23] plugins: add dllexport and dllimport to api funcs Date: Tue, 7 Nov 2023 14:23:44 +0000 Message-Id: <20231107142354.3151266-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12c; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x12c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Greg Manning In qemu-plugin.h, mark all API functions as __declspec(dllexport) when compiling the executables, and as __declspec(dllimport) when being used to compile plugins against. Signed-off-by: Greg Manning Reviewed-by: Alex Bennée Message-Id: <20231102172053.17692-2-gmanning@rapitasystems.com> Reviewed-by: Paolo Bonzini Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20231106185112.2755262-14-alex.bennee@linaro.org> diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h index 50a9957279..4daab6efd2 100644 --- a/include/qemu/qemu-plugin.h +++ b/include/qemu/qemu-plugin.h @@ -22,15 +22,18 @@ * https://gcc.gnu.org/wiki/Visibility */ #if defined _WIN32 || defined __CYGWIN__ - #ifdef BUILDING_DLL - #define QEMU_PLUGIN_EXPORT __declspec(dllexport) - #else + #ifdef CONFIG_PLUGIN #define QEMU_PLUGIN_EXPORT __declspec(dllimport) + #define QEMU_PLUGIN_API __declspec(dllexport) + #else + #define QEMU_PLUGIN_EXPORT __declspec(dllexport) + #define QEMU_PLUGIN_API __declspec(dllimport) #endif #define QEMU_PLUGIN_LOCAL #else #define QEMU_PLUGIN_EXPORT __attribute__((visibility("default"))) #define QEMU_PLUGIN_LOCAL __attribute__((visibility("hidden"))) + #define QEMU_PLUGIN_API #endif /** @@ -147,6 +150,7 @@ typedef void (*qemu_plugin_vcpu_udata_cb_t)(unsigned int vcpu_index, * * Note: Calling this function from qemu_plugin_install() is a bug. */ +QEMU_PLUGIN_API void qemu_plugin_uninstall(qemu_plugin_id_t id, qemu_plugin_simple_cb_t cb); /** @@ -160,6 +164,7 @@ void qemu_plugin_uninstall(qemu_plugin_id_t id, qemu_plugin_simple_cb_t cb); * Plugins are reset asynchronously, and therefore the given plugin receives * callbacks until @cb is called. */ +QEMU_PLUGIN_API void qemu_plugin_reset(qemu_plugin_id_t id, qemu_plugin_simple_cb_t cb); /** @@ -171,6 +176,7 @@ void qemu_plugin_reset(qemu_plugin_id_t id, qemu_plugin_simple_cb_t cb); * * See also: qemu_plugin_register_vcpu_exit_cb() */ +QEMU_PLUGIN_API void qemu_plugin_register_vcpu_init_cb(qemu_plugin_id_t id, qemu_plugin_vcpu_simple_cb_t cb); @@ -183,6 +189,7 @@ void qemu_plugin_register_vcpu_init_cb(qemu_plugin_id_t id, * * See also: qemu_plugin_register_vcpu_init_cb() */ +QEMU_PLUGIN_API void qemu_plugin_register_vcpu_exit_cb(qemu_plugin_id_t id, qemu_plugin_vcpu_simple_cb_t cb); @@ -193,6 +200,7 @@ void qemu_plugin_register_vcpu_exit_cb(qemu_plugin_id_t id, * * The @cb function is called every time a vCPU idles. */ +QEMU_PLUGIN_API void qemu_plugin_register_vcpu_idle_cb(qemu_plugin_id_t id, qemu_plugin_vcpu_simple_cb_t cb); @@ -203,6 +211,7 @@ void qemu_plugin_register_vcpu_idle_cb(qemu_plugin_id_t id, * * The @cb function is called every time a vCPU resumes execution. */ +QEMU_PLUGIN_API void qemu_plugin_register_vcpu_resume_cb(qemu_plugin_id_t id, qemu_plugin_vcpu_simple_cb_t cb); @@ -253,6 +262,7 @@ typedef void (*qemu_plugin_vcpu_tb_trans_cb_t)(qemu_plugin_id_t id, * callbacks to be triggered when the block or individual instruction * executes. */ +QEMU_PLUGIN_API void qemu_plugin_register_vcpu_tb_trans_cb(qemu_plugin_id_t id, qemu_plugin_vcpu_tb_trans_cb_t cb); @@ -265,6 +275,7 @@ void qemu_plugin_register_vcpu_tb_trans_cb(qemu_plugin_id_t id, * * The @cb function is called every time a translated unit executes. */ +QEMU_PLUGIN_API void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb, qemu_plugin_vcpu_udata_cb_t cb, enum qemu_plugin_cb_flags flags, @@ -296,6 +307,7 @@ enum qemu_plugin_op { * Note: ops are not atomic so in multi-threaded/multi-smp situations * you will get inexact results. */ +QEMU_PLUGIN_API void qemu_plugin_register_vcpu_tb_exec_inline(struct qemu_plugin_tb *tb, enum qemu_plugin_op op, void *ptr, uint64_t imm); @@ -309,6 +321,7 @@ void qemu_plugin_register_vcpu_tb_exec_inline(struct qemu_plugin_tb *tb, * * The @cb function is called every time an instruction is executed */ +QEMU_PLUGIN_API void qemu_plugin_register_vcpu_insn_exec_cb(struct qemu_plugin_insn *insn, qemu_plugin_vcpu_udata_cb_t cb, enum qemu_plugin_cb_flags flags, @@ -324,6 +337,7 @@ void qemu_plugin_register_vcpu_insn_exec_cb(struct qemu_plugin_insn *insn, * Insert an inline op to every time an instruction executes. Useful * if you just want to increment a single counter somewhere in memory. */ +QEMU_PLUGIN_API void qemu_plugin_register_vcpu_insn_exec_inline(struct qemu_plugin_insn *insn, enum qemu_plugin_op op, void *ptr, uint64_t imm); @@ -334,6 +348,7 @@ void qemu_plugin_register_vcpu_insn_exec_inline(struct qemu_plugin_insn *insn, * * Returns: number of instructions in this block */ +QEMU_PLUGIN_API size_t qemu_plugin_tb_n_insns(const struct qemu_plugin_tb *tb); /** @@ -342,6 +357,7 @@ size_t qemu_plugin_tb_n_insns(const struct qemu_plugin_tb *tb); * * Returns: virtual address of block start */ +QEMU_PLUGIN_API uint64_t qemu_plugin_tb_vaddr(const struct qemu_plugin_tb *tb); /** @@ -355,6 +371,7 @@ uint64_t qemu_plugin_tb_vaddr(const struct qemu_plugin_tb *tb); * * Returns: opaque handle to instruction */ +QEMU_PLUGIN_API struct qemu_plugin_insn * qemu_plugin_tb_get_insn(const struct qemu_plugin_tb *tb, size_t idx); @@ -368,6 +385,7 @@ qemu_plugin_tb_get_insn(const struct qemu_plugin_tb *tb, size_t idx); * Returns: pointer to a stream of bytes containing the value of this * instructions opcode. */ +QEMU_PLUGIN_API const void *qemu_plugin_insn_data(const struct qemu_plugin_insn *insn); /** @@ -376,6 +394,7 @@ const void *qemu_plugin_insn_data(const struct qemu_plugin_insn *insn); * * Returns: size of instruction in bytes */ +QEMU_PLUGIN_API size_t qemu_plugin_insn_size(const struct qemu_plugin_insn *insn); /** @@ -384,6 +403,7 @@ size_t qemu_plugin_insn_size(const struct qemu_plugin_insn *insn); * * Returns: virtual address of instruction */ +QEMU_PLUGIN_API uint64_t qemu_plugin_insn_vaddr(const struct qemu_plugin_insn *insn); /** @@ -392,6 +412,7 @@ uint64_t qemu_plugin_insn_vaddr(const struct qemu_plugin_insn *insn); * * Returns: hardware (physical) target address of instruction */ +QEMU_PLUGIN_API void *qemu_plugin_insn_haddr(const struct qemu_plugin_insn *insn); /** @@ -410,6 +431,7 @@ struct qemu_plugin_hwaddr; * * Returns: size of access in ^2 (0=byte, 1=16bit, 2=32bit etc...) */ +QEMU_PLUGIN_API unsigned int qemu_plugin_mem_size_shift(qemu_plugin_meminfo_t info); /** * qemu_plugin_mem_is_sign_extended() - was the access sign extended @@ -417,6 +439,7 @@ unsigned int qemu_plugin_mem_size_shift(qemu_plugin_meminfo_t info); * * Returns: true if it was, otherwise false */ +QEMU_PLUGIN_API bool qemu_plugin_mem_is_sign_extended(qemu_plugin_meminfo_t info); /** * qemu_plugin_mem_is_big_endian() - was the access big endian @@ -424,6 +447,7 @@ bool qemu_plugin_mem_is_sign_extended(qemu_plugin_meminfo_t info); * * Returns: true if it was, otherwise false */ +QEMU_PLUGIN_API bool qemu_plugin_mem_is_big_endian(qemu_plugin_meminfo_t info); /** * qemu_plugin_mem_is_store() - was the access a store @@ -431,6 +455,7 @@ bool qemu_plugin_mem_is_big_endian(qemu_plugin_meminfo_t info); * * Returns: true if it was, otherwise false */ +QEMU_PLUGIN_API bool qemu_plugin_mem_is_store(qemu_plugin_meminfo_t info); /** @@ -446,6 +471,7 @@ bool qemu_plugin_mem_is_store(qemu_plugin_meminfo_t info); * information about the handle should be recovered before the * callback returns. */ +QEMU_PLUGIN_API struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, uint64_t vaddr); @@ -462,6 +488,7 @@ struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, * Returns true if the handle's memory operation is to memory-mapped IO, or * false if it is to RAM */ +QEMU_PLUGIN_API bool qemu_plugin_hwaddr_is_io(const struct qemu_plugin_hwaddr *haddr); /** @@ -473,12 +500,14 @@ bool qemu_plugin_hwaddr_is_io(const struct qemu_plugin_hwaddr *haddr); * Note that the returned physical address may not be unique if you are dealing * with multiple address spaces. */ +QEMU_PLUGIN_API uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr); /* * Returns a string representing the device. The string is valid for * the lifetime of the plugin. */ +QEMU_PLUGIN_API const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h); /** @@ -513,6 +542,7 @@ typedef void (*qemu_plugin_vcpu_mem_cb_t) (unsigned int vcpu_index, * callback so the plugin is responsible for ensuring it doesn't get * confused by making appropriate use of locking if required. */ +QEMU_PLUGIN_API void qemu_plugin_register_vcpu_mem_cb(struct qemu_plugin_insn *insn, qemu_plugin_vcpu_mem_cb_t cb, enum qemu_plugin_cb_flags flags, @@ -531,6 +561,7 @@ void qemu_plugin_register_vcpu_mem_cb(struct qemu_plugin_insn *insn, * instruction. This provides for a lightweight but not thread-safe * way of counting the number of operations done. */ +QEMU_PLUGIN_API void qemu_plugin_register_vcpu_mem_inline(struct qemu_plugin_insn *insn, enum qemu_plugin_mem_rw rw, enum qemu_plugin_op op, void *ptr, @@ -544,6 +575,7 @@ typedef void uint64_t a3, uint64_t a4, uint64_t a5, uint64_t a6, uint64_t a7, uint64_t a8); +QEMU_PLUGIN_API void qemu_plugin_register_vcpu_syscall_cb(qemu_plugin_id_t id, qemu_plugin_vcpu_syscall_cb_t cb); @@ -551,6 +583,7 @@ typedef void (*qemu_plugin_vcpu_syscall_ret_cb_t)(qemu_plugin_id_t id, unsigned int vcpu_idx, int64_t num, int64_t ret); +QEMU_PLUGIN_API void qemu_plugin_register_vcpu_syscall_ret_cb(qemu_plugin_id_t id, qemu_plugin_vcpu_syscall_ret_cb_t cb); @@ -563,6 +596,7 @@ qemu_plugin_register_vcpu_syscall_ret_cb(qemu_plugin_id_t id, * Returns an allocated string containing the disassembly */ +QEMU_PLUGIN_API char *qemu_plugin_insn_disas(const struct qemu_plugin_insn *insn); /** @@ -572,6 +606,7 @@ char *qemu_plugin_insn_disas(const struct qemu_plugin_insn *insn); * Return a static string referring to the symbol. This is dependent * on the binary QEMU is running having provided a symbol table. */ +QEMU_PLUGIN_API const char *qemu_plugin_insn_symbol(const struct qemu_plugin_insn *insn); /** @@ -583,9 +618,11 @@ const char *qemu_plugin_insn_symbol(const struct qemu_plugin_insn *insn); * * See also: qemu_plugin_register_vcpu_init_cb() */ +QEMU_PLUGIN_API void qemu_plugin_vcpu_for_each(qemu_plugin_id_t id, qemu_plugin_vcpu_simple_cb_t cb); +QEMU_PLUGIN_API void qemu_plugin_register_flush_cb(qemu_plugin_id_t id, qemu_plugin_simple_cb_t cb); @@ -602,6 +639,7 @@ void qemu_plugin_register_flush_cb(qemu_plugin_id_t id, * In user-mode it is possible a few un-instrumented instructions from * child threads may run before the host kernel reaps the threads. */ +QEMU_PLUGIN_API void qemu_plugin_register_atexit_cb(qemu_plugin_id_t id, qemu_plugin_udata_cb_t cb, void *userdata); @@ -615,6 +653,7 @@ int qemu_plugin_n_max_vcpus(void); * qemu_plugin_outs() - output string via QEMU's logging system * @string: a string */ +QEMU_PLUGIN_API void qemu_plugin_outs(const char *string); /** @@ -628,6 +667,7 @@ void qemu_plugin_outs(const char *string); * returns true if the combination @name=@val parses correctly to a boolean * argument, and false otherwise */ +QEMU_PLUGIN_API bool qemu_plugin_bool_parse(const char *name, const char *val, bool *ret); /** @@ -638,6 +678,7 @@ bool qemu_plugin_bool_parse(const char *name, const char *val, bool *ret); * return NULL. The user should g_free() the string once no longer * needed. */ +QEMU_PLUGIN_API const char *qemu_plugin_path_to_binary(void); /** @@ -646,6 +687,7 @@ const char *qemu_plugin_path_to_binary(void); * Returns the nominal start address of the main text segment in * user-mode. Currently returns 0 for system emulation. */ +QEMU_PLUGIN_API uint64_t qemu_plugin_start_code(void); /** @@ -654,6 +696,7 @@ uint64_t qemu_plugin_start_code(void); * Returns the nominal end address of the main text segment in * user-mode. Currently returns 0 for system emulation. */ +QEMU_PLUGIN_API uint64_t qemu_plugin_end_code(void); /** @@ -662,6 +705,7 @@ uint64_t qemu_plugin_end_code(void); * Returns the nominal entry address of the main text segment in * user-mode. Currently returns 0 for system emulation. */ +QEMU_PLUGIN_API uint64_t qemu_plugin_entry_code(void); #endif /* QEMU_QEMU_PLUGIN_H */ From patchwork Tue Nov 7 14:23:45 2023 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: 1861124 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=ipmbgGL+; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrG02rvQz1yRH for ; Wed, 8 Nov 2023 01:29:44 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0K-0004V6-OG; Tue, 07 Nov 2023 09:24:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0N02-0004GJ-Iv for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:14 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Mzw-0007bn-TK for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:13 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-32fd7fc9f19so1136112f8f.2 for ; Tue, 07 Nov 2023 06:24:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367047; x=1699971847; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8WuehETCLnzEYq0UHVlMnhW2YeHRosm+x6nIjDSVqf4=; b=ipmbgGL+6fnuHZ6oclWqZ07XzUE6eZ3h97Nex7t7ijukTdQLiIBav7D4kDUE7chd+h gEHSnl9lB9erQar0Wyat/TLDHiG5E3YxnHWeyX4HyjEBHW+4+5Vr9O2UvMZOwJHnlP4k WSyTVM2h3+LxNaxOrij9+rm1jQZjd3BlJ41ATmaT2ID9JyOQMa9wuxoSEDnGlaQwKifw VIHmljYaQEdbYplalsLLAM2r2BXw5aK1lrwBPyB/62/fqwkSnEbbwcA5YDdJmRUo6Ja/ rsCZOuwGCTcqr5jWq3nlwss4J+8TZn93hI/YQ9JkOWLA/M3d+u30sSb4ihF3pEy7PIic SuEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367047; x=1699971847; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8WuehETCLnzEYq0UHVlMnhW2YeHRosm+x6nIjDSVqf4=; b=KROwrUhd7vKDBbpj5VPkA3PoRgnqLke15Q5o0xx1lQ7vRq7d18esK+r9VCGvYmCetg +0/ZUMt1lZw2XwlM77E7FvR5DiRv0CjlpHSAh4Q9h16I+rvMUuHp4s9CGvztIaWNLHEz DRj0f5YDUzPMxVDV2lbTc0f/42WFwnMmq+fivVwZXtwKHxReGVGyf5Vi/qb3ONJjGgqh PiZawM5WaQcWVxn009uOvPPD0yxM/f2F5erU1xcLDm4UEGXi5xIwP2AlVn30EvJp412i 2IDFOnpdtkh5i1nUAq5Tf7spuBh64swyay0VYLzAzsLi0Mo4Ff3rBaOQ3PVMLp9lPhCX RaQw== X-Gm-Message-State: AOJu0YwuQ0wFSbB8V3JZ4oNcH8t8HrLBeairtd7thZbhjt/4f3VA4czL z+XarG0npD5za9OZlGxnTBTRHw== X-Google-Smtp-Source: AGHT+IFffVrdrWhGjgrgDBfSudK2QJJ/uvPdU5f60IR3cuy0foJ5xlM/+JtMdZYZF4/cKdaxICAfMg== X-Received: by 2002:a5d:588a:0:b0:32f:b1ab:ee87 with SMTP id n10-20020a5d588a000000b0032fb1abee87mr13486258wrf.25.1699367047422; Tue, 07 Nov 2023 06:24:07 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m13-20020adffa0d000000b003143867d2ebsm2488671wrr.63.2023.11.07.06.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:24:05 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D62C86572D; Tue, 7 Nov 2023 14:23:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Greg Manning , =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , Thomas Huth , Alexandre Iooss , Mahmoud Mandour Subject: [PULL 14/23] plugins: make test/example plugins work on windows Date: Tue, 7 Nov 2023 14:23:45 +0000 Message-Id: <20231107142354.3151266-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Greg Manning Generate a qemu_plugin_api.lib delay import lib on windows, for windows qemu plugins to link against. Implement an example dll load fail hook to link up the API functions correctly when a plugin is loaded on windows. Update the build scripts for the test and example plugins to use these things. Signed-off-by: Greg Manning Acked-by: Alex Bennée Message-Id: <20231102172053.17692-3-gmanning@rapitasystems.com> [AJB: use find_program for dlltool, s/Windows/windows/] Cc: Paolo Bonzini Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-15-alex.bennee@linaro.org> diff --git a/configure b/configure index cd6c521bd8..e50ec99fe2 100755 --- a/configure +++ b/configure @@ -1666,6 +1666,9 @@ fi if test "$targetos" = darwin; then echo "CONFIG_DARWIN=y" >> contrib/plugins/$config_host_mak fi +if test "$targetos" = windows; then + echo "CONFIG_WIN32=y" >> contrib/plugins/$config_host_mak +fi # tests/tcg configuration (config_host_mak=tests/tcg/config-host.mak diff --git a/contrib/plugins/win32_linker.c b/contrib/plugins/win32_linker.c new file mode 100644 index 0000000000..7534b2b8bf --- /dev/null +++ b/contrib/plugins/win32_linker.c @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2023, Greg Manning + * + * This hook, __pfnDliFailureHook2, is documented in the microsoft documentation here: + * https://learn.microsoft.com/en-us/cpp/build/reference/error-handling-and-notification + * It gets called when a delay-loaded DLL encounters various errors. + * We handle the specific case of a DLL looking for a "qemu.exe", + * and give it the running executable (regardless of what it is named). + * + * This work is licensed under the terms of the GNU LGPL, version 2 or later. + * See the COPYING.LIB file in the top-level directory. + */ + +#include +#include + +FARPROC WINAPI dll_failure_hook(unsigned dliNotify, PDelayLoadInfo pdli); + + +PfnDliHook __pfnDliFailureHook2 = dll_failure_hook; + +FARPROC WINAPI dll_failure_hook(unsigned dliNotify, PDelayLoadInfo pdli) { + if (dliNotify == dliFailLoadLib) { + /* If the failing request was for qemu.exe, ... */ + if (strcmp(pdli->szDll, "qemu.exe") == 0) { + /* Then pass back a pointer to the top level module. */ + HMODULE top = GetModuleHandle(NULL); + return (FARPROC) top; + } + } + /* Otherwise we can't do anything special. */ + return 0; +} + diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index 8ba78c7a32..751fa38619 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -22,7 +22,14 @@ NAMES += hwprofile NAMES += cache NAMES += drcov -SONAMES := $(addsuffix .so,$(addprefix lib,$(NAMES))) +ifeq ($(CONFIG_WIN32),y) +SO_SUFFIX := .dll +LDLIBS += $(shell $(PKG_CONFIG) --libs glib-2.0) +else +SO_SUFFIX := .so +endif + +SONAMES := $(addsuffix $(SO_SUFFIX),$(addprefix lib,$(NAMES))) # The main QEMU uses Glib extensively so it's perfectly fine to use it # in plugins (which many example do). @@ -35,15 +42,20 @@ all: $(SONAMES) %.o: %.c $(CC) $(CFLAGS) $(PLUGIN_CFLAGS) -c -o $@ $< -lib%.so: %.o -ifeq ($(CONFIG_DARWIN),y) +ifeq ($(CONFIG_WIN32),y) +lib%$(SO_SUFFIX): %.o win32_linker.o ../../plugins/qemu_plugin_api.lib + $(CC) -shared -o $@ $^ $(LDLIBS) +else ifeq ($(CONFIG_DARWIN),y) +lib%$(SO_SUFFIX): %.o $(CC) -bundle -Wl,-undefined,dynamic_lookup -o $@ $^ $(LDLIBS) else +lib%$(SO_SUFFIX): %.o $(CC) -shared -o $@ $^ $(LDLIBS) endif + clean: - rm -f *.o *.so *.d + rm -f *.o *$(SO_SUFFIX) *.d rm -Rf .libs .PHONY: all clean diff --git a/plugins/meson.build b/plugins/meson.build index 71ed996ed3..40d24529c0 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -14,6 +14,25 @@ if not enable_modules endif if get_option('plugins') + if targetos == 'windows' + dlltool = find_program('dlltool', required: true) + + # Generate a .lib file for plugins to link against. + # First, create a .def file listing all the symbols a plugin should expect to have + # available in qemu + win32_plugin_def = configure_file( + input: files('qemu-plugins.symbols'), + output: 'qemu_plugin_api.def', + capture: true, + command: ['sed', '-e', '0,/^/s//EXPORTS/; s/[{};]//g', '@INPUT@']) + # then use dlltool to assemble a delaylib. + win32_qemu_plugin_api_lib = configure_file( + input: win32_plugin_def, + output: 'qemu_plugin_api.lib', + command: [dlltool, '--input-def', '@INPUT@', + '--output-delaylib', '@OUTPUT@', '--dllname', 'qemu.exe'] + ) + endif specific_ss.add(files( 'loader.c', 'core.c', diff --git a/tests/plugin/meson.build b/tests/plugin/meson.build index 322cafcdf6..528bb9d86c 100644 --- a/tests/plugin/meson.build +++ b/tests/plugin/meson.build @@ -1,9 +1,17 @@ t = [] if get_option('plugins') foreach i : ['bb', 'empty', 'insn', 'mem', 'syscall'] - t += shared_module(i, files(i + '.c'), - include_directories: '../../include/qemu', - dependencies: glib) + if targetos == 'windows' + t += shared_module(i, files(i + '.c') + '../../contrib/plugins/win32_linker.c', + include_directories: '../../include/qemu', + objects: [win32_qemu_plugin_api_lib], + dependencies: glib) + + else + t += shared_module(i, files(i + '.c'), + include_directories: '../../include/qemu', + dependencies: glib) + endif endforeach endif if t.length() > 0 From patchwork Tue Nov 7 14:23:46 2023 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: 1861126 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=h8JTu56S; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrHJ6ZXpz1yQL for ; Wed, 8 Nov 2023 01:30:52 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0M-0004XL-Vl; Tue, 07 Nov 2023 09:24:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0N02-0004GK-JK for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:15 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Mzy-0007cI-FG for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:13 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-32f7bd27c2aso3998582f8f.2 for ; Tue, 07 Nov 2023 06:24:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367049; x=1699971849; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=inR3fZjIbwH8cw/Ap/zt+XwgU9sqvQ2DjUVl5bVn3nE=; b=h8JTu56SfIoWBc2xWr+rcbe4BCGApdVdzIqYS+FPIa10FPEG71vIyD4SsnNiB8Em8p bq2SD3y8Qp2BSVSpt/NboYqZMCkuBYlVC/f7UQSIfyKpIMHRy4hIx9cwu8zUGhlaHWjW l7UFXnIKlUxVBYNQIMlwk4XwusJAWJRyFpLaNy/nkiQ40rXibpwnQjWwfNbdSSfCOTK3 zCr9ysDXorp1olRmS4wY1//Nf8Mu6vDyzF+vFZNFoYyTzd8GqvBeAMhGAiOrWQUb1PLK hXvv17TflfF6Q71o/dQUWAuI60LzBp1pk3UNR1bRIM6n5Dt/qBRcUp8EmkpQdbvRBNoI toPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367049; x=1699971849; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=inR3fZjIbwH8cw/Ap/zt+XwgU9sqvQ2DjUVl5bVn3nE=; b=lXglW0ZVItxgP0ok1J3oJQDIaNPiI4R1JgM01haea3eEFZd220IYR/uY04XLgY9yNw Ai8vG4IqN4oavH5f6eNElGR5P7PFWOtU3wF3/TY4htE7WYv1MVWptkfvEeFhUmgabzfV K3kCL64T2jBs5MzQl7MqRGHEvoXv7rLnIR/YaOTjEkElFCeFa1Icvayxe7c2Ooquopov q5pMP4kYhWfmukppa/RLSxVBMJH9D4JpZ/hfEtTzwH8vvrSml08cOp+RD1bkWcsX25Cr JwH2FzLfJ6HSCl3Wt56rxcFJQgWDMkYrgQ4a4Yl0f1y4Lwoy2nmXkMo8637F1qRazyo5 LZYA== X-Gm-Message-State: AOJu0Yw83VATNfO5SmyamodQVIe0+IXHElCGd+y01kCJ64ZArAt6qfdj 0ynwVwpGyRQEYN6SX9nBgGeP8Q== X-Google-Smtp-Source: AGHT+IG0GJTZRn2wYBMVmFqsn1htLrq7URsc2ls7pODxQi5cT1uYew1awqEl8MchkNvIOnJezBzdFw== X-Received: by 2002:a5d:5848:0:b0:32f:8a45:937b with SMTP id i8-20020a5d5848000000b0032f8a45937bmr24258291wrf.8.1699367049100; Tue, 07 Nov 2023 06:24:09 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m23-20020a056000025700b0032d886039easm2483973wrz.14.2023.11.07.06.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:24:05 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id EE6EE65763; Tue, 7 Nov 2023 14:23:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Greg Manning , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Alexandre Iooss , Mahmoud Mandour Subject: [PULL 15/23] plugins: disable lockstep plugin on windows Date: Tue, 7 Nov 2023 14:23:46 +0000 Message-Id: <20231107142354.3151266-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Greg Manning The lockstep plugin uses unix sockets and would require a different communication mechanism to work on Windows. Signed-off-by: Greg Manning Reviewed-by: Alex Bennée Message-Id: <20231102172053.17692-4-gmanning@rapitasystems.com> Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-16-alex.bennee@linaro.org> diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index 751fa38619..1783750cf6 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -17,7 +17,13 @@ NAMES += execlog NAMES += hotblocks NAMES += hotpages NAMES += howvec + +# The lockstep example communicates using unix sockets, +# and can't be easily made to work on windows. +ifneq ($(CONFIG_WIN32),y) NAMES += lockstep +endif + NAMES += hwprofile NAMES += cache NAMES += drcov From patchwork Tue Nov 7 14:23:47 2023 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: 1861115 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=Bg2SLAOY; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrB11k9Dz1yQg for ; Wed, 8 Nov 2023 01:26:17 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0J-0004Tb-KW; Tue, 07 Nov 2023 09:24:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0N03-0004GV-W5 for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:16 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0N01-0007cO-Fk for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:15 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40839807e82so35472075e9.0 for ; Tue, 07 Nov 2023 06:24:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367049; x=1699971849; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kvs5yYoc9I7mQ0TZEsVB3Q/WNehbciT+s2kf/2EJ0zk=; b=Bg2SLAOYU5CAvx6j9makRMoCEKzXK0ptM6bbeOgyIkLAnGHcP4uezU5RJxvPrYG96i so24eprvNvBNvBC1WQmbrUz3uf6MRI6ILHLVq6AroBo1rLwokpx18wxddCElL1rUrzdX 4hf9//fD6m0quM0jpJy73ow13vptQyaAyL/pfscpHVB6Zh8zak1IjmHc414K7gsDuCpw 02fB4VfwI9YEQWZFZLG12co2T7knCHjyxjWfXfN4AQcIubwLjRO++l5NdjFBxl4pVkzL EGb2XryvneCJByVt0WtEWkn9cXK+zAWTpsdAPEiLfl6dKTiahWtT9s1S08JGJahqLQhV mn/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367049; x=1699971849; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kvs5yYoc9I7mQ0TZEsVB3Q/WNehbciT+s2kf/2EJ0zk=; b=OiHlrCMPIf94twk22jGlEOZbZSqSc90uBzLs2SkJ9LUDwa/GFptIik3/V4zJjdEugJ mtadZWxgYF2BLUkvJf9m13aj0Z5tgkd08AO/Kyl1fiFsAiUu6lnVbep9mRtEFufVPV1x qV7iY9jK2l2JklPurWa/FEFhVxtgj5jZRQoSyzj/oKPcdV0dEGjW1PwlpMGhDon8ByCJ 2F6D5IPSfxQfXWi/ttxfQeqMSJcmMaCVvqrK6udNRBVjgcj+cCpjZ2nITrpG6X5S+qA8 fp4OOCRKxBevC1sNVTqurjfe9vy0Nk3ayvlfZyIN+WwPhHS02j9fNYDvIaxqgWTzDIzX YyvQ== X-Gm-Message-State: AOJu0YwsktGcsL44O7NJUF8Xbr4I3Y3t6JXwFI4yFmrvLO7QFASlSEbd 1zyJ8A37lGb/BA58+PbxiezMTg== X-Google-Smtp-Source: AGHT+IGn8TQvG8QI5i/tLuyA+cohUZ1H9ET25c+eowVo7JbdmThT/O83pq+fLg1FPP+OpgYKkQSyGg== X-Received: by 2002:a05:600c:2213:b0:408:36bb:5b0c with SMTP id z19-20020a05600c221300b0040836bb5b0cmr3421774wml.7.1699367049321; Tue, 07 Nov 2023 06:24:09 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id i12-20020a05600c354c00b004042dbb8925sm15922596wmq.38.2023.11.07.06.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:24:05 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0E72A65764; Tue, 7 Nov 2023 14:23:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Yonggang Luo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 16/23] gitlab: add dlltool to Windows CI Date: Tue, 7 Nov 2023 14:23:47 +0000 Message-Id: <20231107142354.3151266-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Alex Bennée diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 12a987cd71..f7645f72b7 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -72,6 +72,7 @@ - .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed bison diffutils flex git grep make sed + $MINGW_TARGET-binutils $MINGW_TARGET-capstone $MINGW_TARGET-ccache $MINGW_TARGET-curl From patchwork Tue Nov 7 14:23:48 2023 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: 1861118 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=ipfa/Zis; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrC66xFSz1yQg for ; Wed, 8 Nov 2023 01:27:14 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0K-0004Tt-2x; Tue, 07 Nov 2023 09:24:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0N03-0004GU-W7 for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:16 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0N02-0007ct-98 for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:15 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40906fc54fdso43946525e9.0 for ; Tue, 07 Nov 2023 06:24:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367051; x=1699971851; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wH+UzP6R6aU8otN15bfPCxhN8TIF9sNRq1R7pMAWDew=; b=ipfa/ZisHgt7tKHn+CrTed737FhFIWb5ulOxw9gNsVDPbALldTd0jDM61kfItrIeP0 BluWCDhfRSBP6dTMeldJ6W59qC5LWtAzLnWOQcGXsbTCos9mgudCKjY+3pQ7LJiEDbNQ PJF1WURtttDCU0Hdo9EC7ZfCru8q3q+PtmTXssejaF0x53kNXc/aHXh2ESwG+UxTTBVj 3L1LCV+uDGzolQdaHdojqTyO5pr+BfN5MTiitJqbpIKiivwJ276yPVZxWxgVI4IOUNLJ jfhgszetNA0RHtu14FLbx6LpF1nJRuQQbJr4Nv3xtaWbx2Q52x8/JlzcoQK4VN7zo/yq sqQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367051; x=1699971851; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wH+UzP6R6aU8otN15bfPCxhN8TIF9sNRq1R7pMAWDew=; b=CvK48HFaKA0Ez/Wz8Sd3uj60vqU+cRd/+9CUYJBgJhISlGnRV+meJcAseoWdkHKGvi wQVXrfMrg/NEjmdozmc/MKN1nPw1SSaCqnl+/ZBwCWdkp1TJeJUWec/63pVnD2/eo6et 6VQEZ+bh/was7/kYrGr1Jb5J6rcVBk6TAH/vaHQf9hfvVpo7eOHacW3AUCOPumabXlfL Q+RrlEg/uhdQsCfninTWwdLrBV4ZGBvGBtzlenWLk9WirrI3x6h6wqJUtWRIpD/aPKGK 6yQ2ZgKCDztFRIckT1mgqfwFieKF+R/skpxw+SeaRCJ93PJBfzL2Gc13gIR4Nrdt6YaT ZaFg== X-Gm-Message-State: AOJu0YzrD3wQD5Hd1IDGWKoYGMoskMv2544qx7/vgGiKYx/8KhPuY/Y7 9NRA/qFJsQZ1n9WW4QMkCtbKeA== X-Google-Smtp-Source: AGHT+IF1T98r8kySvcv8LWReXN7jPRn5U6LxyX8+dAt5EknfWUf9ukpvp7xCgZI883jrWFV0j9VD1A== X-Received: by 2002:a05:600c:3112:b0:407:8ee2:9986 with SMTP id g18-20020a05600c311200b004078ee29986mr2445999wmo.26.1699367051178; Tue, 07 Nov 2023 06:24:11 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id bh7-20020a05600c3d0700b00401b242e2e6sm16058402wmb.47.2023.11.07.06.24.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:24:05 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2370365765; Tue, 7 Nov 2023 14:23:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Greg Manning , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PULL 17/23] plugins: allow plugins to be enabled on windows Date: Tue, 7 Nov 2023 14:23:48 +0000 Message-Id: <20231107142354.3151266-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Greg Manning allow plugins to be enabled in the configure script on windows. Also, add the qemu_plugin_api.lib to the installer. Signed-off-by: Greg Manning Reviewed-by: Alex Bennée Message-Id: <20231102172053.17692-5-gmanning@rapitasystems.com> Reviewed-by: Philippe Mathieu-Daudé [AJB: add check for dlltool to configure] Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-17-alex.bennee@linaro.org> diff --git a/configure b/configure index e50ec99fe2..abcb199aa8 100755 --- a/configure +++ b/configure @@ -1011,9 +1011,9 @@ if test "$targetos" = "bogus"; then fi # test for any invalid configuration combinations -if test "$targetos" = "windows"; then +if test "$targetos" = "windows" && ! has "$dlltool"; then if test "$plugins" = "yes"; then - error_exit "TCG plugins not currently supported on Windows platforms" + error_exit "TCG plugins requires dlltool to build on Windows platforms" fi plugins="no" fi diff --git a/meson.build b/meson.build index 4848930680..d7d841e71e 100644 --- a/meson.build +++ b/meson.build @@ -3944,6 +3944,11 @@ endforeach if get_option('plugins') install_headers('include/qemu/qemu-plugin.h') + if targetos == 'windows' + # On windows, we want to deliver the qemu_plugin_api.lib file in the qemu installer, + # so that plugin authors can compile against it. + install_data(win32_qemu_plugin_api_lib, install_dir: 'lib') + endif endif subdir('qga') From patchwork Tue Nov 7 14:23:49 2023 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: 1861129 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=DIP3PCAz; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrN85PFmz1yQL for ; Wed, 8 Nov 2023 01:35:04 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N9h-0003hD-RM; Tue, 07 Nov 2023 09:34:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0N9W-0003YS-PQ for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:34:05 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0N9O-0001Rm-6p for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:34:00 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4084b0223ccso41706525e9.2 for ; Tue, 07 Nov 2023 06:33:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367615; x=1699972415; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/nVxjPXGNwOO7Fm7pBmxupI07He4/krctavyNo4y7go=; b=DIP3PCAzNLazngS3s3+f7nbTNkgqyo8UOa915AH9ZWDu7MMxYlfgqBt6i7R0lrXFZv 59RgFJ583iEuro9Gxcn7RK2RwmX7Yla3M34i12eKLwvgTrL4ivMc0B661UXrNyWDvwcR rIO1snO1yhp8CJ9CqK5V3kx6RC5wqIxj4kXP3x9tijoH69HltwklvYyEsU1D1j+oYh5t Ut6wh7C2jQysZMs50GCWW7Pen4nZKzJyeaAqt2hMLsHeEKvXJ1/AIkwqQDGuCyan3sXa ELKgPhEinKt9LNiB7GGA5KNzbWkNneOq/pp5iBghfgQjMBdQUACSixG+QD9komJYt/s8 IMlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367615; x=1699972415; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/nVxjPXGNwOO7Fm7pBmxupI07He4/krctavyNo4y7go=; b=LtPVgrV6rivMZnTHkEg4rqYRMBSC2K6rIYx8q7mB23MruvpZKdGECOmQLT42PvfIfC yrFLKA1oj5FShhlzSsNGywNha1+jTIjyWzrbunPskIoxtYCMFFXzZjeTHnNvYMy2x0Jy D+afuTINfSW9oZESIDtsNN/z8zw2I4OC/AvHtyIkD9m3PX0KhV476gpdVUTEKdh1h2Sk vo3lJHqdEXpINAydsEvM28uozUOwSH2EAdohaQUs3HrqQq9fN3dQLEDqgXIxzBFWxNb3 10wSsYxZoscSDNv/D6GRrbCg63ulKE3JxJrd7bSRsJvrwEH0lHu++fd8Um28trgx3CMB 03oA== X-Gm-Message-State: AOJu0Yx3IyjU9KUEXWF9FcQBL6YyVGfS2tEyThUxyi/+1RyFB98rLNca C28yKdP4DbvHIyP4Rb0oLIrqsI2DF9eQfXe070Iwfw== X-Google-Smtp-Source: AGHT+IHTHGmYOu3Oxd1rVVAGz+QEKi2aSK7nHIwyrybz3Spo+pedfI9bh2rceRTbs+b+vLGqIimMwg== X-Received: by 2002:a05:600c:310b:b0:409:295:9c6e with SMTP id g11-20020a05600c310b00b0040902959c6emr2504978wmo.30.1699367615211; Tue, 07 Nov 2023 06:33:35 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id c14-20020a05600c0a4e00b004030e8ff964sm16559119wmq.34.2023.11.07.06.33.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:33:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 38AFD6573F; Tue, 7 Nov 2023 14:23:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Palmer Dabbelt Subject: [PULL 18/23] contrib/gitdm: Add Rivos Inc to the domain map Date: Tue, 7 Nov 2023 14:23:49 +0000 Message-Id: <20231107142354.3151266-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Whatever they are up to a number of people for the company are contributing to QEMU so lets group them together. Reviewed-by: Palmer Dabbelt Acked-by: Palmer Dabbelt Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-18-alex.bennee@linaro.org> diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map index 3e31a06245..e676da8d47 100644 --- a/contrib/gitdm/domain-map +++ b/contrib/gitdm/domain-map @@ -38,6 +38,7 @@ proxmox.com Proxmox quicinc.com Qualcomm Innovation Center redhat.com Red Hat rev.ng rev.ng Labs +rivosinc.com Rivos Inc rt-rk.com RT-RK samsung.com Samsung siemens.com Siemens From patchwork Tue Nov 7 14:23:50 2023 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: 1861130 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=cjnau86P; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrN91yMtz1yRJ for ; Wed, 8 Nov 2023 01:35:04 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N9j-0003iR-BR; Tue, 07 Nov 2023 09:34:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0N9Z-0003dn-Ch for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:34:07 -0500 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0N9O-0001T3-6Z for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:34:03 -0500 Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2c518a1d83fso75595701fa.3 for ; Tue, 07 Nov 2023 06:33:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367616; x=1699972416; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B6yF0jXdeAMVEVevSk9oydLlQVep3u0TFDo33ugqv0g=; b=cjnau86P9rbDn2b1N0neXrq7+bhkrIaCCZpejorhfCAPm2IVFa4DYDcB0E9TWRUJFG c4+N01SixQ0ohhb9IPC/JDE1bHhkz7jx3jTMFuZWL8dDiaoeDL7hePuytS28+ATUTK72 CcwHh7ro6LQU5Z2cIJ7wZCwMw3bTOQFI5+jagKZVjffv4iCGwgWlDshFxLDgAZLqx8+g 3HHfBjE9wR26M/w2kMLWh2O0Jl+u6/dsUWGZhqa+v6+JQ8YV6JqrZ410rOcfDF9lS9iY 7FzTD7GwMNpwpFsUwDfen70QMzdGS2QdRbAd/2cxh1/cPJ4iyB4qC4S5cvoHvnJ/YvZO Djeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367616; x=1699972416; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B6yF0jXdeAMVEVevSk9oydLlQVep3u0TFDo33ugqv0g=; b=Nph14oob0Q5+BjoGiYYnjGtbyqJYZIwjcXFrJR7fnsOMnMT7s+wKPTibDfznVAcX5I QZAuBs8HHCrRfv1IJfSv7apZjZTYmTVshE3T1dKUtk9sR8c8dMg32dlY95n474bq8mRc LEKsQc/uVymUzE6TmUARhmAhhodkJu0TFtLzrEOhu4K7pZRLGxZmk3TQ6s7HTNQw8iBy gXmfDC3Aqa+OYRiZwwVLOOSGHORqFlR4F6Q1K2fzk8RYaOLBv0hkk1HxjJ4Y6cx26TJ9 sekEZLYZhxZEZ68KF1XuLClnJBRoOeEQFw0pvDxJNgOqRsAvEEglHIDPgR/OpKo96r2b beCA== X-Gm-Message-State: AOJu0YwUu9DxUGDrG8FNifWnCMZdvJc6tr2UiuhrwAkMTDjDy6pMGKzk xkPXPI8VBAz2E4mvwYlSffc2KJJTTaP3KKH7aaAtKA== X-Google-Smtp-Source: AGHT+IHLX1iXUAtLeTBI6fUcIWuPVWwfAiZ4XelIFs+h2iJ751VCEjD7eiZzD9Rt0m/nOEi6XgDSzg== X-Received: by 2002:a2e:90d7:0:b0:2c6:ee98:de83 with SMTP id o23-20020a2e90d7000000b002c6ee98de83mr12235888ljg.46.1699367616363; Tue, 07 Nov 2023 06:33:36 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ha7-20020a05600c860700b004080f0376a0sm15474080wmb.42.2023.11.07.06.33.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:33:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4EA3C65766; Tue, 7 Nov 2023 14:23:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: luzhipeng , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 19/23] contrib/gitdm: add domain-map for Cestc Date: Tue, 7 Nov 2023 14:23:50 +0000 Message-Id: <20231107142354.3151266-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::234; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x234.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: luzhipeng Signed-off-by: luzhipeng Message-Id: <20230628072236.1925-1-luzhipeng@cestc.cn> Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-19-alex.bennee@linaro.org> diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map index e676da8d47..38945cddf0 100644 --- a/contrib/gitdm/domain-map +++ b/contrib/gitdm/domain-map @@ -12,6 +12,7 @@ amd.com AMD aspeedtech.com ASPEED Technology Inc. baidu.com Baidu bytedance.com ByteDance +cestc.cn Cestc cmss.chinamobile.com China Mobile citrix.com Citrix crudebyte.com Crudebyte From patchwork Tue Nov 7 14:23:51 2023 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: 1861132 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=MXQRmRYC; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrP1136qz1yQK for ; Wed, 8 Nov 2023 01:35:49 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N9t-0003pt-9v; Tue, 07 Nov 2023 09:34:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0N9r-0003oM-0Y for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:34:24 -0500 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0N9a-0001TI-4f for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:34:22 -0500 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-507e85ebf50so7116825e87.1 for ; Tue, 07 Nov 2023 06:33:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367617; x=1699972417; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YMoZZcxgNzTmqfpOzorw5f2xERwmkzqwcLwISjGwm4k=; b=MXQRmRYCB6Fac8Z3HJwDFppPmvi/8WE+95dVLcxX75Euw8l/t/DbBR6rTh1159a2X9 8Ya1gQS1xjjAl1y0Lw3QE4PYrhVw10Hs97H6ttFDrf5yBe9+34mMPvV/++l5TjGsctYO qy+XFBJWl3kqvnx87RYMuU3X9PlXqap4unxm3e4UnLpE+OeMEtUfobNjG7lqCi1uPJNH S52xoVL7W4Q8C44v4ZKSEvIIBlB48WDroHETjOlWfqwI48hzM+4EwoZI/tKG741exQKH Wp3qpB+iZ3YduahgUByV56HwmuinCW1GL7a6S7kXgA0iN7/zhTTQiZWb68TGFuUZcTXa vxJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367617; x=1699972417; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YMoZZcxgNzTmqfpOzorw5f2xERwmkzqwcLwISjGwm4k=; b=mEA12YyrxO48itCNxPFTElcewGF/M33LKQbKMSi2qiGeQrsZh6P997r/akSAmwK5Pd Wfg7lpI9xIY4EINIrDfCf1xVduE1BcuOSE3MgvEr1d/gJOaU2Ceo8AWeBNUtdXIOyD6t HoCalnHJLF+jKDKGalO6D0FEZA5EdAH9auaNj6qa54sVPwufUn9mNJUKkGwyOVmNGLZA oX7LdumCie0g6Fu9aZ4AL+R2w6HyY1DcrwlJBBVnoB7wa8e5RFRLW3u6952JlCGpbuNd pDLYcSt6wcHf4As9e3K3u01usr6Lmh3VtTyQ93jhOTTUNToSMT669Gg3jnsIBdUFYkB4 AdXw== X-Gm-Message-State: AOJu0YxNXOuRnLYtPI8aBCf0ElJV7Z2zZzZ2YPg4cJ8cc5Z8w8f8jHir +r+WxyyZYh5ajA0xJsfSyJNTtpgH+xfPtIHfr8QyyA== X-Google-Smtp-Source: AGHT+IED2fbM16xvToPTF5okafOyCgHaZVZBEsfIAX8P7smEF83UWtGzuiwFLOqPuWzUPcyAkMMTnw== X-Received: by 2002:a05:6512:48d1:b0:500:bf33:3add with SMTP id er17-20020a05651248d100b00500bf333addmr22247031lfb.47.1699367616672; Tue, 07 Nov 2023 06:33:36 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n5-20020adfe345000000b0032f7cc56509sm2521587wrj.98.2023.11.07.06.33.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:33:35 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 669E365769; Tue, 7 Nov 2023 14:23:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Yicong Yang Subject: [PULL 20/23] contrib/gitdm: map HiSilicon to Huawei Date: Tue, 7 Nov 2023 14:23:51 +0000 Message-Id: <20231107142354.3151266-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::133; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x133.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org HiSilicon is a wholly owned subsidiary of Huawei so map the domain to the same company to avoid splitting the contributions. Reviewed-by: Yicong Yang Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-20-alex.bennee@linaro.org> diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map index 38945cddf0..42571fc1c4 100644 --- a/contrib/gitdm/domain-map +++ b/contrib/gitdm/domain-map @@ -22,6 +22,7 @@ fb.com Facebook fujitsu.com Fujitsu google.com Google greensocs.com GreenSocs +hisilicon.com Huawei huawei.com Huawei ibm.com IBM igalia.com Igalia From patchwork Tue Nov 7 14:23:52 2023 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: 1861128 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=PwEI+2TT; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrN85xY6z1yRH for ; Wed, 8 Nov 2023 01:35:04 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N9f-0003eT-DM; Tue, 07 Nov 2023 09:34:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0N9O-0003Tk-Ai for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:33:59 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0N9G-0001R3-J6 for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:33:52 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40839807e82so35557055e9.0 for ; Tue, 07 Nov 2023 06:33:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367615; x=1699972415; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GpsihFCzeaecJeI7EXhK/H8QboILEAf1e/mR+Z/Ju44=; b=PwEI+2TTw0Fgu0tLRQCx17d+OQRhgI/RYvatK3MiLz6BKbRAY3uyAxkTrHL87uoNCA xfFB4r70V2S5RED63IT3IupwndKo8wfFNn2m2mJpEGsSGqQkKCEYwhaZFtYN9KGLSRLr Ch7sfK0jZdNUvt8ZXxPiS9WsmzifFz3z/pWwr4ep7sL566tYxlyZeTCypB1wKRBMau/N qoOz35EPibFw1zsmEtfpnmHEX9AK8DPcutboEf/O1y0JiQHbrXP7cAjBoHtAvs4nP4aE EnWrvgIczwCCVgqxrG90YyAVBKKzyxGVIuUNQB/BJvJ8RicVQvftT6GNaHRPD7yTYtDe UsmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367615; x=1699972415; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GpsihFCzeaecJeI7EXhK/H8QboILEAf1e/mR+Z/Ju44=; b=J5Dl+RsVtVLYkN+g+/J/t6b3SLJZNpWFh/p8UTquBDTEG1yj/kf1rQg4ri32Q6Mipw Q50M1ym0Wb7fTAz0RPWPhew2itck9zDXehkdmP25P6pGBAEgTk/6FR/zJIU5uuAinT6k DLR0TcP9hmR0XdFQ6zWEY9NOOgpGbfknbvl4Aa0f05BZ9gYKmeFfTzkbN8+7glTMKfkO 57gFLNQucuodtVdbrf5878efueF8hkhjZEV4fKfxdrlGZY+lT34KVHj8jV3xXNTLt8op xyw/W7SvZb7CsiYXrlgZIhLdLsOigPOQWh8UIhME/0TRhLSyo3HL81ewqA5LCFldvfAk SZDQ== X-Gm-Message-State: AOJu0YyXeJJzw5pta/D9m4u+VoYTZpihb3uYPvQEoMoGUHWneuNENB4h 2Eqc5CKIG5+t3makBKPpcHn3pr82MjroHSaPYxtlKA== X-Google-Smtp-Source: AGHT+IGlrm1o8s51yVdJsmODkGn6rbjlXOCveu2BDcuv8cK/sxRod5+yENnSgYHQqWToULIq00M/RA== X-Received: by 2002:a7b:c5d7:0:b0:408:37aa:774a with SMTP id n23-20020a7bc5d7000000b0040837aa774amr3522204wmk.17.1699367614878; Tue, 07 Nov 2023 06:33:34 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m23-20020a05600c461700b004060f0a0fdbsm15457473wmo.41.2023.11.07.06.33.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:33:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7A1B56576B; Tue, 7 Nov 2023 14:23:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Akihiko Odaki Subject: [PULL 21/23] contrib/gitdm: add Daynix to domain-map Date: Tue, 7 Nov 2023 14:23:52 +0000 Message-Id: <20231107142354.3151266-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Daynix describes itself as a cloud technology company so I assume employee contributions should count as such. Reviewed-by: Akihiko Odaki Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-21-alex.bennee@linaro.org> diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map index 42571fc1c4..bf1dce03fd 100644 --- a/contrib/gitdm/domain-map +++ b/contrib/gitdm/domain-map @@ -17,6 +17,7 @@ cmss.chinamobile.com China Mobile citrix.com Citrix crudebyte.com Crudebyte chinatelecom.cn China Telecom +daynix.com Daynix eldorado.org.br Instituto de Pesquisas Eldorado fb.com Facebook fujitsu.com Fujitsu From patchwork Tue Nov 7 14:23:53 2023 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: 1861109 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=PLOoO8eG; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPr895FbDz1yQK for ; Wed, 8 Nov 2023 01:24:41 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N0L-0004WG-IV; Tue, 07 Nov 2023 09:24:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0N06-0004Ja-B5 for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:20 -0500 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0N02-0007d0-8h for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:24:17 -0500 Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2c5056059e0so82244441fa.3 for ; Tue, 07 Nov 2023 06:24:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367051; x=1699971851; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Fx8qgNA+lURQSXrzmxWGQIf9pj+8j0bs83issrteW0E=; b=PLOoO8eGhOlFKeumePDkiAtGvx3GOqJZA3P4Rg1LR7WcCmx2wURDxeoCO9ODqzpGyr BM2hfsuLx9ZFNnBIU/ghk5KSglivsJLZhzDm5TveQkw38FEFgtEV43QcQSGdAklc3W21 PTxtvulzPsaNbPtk5TpeXUHKqtOK+R3mDqKbvSfcnb7d9VGObkB4wyZhsa0Khjyljefg 5sR3VRPoJAcIhSS7RNiDC0ovh4Ckfl+k+BpMG5smxLhekTvNIc26ZesBwuYVhqL5jOLN iS1sdriLAqZW4LXUglrIEsi/Lsx02wX8gYXxi3YvCHM4SXVElEizCMnaOoWqbAykBs0e G6lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367051; x=1699971851; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fx8qgNA+lURQSXrzmxWGQIf9pj+8j0bs83issrteW0E=; b=Q+r90JEKix337C9ucaaIXKGoII6SBTQCfHKHau5+cjxNiX0cdfFpB0mqI5nNP4UgY0 LZGy63KntKhIHqwMVtuJzSFqlRhbQfwP4PBp7/m+7qEZnx521ix0ieOB94PWE2R5OYEf zYcq/6o9CTliNh+2IAlzgsdd6ffq8wASmm1FHFzDAXy3eXTEjueUpWHqh2WSJp6Q+fgk ogmHUM37fj7368lA3lEwfCDgdc6kqSUm8s/BBYzFwMmNkA0XlVnnwCMkGrsYEckO9quV RNl47de3JMuZs8MmRQWVX0yTDKnouuYzJYNBXLnd113V6L9g7eJLJ7LyCkPaof588M7N 3AcQ== X-Gm-Message-State: AOJu0Yy8oBFsJ5HkKFyM+10oZ21+gDCi4Ru8IwF0d/xLXTZdL6RtN1Hk P52gIrC7AdsFq4uBi71+xYT6VsPh0wUWTJbc65K7yg== X-Google-Smtp-Source: AGHT+IGMG8hYPvrpeVVfMGUBP5YM0s3bPz/SgC+agjmDwxWGdg991PMqEXvIqdu/AIWJ9endt9mh+Q== X-Received: by 2002:a2e:a7c3:0:b0:2c0:33be:3530 with SMTP id x3-20020a2ea7c3000000b002c033be3530mr22935397ljp.45.1699367051494; Tue, 07 Nov 2023 06:24:11 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ew3-20020a05600c808300b004054dcbf92asm15362371wmb.20.2023.11.07.06.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:24:07 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8CD6E6576C; Tue, 7 Nov 2023 14:23:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , =?utf-8?q?Timoth?= =?utf-8?q?=C3=A9e_Cocault?= , fanwenjie Subject: [PULL 22/23] mailmap: fixup some more corrupted author fields Date: Tue, 7 Nov 2023 14:23:53 +0000 Message-Id: <20231107142354.3151266-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22e; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x22e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Reviewed-by: Philippe Mathieu-Daudé Cc: Timothée Cocault Cc: fanwenjie Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-22-alex.bennee@linaro.org> diff --git a/.mailmap b/.mailmap index 94f19a0ac9..e12e19f691 100644 --- a/.mailmap +++ b/.mailmap @@ -30,10 +30,12 @@ malc malc # Corrupted Author fields Aaron Larson alarson@ddci.com Andreas Färber Andreas Färber +fanwenjie fanwj@mail.ustc.edu.cn Jason Wang Jason Wang Marek Dolata mkdolata@us.ibm.com Michael Ellerman michael@ozlabs.org Nick Hudson hnick@vmware.com +Timothée Cocault timothee.cocault@gmail.com # There is also a: # (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> From patchwork Tue Nov 7 14:23:54 2023 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: 1861131 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=a+EPJHaa; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPrNq65Rgz1yQK for ; Wed, 8 Nov 2023 01:35:39 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0N9h-0003gh-Ge; Tue, 07 Nov 2023 09:34:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0N9T-0003UR-K3 for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:34:02 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0N9O-0001Rj-6J for qemu-devel@nongnu.org; Tue, 07 Nov 2023 09:33:56 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40836ea8cbaso40363645e9.0 for ; Tue, 07 Nov 2023 06:33:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699367615; x=1699972415; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=66Yo0o+2uncS4aFgFuePxGz49R/v9IcSCTHQts+bNnM=; b=a+EPJHaa7NxLR4x/UKi17a+FzjjN8iwtb+IeGs+lP+r3w/ZSgT6wcFanIIf7M/g+tG n3ui1mzBeHF9jMgFUxXt1eEQBXLyceX/V9iq1psZbknP/FL/G+Jqr1BmByaylFT6U4jo WkcYKgCIr9zwuKJC1RovpTndoTQejQYpH6M6u0GlmS5L6mZEits8VBQoiELhH0w7ZArt QsB1TeWGkN55NtEZY4ORBcxZBFkdAGUUL/tMmmaqdkN/Vzli6x0wWPZ9FT6fjfH4rLZ1 bd8YlrvLhXqEIebc9pII4x+h/E5Wh7ozcuW9ZKBm5osFLv3hRMXN1TDlp6KaLksMf4gh Fpgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699367615; x=1699972415; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=66Yo0o+2uncS4aFgFuePxGz49R/v9IcSCTHQts+bNnM=; b=vvHEQ3yPc2HDBnonfMyaw4GsNSPmih8bebL9/pBCVtzq1y/VYD+j2oWBnzmO10pJaL eiLQwaBN1C2oMjxAqizF48eBT8SCIvY/VKWnMKke1W9XfpvrjoPGCm9QYJJocqHSBM41 sHBstZDGKNE7+LXvDjauj7ymWd5+iU7HOGIGkyuxv3BXZIwm1BFFPO7PjOmyd1PAI8kQ 0jdFlWUul1plosxsINkuVIE4YHVi/MQB57IcECEhZjJU40/atNUpJAoBRGtopmk1o3Dz /g8qtjnDjdoYwW0eL2KKUHhLOpFw3vAwtN7c7SbPbnKkcltq0JD8RrdQPs5tupguVad0 9nkg== X-Gm-Message-State: AOJu0Yzcz1iUYfooZDt0qkfQhRhbhZjL9foJBOYErARPfOQduy6hm73F rQ9crb7Cpz+bmroSaPG3VvLFgIRoGnDeQm15ZLypaw== X-Google-Smtp-Source: AGHT+IE94ut5xSB/CfTNuTVVhnIgtBeOGGdkZYLukqHE/d8jAJr32hpVcFcNAu/aHqrufTnM2YVJEg== X-Received: by 2002:a05:600c:3547:b0:401:b1c6:97dc with SMTP id i7-20020a05600c354700b00401b1c697dcmr2465268wmq.23.1699367615013; Tue, 07 Nov 2023 06:33:35 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u17-20020a05600c19d100b00405c7591b09sm16090135wmq.35.2023.11.07.06.33.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 06:33:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A22996576D; Tue, 7 Nov 2023 14:23:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Chris Wulff , Marek Vasut , Richard Henderson Subject: [PULL 23/23] Revert "tests/tcg/nios2: Re-enable linux-user tests" Date: Tue, 7 Nov 2023 14:23:54 +0000 Message-Id: <20231107142354.3151266-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231107142354.3151266-1-alex.bennee@linaro.org> References: <20231107142354.3151266-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org nios2 signal tests are broken again: retry.py -n 10 -c -- ./qemu-nios2 ./tests/tcg/nios2-linux-user/signals Results summary: 0: 8 times (80.00%), avg time 2.254 (0.00 varience/0.00 deviation) -11: 2 times (20.00%), avg time 0.253 (0.00 varience/0.00 deviation) Ran command 10 times, 8 passes This wasn't picked up by CI as we don't have a docker container that can build QEMU with the nios2 compiler. I don't have time to bisect the breakage and the target is orphaned anyway so take the easy route and revert it. This reverts commit 20e7524ff9f0cab4c9a0306014d6f3d7b467ae1e. Cc: Chris Wulff Cc: Marek Vasut Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231106185112.2755262-23-alex.bennee@linaro.org> diff --git a/tests/tcg/nios2/Makefile.target b/tests/tcg/nios2/Makefile.target new file mode 100644 index 0000000000..b38e2352b7 --- /dev/null +++ b/tests/tcg/nios2/Makefile.target @@ -0,0 +1,11 @@ +# nios2 specific test tweaks + +# Currently nios2 signal handling is broken +run-signals: signals + $(call skip-test, $<, "BROKEN") +run-plugin-signals-with-%: + $(call skip-test, $<, "BROKEN") +run-linux-test: linux-test + $(call skip-test, $<, "BROKEN") +run-plugin-linux-test-with-%: + $(call skip-test, $<, "BROKEN")