From patchwork Mon Oct 9 16:40: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: 731016 Delivered-To: patch@linaro.org Received: by 2002:a5d:574c:0:b0:31d:da82:a3b4 with SMTP id q12csp1312859wrw; Mon, 9 Oct 2023 09:47:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGicSv7xGRNVPqjohwlAaGttLTYRW3abSTrUZxnIaE5rwMdRny1sfyT/5FVixaaD16Qi2ot X-Received: by 2002:a05:620a:6a84:b0:777:1d46:fd4a with SMTP id ud4-20020a05620a6a8400b007771d46fd4amr1276771qkn.29.1696870046287; Mon, 09 Oct 2023 09:47:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696870046; cv=none; d=google.com; s=arc-20160816; b=LBHT+3LMvxhpx8MTlEHwDtrjRQti5dEH5lzGos/iPf9CdSW4ecxaef7BJ5pAEMKXAN IMih2fEe7FITWmyzPwjwU843J3N3ciiFD6q5X58HhIJzdntu2sD+vyYRrlrKDXhGZF5s e8zUJM+IUCTqcVEiKpL+IN3qDDVVq6ArD0beRnqGK+lXwb5wICfW1AoqFFph2uKqs1PK 4rwy/CWDJq7Q8ln/yD8wjglzoG06vlydtZ5TUrPELTISFJLCw3pJoDYWG9lmirnwV2Sj RUTMlf8RLZgObS3+RGO9RZVDReKb9LnipE/FkQ2IT/tG6IV9IwSILZ94z5OUFGEw6Yox GP4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BxLMY5+XDlEqW//GnK/X2YXdg2+UhZNarbeVkfRpn9o=; fh=FL21b9FDJBPKO4Cw1gBqBPIr8gb5CEXpVKTgM6hLIl8=; b=MC4bYbCxdpVeWn2aH/YXxzRQkxVNmr8GkTl3/dTKVSO2KoS4S1iACNtiv7pS5tiVfg 9SApD6y4sgtLOA4xtF/psNamBAAsJEo95xyFhxxjLndAJYxxwzZyX5RK0O1CQ3Q+4p7r Pg0nAoM5zbTz4sp63yaDREQpaLMDKTiPfDHnKF3ol5cQcYcEK1Tu0+8Y9TydW1aO+UM5 P7fo9JlnN90FwXD23N5S48voSbzYzc6D++M+8y8AVEDGVeKXaCR3Rn/nwAsRaR5kxXMa KKRQ4r9GOIHFFDuS1S052NGAcC3HcEWKlQKpHZtCuZUgvQvZxF/5x6XpOm9TdKgiaab5 lJig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ngrkyp0w; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s2-20020a05620a0bc200b00775cab41f38si6240421qki.79.2023.10.09.09.47.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Oct 2023 09:47:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ngrkyp0w; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qptMO-0002Ry-V8; Mon, 09 Oct 2023 12:44:01 -0400 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 1qptKA-0005ed-9i for qemu-devel@nongnu.org; Mon, 09 Oct 2023 12:41:43 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qptJj-0001Zq-Ag for qemu-devel@nongnu.org; Mon, 09 Oct 2023 12:41:41 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-32799639a2aso4705625f8f.3 for ; Mon, 09 Oct 2023 09:41:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696869673; x=1697474473; 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=BxLMY5+XDlEqW//GnK/X2YXdg2+UhZNarbeVkfRpn9o=; b=Ngrkyp0w1ib/WMYkG6Luw8PlnOwYhwT1tT3fyV/R22vGjWXmfTHps9FBL8V9PYMrDv LwBOdbm8NY7l+NcgtGFbd99ev037qDQbG3ZO/wG6z6C+b+7ZM3Ed8CRglEOxJJmroRNS UhzFejCnY0A8/DV/3PBbMGg2HhCrcsplz4DLoBHpkL43Iy5eBRU5k59VsuDJzUkMsNzw 5d6LyEfd1x+wq30VpMk4tSeN6MBSunesoD2+p0e1IqC5esyRoAxDIKYhmP22wBQ4KMCe 6jM4Xg8sjOqDOUVrOA7ScKHRrO6u6Ke82l9XvwaMArFtgw45EEoZdUSjiplgnrtxmM6q DoAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869673; x=1697474473; 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=BxLMY5+XDlEqW//GnK/X2YXdg2+UhZNarbeVkfRpn9o=; b=bAiPjLCn0xMNhSlqJQtbKr9tKA6QshuSDcKbOD/ayU3M7Oau1YjRzMiPLgNRKSKLU5 uZ3yqgIZO1Vsbz7Hj5w656K3y9HMpkzgHYdw15CLSsvOR8B4schPGj0WAfvtPWtw3Rd0 CF+YwZWTr6+3XyHrKVtnZlpZOwytJJF3tTHKKetOHkPX8l6R7hJgPJ/QunVq+77y1Xm6 Oe1nAcTPNvpxtMy7pkrxojznbZUP9eSxOcBhvzy4EpLA7YUgeP+yQnWVxpOuK/osNKSE S2+Ro+dxnBYxnwOXd7ACMApkcRpQ1vyaChYYeol3tkjO+uowhUlro+z1S2ZSlw0hbw03 URlw== X-Gm-Message-State: AOJu0Yz1MUsmZ2F1DLcGI5nnmdVLqTiyUTJEQl199B1SZn6ytSi0lgFk FDSyxX67HrQwG0oytNUOdG3BOw== X-Received: by 2002:a5d:4dcc:0:b0:319:785a:fce5 with SMTP id f12-20020a5d4dcc000000b00319785afce5mr13247438wru.38.1696869672794; Mon, 09 Oct 2023 09:41:12 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id t4-20020a5d6904000000b0032710f5584fsm10040929wru.25.2023.10.09.09.41.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:41:11 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9E32D1FFBE; Mon, 9 Oct 2023 17:41:06 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Xiaojuan Yang , =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Bastian Koppelmann , Brad Smith , Radoslaw Biernacki , David Hildenbrand , Cleber Rosa , Ilya Leoshkevich , qemu-riscv@nongnu.org, Daniel Henrique Barboza , Alexandre Iooss , Nicholas Piggin , Bin Meng , Leif Lindholm , Paolo Bonzini , Eduardo Habkost , Alistair Francis , qemu-ppc@nongnu.org, John Snow , Liu Zhiwei , qemu-arm@nongnu.org, Wainer dos Santos Moschetta , Palmer Dabbelt , Peter Maydell , Yanan Wang , Weiwei Li , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Marcel Apfelbaum , Beraldo Leal , Yoshinori Sato , Mahmoud Mandour , Richard Henderson , Song Gao , Marcin Juszkiewicz , qemu-s390x@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Akihiko Odaki Subject: [PATCH 13/25] target/arm: Move the reference to arm-core.xml Date: Mon, 9 Oct 2023 17:40:52 +0100 Message-Id: <20231009164104.369749-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231009164104.369749-1-alex.bennee@linaro.org> References: <20231009164104.369749-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Akihiko Odaki Some subclasses overwrite gdb_core_xml_file member but others don't. Always initialize the member in the subclasses for consistency. This especially helps for AArch64; in a following change, the file specified by gdb_core_xml_file is always looked up even if it's going to be overwritten later. Looking up arm-core.xml results in an error as it will not be embedded in the AArch64 build. Signed-off-by: Akihiko Odaki Reviewed-by: Richard Henderson Message-Id: <20230912224107.29669-7-akihiko.odaki@daynix.com> Signed-off-by: Alex Bennée --- target/arm/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 831295d7cd..b65e8cfea3 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2392,7 +2392,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) cc->sysemu_ops = &arm_sysemu_ops; #endif cc->gdb_num_core_regs = 26; - cc->gdb_core_xml_file = "arm-core.xml"; cc->gdb_arch_name = arm_gdb_arch_name; cc->gdb_get_dynamic_xml = arm_gdb_get_dynamic_xml; cc->gdb_stop_before_watchpoint = true; @@ -2414,8 +2413,10 @@ static void arm_cpu_instance_init(Object *obj) static void cpu_register_class_init(ObjectClass *oc, void *data) { ARMCPUClass *acc = ARM_CPU_CLASS(oc); + CPUClass *cc = CPU_CLASS(acc); acc->info = data; + cc->gdb_core_xml_file = "arm-core.xml"; } void arm_cpu_register(const ARMCPUInfo *info)