From patchwork Tue Jan 16 10:48:00 2024 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: 763029 Delivered-To: patch@linaro.org Received: by 2002:a5d:5903:0:b0:337:62d3:c6d5 with SMTP id v3csp1551460wrd; Tue, 16 Jan 2024 02:51:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IH/u8jxH7u8EExyuWbV8DT+1uTpyesZM1K+BeSCQ4Zx9keb5XNHiMehXWKcVpfWxpgTGxpx X-Received: by 2002:a05:622a:550:b0:429:c6be:2ec8 with SMTP id m16-20020a05622a055000b00429c6be2ec8mr9150009qtx.97.1705402313000; Tue, 16 Jan 2024 02:51:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705402312; cv=none; d=google.com; s=arc-20160816; b=Xhfw6Cv5Bmkq+OIRq1CxtRv2ClGIE8CvZKlj0m+M0nBQEuxTtQ2PoezA0gJte9/vHN xOPkU/GJKp7yX1P7i+rsOefIVDSw3PBwm1b/Je7ewyk2rIlA/0+jveYrztB/ssu7jpXy CJhmY8JYJSw6KMGNOOyHzuISTwPNE+4gHjfaJQfbFQZ72EmYGn2GY+yJKQ3zsrz/bjZd DHg4SaK7n21Eaz6hSitvLfByNi9jcRzG5JgmyDEq+/Gy2dJf49WYl2IjGNZtmzY9b0sv mtOhwYcxc6VoXAkxNeUr/kMraKO61dYuIwJ6a6jg59YL7r8I+lTDHyX1JkTdaHjnmrXV iLmw== 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=qVwN3dpOCtt4r+lVVN5i82qZ7hg8DweInnbvtj2wyRI=; fh=V//Id55l1kKW5zhW71GxCTaExsgyYKdbPjIrEl6+Cnw=; b=FEx/sN/BgczeAqnRiE9eGe2j6qQyGzXRqxQJd9BnW2dtCm89eEHsveHlczPAm7QV/S ymkZtv37pZpwpixCwQ8wBYT3C7FNC5A+VUz7UlaZgJv2BedxfmB/OlDerSe3FLjNvazI aheq9P9UmOpuLhhpE/IcVAIA/I0HFvlC/LMeA9ZsCpMaaiEY1CTBloB1UokbVsejVG8a zERNhqUP/PygxHIIcBxJ0scwG4UMUl8rbBzwYih5Eh00GZ8uxx4wjWi1nUfQhe+gC7zn btl25x90RMdZnW9XeIFqjHf2iCx/huNpXLmR5CVvsanJWw1iHPWrdGsFBd4gOJHl+1FU 3dNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fmLbgR25; 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 k22-20020ac85fd6000000b00429d0dc308dsi7570457qta.62.2024.01.16.02.51.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jan 2024 02:51:52 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fmLbgR25; 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 1rPgzt-0002Y5-0v; Tue, 16 Jan 2024 05:48:45 -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 1rPgzh-0002Ok-2s for qemu-devel@nongnu.org; Tue, 16 Jan 2024 05:48:33 -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 1rPgzb-0007Ff-KS for qemu-devel@nongnu.org; Tue, 16 Jan 2024 05:48:32 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-337b583453bso395646f8f.2 for ; Tue, 16 Jan 2024 02:48:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705402103; x=1706006903; 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=qVwN3dpOCtt4r+lVVN5i82qZ7hg8DweInnbvtj2wyRI=; b=fmLbgR25vPIrYGcYJDK5dWBT3vozPd1UEGYcVxGzbj1PGETdHiSliApP62LmeUI+Nf wDn/7rMjoWtw8f0vlPHfkAVoh64wjtCXc+IAd3a+EeRvG2VpRBm3iHPkmsKOviQmKztM y9q3j50Xd261jED/phpmo3evtDRIdcGI+7/gW7FV72G9eN7+qXXt3B4wewe6SOT5Vp+7 kipla8kJTSpVBNZQeWuJw76koajiZcWVymZJdt9v6E2nSmrtNGJunvzQxXtSPkRMtdVl 59YaacoFDGMdA5xWFKa01BoWR4jcOQB4H9vxXewjj8+21HBGb2+35lmOd+JF/KsLH27Z KE9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705402103; x=1706006903; 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=qVwN3dpOCtt4r+lVVN5i82qZ7hg8DweInnbvtj2wyRI=; b=ZaZkfTk4XwCfgrzLDcd1mNMapSBXHIZns8iVhfAt3EBQjaFbUiZ1hT5eNK+cPAS94p C+66xDI9qNZUwBOeTfOXEPMI1nOnOtzSSfaIslzsMs41Een8JeA7Z+yBLzhC9c1MyEcv V2YEML7JqLOR9ctmoHAaL+55HU4+iUXxoOxXrmp5ABHD0MPnKg+CfHZjgy7jWvrv0GHO sfYpFpONhLSY9U5o7/NjIAi+BDDg8nE9EOI/ZwopBHuJWuL52vKQXsaO3SoI619YljSb Bhb+N8W0MqUbRiKv5cY/wYHeVBESzVtD6/+G1brHBwZd0F2wW7zAMBjZObJH3ZGmwTdi owCg== X-Gm-Message-State: AOJu0YyC4MKa/uuivc/8fOClPmRwh+LHtX2dElKQTcgyhFTTa+hybCTT LDV7Zv728rMxiMSDigMG8q4YUk8fvfeAyw== X-Received: by 2002:a5d:4cca:0:b0:336:7bb5:42fd with SMTP id c10-20020a5d4cca000000b003367bb542fdmr2382096wrt.174.1705402102773; Tue, 16 Jan 2024 02:48:22 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id r1-20020a5d4941000000b00337712b065dsm14224517wrs.99.2024.01.16.02.48.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 02:48:17 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BA1A85F8F7; Tue, 16 Jan 2024 10:48:10 +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?= , Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang , Peter Maydell , Nicholas Piggin , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Liu Zhiwei , qemu-arm@nongnu.org (open list:ARM TCG CPUs), qemu-ppc@nongnu.org (open list:PowerPC TCG CPUs), qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs) Subject: [PULL 13/22] hw/core/cpu: Remove gdb_get_dynamic_xml member Date: Tue, 16 Jan 2024 10:48:00 +0000 Message-Id: <20240116104809.250076-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240116104809.250076-1-alex.bennee@linaro.org> References: <20240116104809.250076-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=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 This function is no longer used. Signed-off-by: Akihiko Odaki Reviewed-by: Alex Bennée Message-Id: <20240103173349.398526-35-alex.bennee@linaro.org> Message-Id: <20231213-gdb-v17-9-777047380591@daynix.com> Signed-off-by: Alex Bennée diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 06931f330b7..ae11e66d382 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -134,9 +134,6 @@ struct SysemuCPUOps; * before the insn which triggers a watchpoint rather than after it. * @gdb_arch_name: Optional callback that returns the architecture name known * to GDB. The caller must free the returned string with g_free. - * @gdb_get_dynamic_xml: Callback to return dynamically generated XML for the - * gdb stub. Returns a pointer to the XML contents for the specified XML file - * or NULL if the CPU doesn't have a dynamically generated content for it. * @disas_set_info: Setup architecture specific components of disassembly info * @adjust_watchpoint_address: Perform a target-specific adjustment to an * address before attempting to match it against watchpoints. @@ -167,7 +164,6 @@ struct CPUClass { const char *gdb_core_xml_file; const gchar * (*gdb_arch_name)(CPUState *cpu); - const char * (*gdb_get_dynamic_xml)(CPUState *cpu, const char *xmlname); void (*disas_set_info)(CPUState *cpu, disassemble_info *info); diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 65b961fb948..caa4fd156da 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1185,12 +1185,6 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cpu, vaddr addr, int arm_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int arm_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); -/* Returns the dynamically generated XML for the gdb stub. - * Returns a pointer to the XML contents for the specified XML file or NULL - * if the XML name doesn't match the predefined one. - */ -const char *arm_gdb_get_dynamic_xml(CPUState *cpu, const char *xmlname); - int arm_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs, int cpuid, DumpState *s); int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index f87c26f98a6..9f94282e13e 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1524,7 +1524,6 @@ int ppc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); int ppc_cpu_gdb_write_register_apple(CPUState *cpu, uint8_t *buf, int reg); #ifndef CONFIG_USER_ONLY hwaddr ppc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); -const char *ppc_gdb_get_dynamic_xml(CPUState *cs, const char *xml_name); #endif int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs, int cpuid, DumpState *s); diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 2a7e47a70eb..71358d2bce6 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2499,7 +2499,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) cc->sysemu_ops = &arm_sysemu_ops; #endif cc->gdb_arch_name = arm_gdb_arch_name; - cc->gdb_get_dynamic_xml = arm_gdb_get_dynamic_xml; cc->gdb_stop_before_watchpoint = true; cc->disas_set_info = arm_disas_set_info; diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c index 059d84f98e5..a3bb73cfa7c 100644 --- a/target/arm/gdbstub.c +++ b/target/arm/gdbstub.c @@ -474,24 +474,6 @@ static GDBFeature *arm_gen_dynamic_m_secextreg_feature(CPUState *cs, #endif #endif /* CONFIG_TCG */ -const char *arm_gdb_get_dynamic_xml(CPUState *cs, const char *xmlname) -{ - ARMCPU *cpu = ARM_CPU(cs); - - if (strcmp(xmlname, "system-registers.xml") == 0) { - return cpu->dyn_sysreg_feature.desc.xml; - } else if (strcmp(xmlname, "sve-registers.xml") == 0) { - return cpu->dyn_svereg_feature.desc.xml; - } else if (strcmp(xmlname, "arm-m-system.xml") == 0) { - return cpu->dyn_m_systemreg_feature.desc.xml; -#ifndef CONFIG_USER_ONLY - } else if (strcmp(xmlname, "arm-m-secext.xml") == 0) { - return cpu->dyn_m_secextreg_feature.desc.xml; -#endif - } - return NULL; -} - void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) { CPUState *cs = CPU(cpu); diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index a7b593dbfac..496f8fdb7f2 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -7379,9 +7379,6 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) #endif cc->gdb_num_core_regs = 71; -#ifndef CONFIG_USER_ONLY - cc->gdb_get_dynamic_xml = ppc_gdb_get_dynamic_xml; -#endif #ifdef USE_APPLE_GDB cc->gdb_read_register = ppc_cpu_gdb_read_register_apple; cc->gdb_write_register = ppc_cpu_gdb_write_register_apple; diff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c index 8ca37b6bf95..f47878a67bd 100644 --- a/target/ppc/gdbstub.c +++ b/target/ppc/gdbstub.c @@ -342,16 +342,6 @@ static void gdb_gen_spr_feature(CPUState *cs) gdb_feature_builder_end(&builder); } - -const char *ppc_gdb_get_dynamic_xml(CPUState *cs, const char *xml_name) -{ - PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cs); - - if (strcmp(xml_name, "power-spr.xml") == 0) { - return pcc->gdb_spr.xml; - } - return NULL; -} #endif #if !defined(CONFIG_USER_ONLY) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index c777f2dd641..515c8efcdc6 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1667,19 +1667,6 @@ static const gchar *riscv_gdb_arch_name(CPUState *cs) } } -static const char *riscv_gdb_get_dynamic_xml(CPUState *cs, const char *xmlname) -{ - RISCVCPU *cpu = RISCV_CPU(cs); - - if (strcmp(xmlname, "riscv-csr.xml") == 0) { - return cpu->dyn_csr_feature.xml; - } else if (strcmp(xmlname, "riscv-vector.xml") == 0) { - return cpu->dyn_vreg_feature.xml; - } - - return NULL; -} - #ifndef CONFIG_USER_ONLY static int64_t riscv_get_arch_id(CPUState *cs) { @@ -1833,7 +1820,6 @@ static void riscv_cpu_common_class_init(ObjectClass *c, void *data) cc->get_arch_id = riscv_get_arch_id; #endif cc->gdb_arch_name = riscv_gdb_arch_name; - cc->gdb_get_dynamic_xml = riscv_gdb_get_dynamic_xml; object_class_property_add(c, "mvendorid", "uint32", cpu_get_mvendorid, cpu_set_mvendorid, NULL, NULL);