From: Richard Henderson <richard.henderson@linaro.org>
To: "Philippe Mathieu-Daudé" <philmd@linaro.org>, qemu-devel@nongnu.org
Subject: Re: [PATCH 15/18] cpus: Open code OBJECT_DECLARE_TYPE() in OBJECT_DECLARE_CPU_TYPE()
Date: Fri, 13 Oct 2023 05:47:01 -0700 [thread overview]
Message-ID: <06f15a55-9d19-40d8-b71f-90de8984b01a@linaro.org> (raw)
In-Reply-To: <c580297d-c3cc-4476-a941-6dbc5e11dc43@linaro.org>
On 10/12/23 21:27, Richard Henderson wrote:
> On 10/10/23 02:28, Philippe Mathieu-Daudé wrote:
>> Since the OBJECT_DECLARE_CPU_TYPE() macro uses the abstract ArchCPU
>> type, when declaring multiple CPUs of the same ArchCPU type we get
>> an error related to the indirect G_DEFINE_AUTOPTR_CLEANUP_FUNC()
>> use within OBJECT_DECLARE_TYPE():
>>
>> target/mips/cpu-qom.h:31:1: error: redefinition of 'glib_autoptr_clear_ArchCPU'
>> OBJECT_DECLARE_CPU_TYPE(MIPS64CPU, MIPSCPUClass, MIPS64_CPU)
>> ^
>> include/hw/core/cpu.h:82:5: note: expanded from macro 'OBJECT_DECLARE_CPU_TYPE'
>> OBJECT_DECLARE_TYPE(ArchCPU, CpuClassType, CPU_MODULE_OBJ_NAME);
>> ^
>> include/qom/object.h:237:5: note: expanded from macro 'OBJECT_DECLARE_TYPE'
>> G_DEFINE_AUTOPTR_CLEANUP_FUNC(InstanceType, object_unref) \
>> ^
>> /usr/include/glib-2.0/glib/gmacros.h:1371:3: note: expanded from macro
>> 'G_DEFINE_AUTOPTR_CLEANUP_FUNC'
>> _GLIB_DEFINE_AUTOPTR_CLEANUP_FUNCS(TypeName, TypeName, func)
>> ^
>> /usr/include/glib-2.0/glib/gmacros.h:1354:36: note: expanded from macro
>> '_GLIB_DEFINE_AUTOPTR_CLEANUP_FUNCS'
>> static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_CLEAR_FUNC_NAME(TypeName) (TypeName
>> *_ptr) \
>> ^
>> /usr/include/glib-2.0/glib/gmacros.h:1338:49: note: expanded from macro
>> '_GLIB_AUTOPTR_CLEAR_FUNC_NAME'
>> #define _GLIB_AUTOPTR_CLEAR_FUNC_NAME(TypeName) glib_autoptr_clear_##TypeName
>> ^
>> <scratch space>:54:1: note: expanded from here
>> glib_autoptr_clear_ArchCPU
>> ^
>> target/mips/cpu-qom.h:30:1: note: previous definition is here
>> OBJECT_DECLARE_CPU_TYPE(MIPS32CPU, MIPSCPUClass, MIPS32_CPU)
>> ^
>>
>> Avoid that problem by expanding the OBJECT_DECLARE_TYPE() macro
>> within OBJECT_DECLARE_CPU_TYPE().
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> ---
>> include/hw/core/cpu.h | 7 ++++++-
>> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> Unfortunate, but I suppose this isn't so bad.
>
> Acked-by: Richard Henderson <richard.henderson@linaro.org>
What about adding an OBJECT_DECLARE_CPU_SUBTYPE that omits half the stuff instead?
We don't need another object typedef at all, for instance.
r~
next prev parent reply other threads:[~2023-10-13 12:48 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-10 9:28 [PATCH 00/18] target: Make 'cpu-qom.h' really target agnostic Philippe Mathieu-Daudé
2023-10-10 9:28 ` [PATCH 01/18] target: Mention 'cpu-qom.h' is " Philippe Mathieu-Daudé
2023-10-13 3:55 ` Richard Henderson
2023-10-10 9:28 ` [PATCH 02/18] target/ppc: Remove CPU_RESOLVING_TYPE from 'cpu-qom.h' Philippe Mathieu-Daudé
2023-10-13 3:55 ` Richard Henderson
2023-10-10 9:28 ` [PATCH 03/18] target/riscv: " Philippe Mathieu-Daudé
2023-10-10 11:36 ` LIU Zhiwei
2023-10-13 3:57 ` Richard Henderson
2023-10-10 9:28 ` [PATCH 04/18] target: Declare FOO_CPU_TYPE_NAME/SUFFIX in 'cpu-qom.h' Philippe Mathieu-Daudé
2023-10-11 2:51 ` LIU Zhiwei
2023-10-11 3:21 ` Philippe Mathieu-Daudé
2023-10-11 6:12 ` LIU Zhiwei
2023-10-13 4:02 ` Richard Henderson
2023-10-10 9:28 ` [PATCH 05/18] target/hexagon: Declare QOM definitions " Philippe Mathieu-Daudé
2023-10-13 4:06 ` Richard Henderson
2023-10-13 9:18 ` Philippe Mathieu-Daudé
2023-10-10 9:28 ` [PATCH 06/18] target/loongarch: " Philippe Mathieu-Daudé
2023-10-10 11:33 ` gaosong
2023-10-10 9:28 ` [PATCH 07/18] target/nios2: " Philippe Mathieu-Daudé
2023-10-10 9:28 ` [PATCH 08/18] target/openrisc: " Philippe Mathieu-Daudé
2023-10-10 9:28 ` [PATCH 09/18] target/i386: Inline target specific TARGET_DEFAULT_CPU_TYPE definition Philippe Mathieu-Daudé
2023-10-13 4:09 ` Richard Henderson
2023-10-10 9:28 ` [PATCH 10/18] target/riscv: Inline target specific TYPE_RISCV_CPU_BASE definition Philippe Mathieu-Daudé
2023-10-10 11:33 ` LIU Zhiwei
2023-10-11 0:46 ` Alistair Francis
2023-10-13 4:13 ` Richard Henderson
2023-10-13 13:58 ` Philippe Mathieu-Daudé
2023-10-10 9:28 ` [PATCH 11/18] target/i386: Declare CPU QOM types using DEFINE_TYPES() macro Philippe Mathieu-Daudé
2023-10-13 4:17 ` Richard Henderson
2023-10-10 9:28 ` [PATCH 12/18] target/mips: " Philippe Mathieu-Daudé
2023-10-13 4:18 ` Richard Henderson
2023-10-10 9:28 ` [PATCH 13/18] target/ppc: " Philippe Mathieu-Daudé
2023-10-13 4:20 ` Richard Henderson
2023-10-10 9:28 ` [PATCH 14/18] target/sparc: " Philippe Mathieu-Daudé
2023-10-13 4:21 ` Richard Henderson
2023-10-13 18:25 ` Mark Cave-Ayland
2023-10-10 9:28 ` [PATCH 15/18] cpus: Open code OBJECT_DECLARE_TYPE() in OBJECT_DECLARE_CPU_TYPE() Philippe Mathieu-Daudé
2023-10-13 4:27 ` Richard Henderson
2023-10-13 12:47 ` Richard Henderson [this message]
2023-10-10 9:28 ` [PATCH 16/18] target/i386: Make X86_CPU common to new I386_CPU / X86_64_CPU types Philippe Mathieu-Daudé
2023-10-13 4:31 ` Richard Henderson
2023-10-10 9:28 ` [PATCH 17/18] target/mips: Make MIPS_CPU common to new MIPS32_CPU / MIPS64_CPU types Philippe Mathieu-Daudé
2023-10-13 4:34 ` Richard Henderson
2024-03-15 12:22 ` Philippe Mathieu-Daudé
2025-03-25 15:20 ` Philippe Mathieu-Daudé
2023-10-10 9:29 ` [PATCH 18/18] target/sparc: Make SPARC_CPU common to new SPARC32_CPU/SPARC64_CPU types Philippe Mathieu-Daudé
2023-10-13 18:28 ` Mark Cave-Ayland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=06f15a55-9d19-40d8-b71f-90de8984b01a@linaro.org \
--to=richard.henderson@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).