{"id":1882126,"url":"http://patchwork.ozlabs.org/api/patches/1882126/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20240103173349.398526-35-alex.bennee@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20240103173349.398526-35-alex.bennee@linaro.org>","list_archive_url":null,"date":"2024-01-03T17:33:40","name":"[v2,34/43] hw/core/cpu: Remove gdb_get_dynamic_xml member","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f6478bd353026650cc6917238966d7f991a1ed93","submitter":{"id":39532,"url":"http://patchwork.ozlabs.org/api/people/39532/?format=json","name":"Alex Bennée","email":"alex.bennee@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20240103173349.398526-35-alex.bennee@linaro.org/mbox/","series":[{"id":388742,"url":"http://patchwork.ozlabs.org/api/series/388742/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=388742","date":"2024-01-03T17:33:08","name":"testing and plugin updates for 9.0 (pre-PR)","version":2,"mbox":"http://patchwork.ozlabs.org/series/388742/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1882126/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1882126/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=D9fdY4Pm;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4T4xsM6RQfz1ydb\n\tfor ; Thu, 4 Jan 2024 04:43:35 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1rL5Dh-0008RS-7M; Wed, 03 Jan 2024 12:39:57 -0500","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1rL5DY-00081K-D6\n for qemu-devel@nongnu.org; Wed, 03 Jan 2024 12:39:48 -0500","from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1rL5D4-0000nh-Rv\n for qemu-devel@nongnu.org; Wed, 03 Jan 2024 12:39:48 -0500","by mail-wm1-x32f.google.com with SMTP id\n 5b1f17b1804b1-40d2376db79so95820565e9.0\n for ; Wed, 03 Jan 2024 09:39:18 -0800 (PST)","from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id\n bl13-20020adfe24d000000b003365fcc1846sm31132628wrb.52.2024.01.03.09.39.10\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 03 Jan 2024 09:39:13 -0800 (PST)","from draig.lan (localhost [IPv6:::1])\n by draig.lan (Postfix) with ESMTP id C478B5F9D0;\n Wed, 3 Jan 2024 17:33:52 +0000 (GMT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1704303557; x=1704908357; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=j5PGmkkL/PhNktzCzA9/ck6zIPH9FB5CIkJrjOgUxHc=;\n b=D9fdY4Pmx0GB21XuLqoROjFjhLY1P20xbr2dlZYHzMflvvD9eU3H3u4ZA7vT5r0Mm7\n ZPjQDVQ5JWSkClAEMMgcU4EEv/gm9ApdtgAsTThMTcgrvzeB+IWnxd+UTgdmBchZ1xEF\n Lmjamrc0B4RiJc/HCMR+HdOLMFIIES6VDJH22J6Zkrh8VnXEM5/Xk92Hx9lSY+i3SuQq\n UtQaOQta91yex4ZhvJByTKthdQ/xqZTqMTc6Dar0BL99Ci/HUqF9BGC/7MPwXW0zBLKa\n a1/696zJ6vZPOYRRHN7qHmi1onFdvkr+dRVXu2Eqn5vMtJBPb6C11ZBeWVUmeSfdYl4E\n a34g==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1704303557; x=1704908357;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=j5PGmkkL/PhNktzCzA9/ck6zIPH9FB5CIkJrjOgUxHc=;\n b=YudGEwlRxlROCeZSGscJBPnl7nYU7eN8EnsCsWIs34jF6ERTCS7R9b85D5vvbk/kNz\n VjG4mo9JsWr4h1iGRYl30thIQZY09FR4rU4RHZIXnMNSVnkuvgP8tBCklUhsAIy28iYz\n DqwWlaznrU1YS/XTLIIr5+YqcXBruJ//SwC09jaL1X7x3jqrL+DLLGLOo/96lDoi1OAs\n 84+2prIvW7B+k1mzNGdzQh4p8qoAVEDT1UsskYnbVhUY7IX2ZRBrlyuTpu3+O2+LZWvz\n g68vUpjuvM2VVv+BnNHFwqz0VUrxwNUkLdqjmLx6iJDATwxtP8JUfrK79V/UOHFAEmlJ\n equA==","X-Gm-Message-State":"AOJu0Yx806EsCDD3hiNBQBBMC73dFn/Oi9zmzX/M/LrqWA8+z4OTxYXB\n 0GSXPU8/HVuLalT35XVFtwRJ1lE7Ft+u/w==","X-Google-Smtp-Source":"\n AGHT+IEjSIN4KOfZL2Hae3jDnOn2qYxJ4pBqF3j1XMHgZtnZoCV6fYm1BvSmWkqZgw9WmJyd0kj8Ig==","X-Received":"by 2002:a05:600c:1992:b0:40d:5fed:eecf with SMTP id\n t18-20020a05600c199200b0040d5fedeecfmr6209855wmq.101.1704303556896;\n Wed, 03 Jan 2024 09:39:16 -0800 (PST)","From":"=?utf-8?q?Alex_Benn=C3=A9e?= ","To":"qemu-devel@nongnu.org","Cc":"qemu-s390x@nongnu.org, qemu-ppc@nongnu.org,\n Richard Henderson ,\n Song Gao ,\n =?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n David Hildenbrand , Aurelien Jarno ,\n Yoshinori Sato ,\n Yanan Wang , Bin Meng ,\n Laurent Vivier , Michael Rolnik ,\n Alexandre Iooss , David Woodhouse ,\n Laurent Vivier , Paolo Bonzini ,\n Brian Cain ,\n Daniel Henrique Barboza ,\n Beraldo Leal , Paul Durrant ,\n Mahmoud Mandour , Thomas Huth ,\n Liu Zhiwei , Cleber Rosa ,\n kvm@vger.kernel.org, Peter Maydell ,\n Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?=\n\t=?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org,\n Weiwei Li ,\n =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ,\n John Snow ,\n Daniel Henrique Barboza ,\n Nicholas Piggin , Palmer Dabbelt ,\n Marcel Apfelbaum ,\n Ilya Leoshkevich ,\n =?utf-8?q?C=C3=A9dric_Le_Goater?= ,\n \"Edgar E. Iglesias\" ,\n Eduardo Habkost ,\n Pierrick Bouvier , qemu-riscv@nongnu.org,\n Alistair Francis ,\n Akihiko Odaki ","Subject":"[PATCH v2 34/43] hw/core/cpu: Remove gdb_get_dynamic_xml member","Date":"Wed, 3 Jan 2024 17:33:40 +0000","Message-Id":"<20240103173349.398526-35-alex.bennee@linaro.org>","X-Mailer":"git-send-email 2.39.2","In-Reply-To":"<20240103173349.398526-1-alex.bennee@linaro.org>","References":"<20240103173349.398526-1-alex.bennee@linaro.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::32f;\n 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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,\n 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Akihiko Odaki \n\nThis function is no longer used.\n\nSigned-off-by: Akihiko Odaki \nReviewed-by: Alex Bennée \nMessage-Id: <20231213-gdb-v17-9-777047380591@daynix.com>\nSigned-off-by: Alex Bennée \n---\n include/hw/core/cpu.h | 4 ----\n target/arm/cpu.h | 6 ------\n target/ppc/cpu.h | 1 -\n target/arm/cpu.c | 1 -\n target/arm/gdbstub.c | 18 ------------------\n target/ppc/cpu_init.c | 3 ---\n target/ppc/gdbstub.c | 10 ----------\n target/riscv/cpu.c | 14 --------------\n 8 files changed, 57 deletions(-)","diff":"diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h\nindex a6214610603..17f99adc0f4 100644\n--- a/include/hw/core/cpu.h\n+++ b/include/hw/core/cpu.h\n@@ -134,9 +134,6 @@ struct SysemuCPUOps;\n * before the insn which triggers a watchpoint rather than after it.\n * @gdb_arch_name: Optional callback that returns the architecture name known\n * to GDB. The caller must free the returned string with g_free.\n- * @gdb_get_dynamic_xml: Callback to return dynamically generated XML for the\n- * gdb stub. Returns a pointer to the XML contents for the specified XML file\n- * or NULL if the CPU doesn't have a dynamically generated content for it.\n * @disas_set_info: Setup architecture specific components of disassembly info\n * @adjust_watchpoint_address: Perform a target-specific adjustment to an\n * address before attempting to match it against watchpoints.\n@@ -167,7 +164,6 @@ struct CPUClass {\n \n const char *gdb_core_xml_file;\n const gchar * (*gdb_arch_name)(CPUState *cpu);\n- const char * (*gdb_get_dynamic_xml)(CPUState *cpu, const char *xmlname);\n \n void (*disas_set_info)(CPUState *cpu, disassemble_info *info);\n \ndiff --git a/target/arm/cpu.h b/target/arm/cpu.h\nindex b2f8ac81f06..c8e77440f0f 100644\n--- a/target/arm/cpu.h\n+++ b/target/arm/cpu.h\n@@ -1182,12 +1182,6 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cpu, vaddr addr,\n int arm_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);\n int arm_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);\n \n-/* Returns the dynamically generated XML for the gdb stub.\n- * Returns a pointer to the XML contents for the specified XML file or NULL\n- * if the XML name doesn't match the predefined one.\n- */\n-const char *arm_gdb_get_dynamic_xml(CPUState *cpu, const char *xmlname);\n-\n int arm_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,\n int cpuid, DumpState *s);\n int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,\ndiff --git a/target/ppc/cpu.h b/target/ppc/cpu.h\nindex f87c26f98a6..9f94282e13e 100644\n--- a/target/ppc/cpu.h\n+++ b/target/ppc/cpu.h\n@@ -1524,7 +1524,6 @@ int ppc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);\n int ppc_cpu_gdb_write_register_apple(CPUState *cpu, uint8_t *buf, int reg);\n #ifndef CONFIG_USER_ONLY\n hwaddr ppc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);\n-const char *ppc_gdb_get_dynamic_xml(CPUState *cs, const char *xml_name);\n #endif\n int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,\n int cpuid, DumpState *s);\ndiff --git a/target/arm/cpu.c b/target/arm/cpu.c\nindex 0a02d16220b..9514edaf041 100644\n--- a/target/arm/cpu.c\n+++ b/target/arm/cpu.c\n@@ -2499,7 +2499,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data)\n cc->sysemu_ops = &arm_sysemu_ops;\n #endif\n cc->gdb_arch_name = arm_gdb_arch_name;\n- cc->gdb_get_dynamic_xml = arm_gdb_get_dynamic_xml;\n cc->gdb_stop_before_watchpoint = true;\n cc->disas_set_info = arm_disas_set_info;\n \ndiff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c\nindex 059d84f98e5..a3bb73cfa7c 100644\n--- a/target/arm/gdbstub.c\n+++ b/target/arm/gdbstub.c\n@@ -474,24 +474,6 @@ static GDBFeature *arm_gen_dynamic_m_secextreg_feature(CPUState *cs,\n #endif\n #endif /* CONFIG_TCG */\n \n-const char *arm_gdb_get_dynamic_xml(CPUState *cs, const char *xmlname)\n-{\n- ARMCPU *cpu = ARM_CPU(cs);\n-\n- if (strcmp(xmlname, \"system-registers.xml\") == 0) {\n- return cpu->dyn_sysreg_feature.desc.xml;\n- } else if (strcmp(xmlname, \"sve-registers.xml\") == 0) {\n- return cpu->dyn_svereg_feature.desc.xml;\n- } else if (strcmp(xmlname, \"arm-m-system.xml\") == 0) {\n- return cpu->dyn_m_systemreg_feature.desc.xml;\n-#ifndef CONFIG_USER_ONLY\n- } else if (strcmp(xmlname, \"arm-m-secext.xml\") == 0) {\n- return cpu->dyn_m_secextreg_feature.desc.xml;\n-#endif\n- }\n- return NULL;\n-}\n-\n void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)\n {\n CPUState *cs = CPU(cpu);\ndiff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c\nindex a0178c3ce80..909d753b022 100644\n--- a/target/ppc/cpu_init.c\n+++ b/target/ppc/cpu_init.c\n@@ -7380,9 +7380,6 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)\n #endif\n \n cc->gdb_num_core_regs = 71;\n-#ifndef CONFIG_USER_ONLY\n- cc->gdb_get_dynamic_xml = ppc_gdb_get_dynamic_xml;\n-#endif\n #ifdef USE_APPLE_GDB\n cc->gdb_read_register = ppc_cpu_gdb_read_register_apple;\n cc->gdb_write_register = ppc_cpu_gdb_write_register_apple;\ndiff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c\nindex 8ca37b6bf95..f47878a67bd 100644\n--- a/target/ppc/gdbstub.c\n+++ b/target/ppc/gdbstub.c\n@@ -342,16 +342,6 @@ static void gdb_gen_spr_feature(CPUState *cs)\n \n gdb_feature_builder_end(&builder);\n }\n-\n-const char *ppc_gdb_get_dynamic_xml(CPUState *cs, const char *xml_name)\n-{\n- PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cs);\n-\n- if (strcmp(xml_name, \"power-spr.xml\") == 0) {\n- return pcc->gdb_spr.xml;\n- }\n- return NULL;\n-}\n #endif\n \n #if !defined(CONFIG_USER_ONLY)\ndiff --git a/target/riscv/cpu.c b/target/riscv/cpu.c\nindex a3a98230ca8..1e3ac556b33 100644\n--- a/target/riscv/cpu.c\n+++ b/target/riscv/cpu.c\n@@ -1529,19 +1529,6 @@ static const gchar *riscv_gdb_arch_name(CPUState *cs)\n }\n }\n \n-static const char *riscv_gdb_get_dynamic_xml(CPUState *cs, const char *xmlname)\n-{\n- RISCVCPU *cpu = RISCV_CPU(cs);\n-\n- if (strcmp(xmlname, \"riscv-csr.xml\") == 0) {\n- return cpu->dyn_csr_feature.xml;\n- } else if (strcmp(xmlname, \"riscv-vector.xml\") == 0) {\n- return cpu->dyn_vreg_feature.xml;\n- }\n-\n- return NULL;\n-}\n-\n #ifndef CONFIG_USER_ONLY\n static int64_t riscv_get_arch_id(CPUState *cs)\n {\n@@ -1695,7 +1682,6 @@ static void riscv_cpu_common_class_init(ObjectClass *c, void *data)\n cc->get_arch_id = riscv_get_arch_id;\n #endif\n cc->gdb_arch_name = riscv_gdb_arch_name;\n- cc->gdb_get_dynamic_xml = riscv_gdb_get_dynamic_xml;\n \n object_class_property_add(c, \"mvendorid\", \"uint32\", cpu_get_mvendorid,\n cpu_set_mvendorid, NULL, NULL);\n","prefixes":["v2","34/43"]}