From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v3 14/19] hw/virtio/virtio-pci: Do not access base_type_info.name directly
Date: Wed, 12 Feb 2025 22:32:44 +0100 [thread overview]
Message-ID: <20250212213249.45574-15-philmd@linaro.org> (raw)
In-Reply-To: <20250212213249.45574-1-philmd@linaro.org>
base_type_info.name is initialized to t->base_name,
check that directly.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/virtio/virtio-pci.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index ad1d164421d..9512590c936 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -2476,7 +2476,7 @@ void virtio_pci_types_register(const VirtioPCIDeviceTypeInfo *t)
? g_strconcat(t->generic_name, "-base-type", NULL)
: NULL;
TypeInfo base_type_info = {
- .name = t->base_name,
+ .name = t->base_name ?: base_name,
.parent = t->parent ? t->parent : TYPE_VIRTIO_PCI,
.instance_size = t->instance_size,
.instance_init = t->instance_init,
@@ -2487,7 +2487,7 @@ void virtio_pci_types_register(const VirtioPCIDeviceTypeInfo *t)
};
TypeInfo generic_type_info = {
.name = t->generic_name,
- .parent = base_type_info.name,
+ .parent = t->base_name,
.class_init = virtio_pci_generic_class_init,
.interfaces = (const InterfaceInfo[]) {
{ INTERFACE_PCIE_DEVICE },
@@ -2499,8 +2499,7 @@ void virtio_pci_types_register(const VirtioPCIDeviceTypeInfo *t)
assert(t->base_name || !t->non_transitional_name);
assert(t->base_name || !t->transitional_name);
- if (!base_type_info.name) {
- base_type_info.name = base_name;
+ if (!t->base_name) {
base_type_info.class_init = virtio_pci_generic_class_init;
generic_type_info.parent = base_name;
@@ -2519,7 +2518,7 @@ void virtio_pci_types_register(const VirtioPCIDeviceTypeInfo *t)
if (t->non_transitional_name) {
const TypeInfo non_transitional_type_info = {
.name = t->non_transitional_name,
- .parent = base_type_info.name,
+ .parent = t->base_name ?: base_name,
.instance_init = virtio_pci_non_transitional_instance_init,
.interfaces = (const InterfaceInfo[]) {
{ INTERFACE_PCIE_DEVICE },
@@ -2533,7 +2532,7 @@ void virtio_pci_types_register(const VirtioPCIDeviceTypeInfo *t)
if (t->transitional_name) {
const TypeInfo transitional_type_info = {
.name = t->transitional_name,
- .parent = base_type_info.name,
+ .parent = t->base_name ?: base_name,
.instance_init = virtio_pci_transitional_instance_init,
.interfaces = (const InterfaceInfo[]) {
/*
--
2.47.1
next prev parent reply other threads:[~2025-02-12 21:37 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-12 21:32 [PATCH v3 00/19] qom: Constify class_data Philippe Mathieu-Daudé
2025-02-12 21:32 ` [PATCH v3 01/19] hw: Declare various const data as 'const' Philippe Mathieu-Daudé
2025-02-12 21:32 ` [PATCH v3 02/19] hw: Make class data 'const' Philippe Mathieu-Daudé
2025-02-12 21:32 ` [PATCH v3 03/19] target/i386: Constify X86CPUModel uses Philippe Mathieu-Daudé
2025-02-12 21:32 ` [PATCH v3 04/19] target/sparc: Constify SPARCCPUClass::cpu_def Philippe Mathieu-Daudé
2025-02-12 21:32 ` [PATCH v3 05/19] target/xtensa: Finalize config in xtensa_register_core() Philippe Mathieu-Daudé
2025-02-12 21:32 ` [PATCH v3 06/19] target/riscv: Declare RISCVCPUClass::misa_mxl_max as RISCVMXL Philippe Mathieu-Daudé
2025-02-17 5:08 ` Alistair Francis
2025-02-12 21:32 ` [PATCH v3 07/19] target/riscv: Convert misa_mxl_max using GLib macros Philippe Mathieu-Daudé
2025-02-17 5:13 ` Alistair Francis
2025-02-12 21:32 ` [PATCH v3 08/19] qom: Have class_base_init() take a const data argument Philippe Mathieu-Daudé
2025-02-12 21:32 ` [PATCH v3 09/19] qom: Have class_init() " Philippe Mathieu-Daudé
2025-02-12 21:32 ` [PATCH v3 10/19] qom: Constify TypeInfo::class_data Philippe Mathieu-Daudé
2025-02-12 21:32 ` [PATCH v3 11/19] qom: Constify InterfaceInfo[] interfaces Philippe Mathieu-Daudé
2025-02-12 21:32 ` [PATCH v3 12/19] hw/virtio/virtio-pci: Always allocate QOM type base_name Philippe Mathieu-Daudé
2025-02-12 22:06 ` Richard Henderson
2025-02-12 21:32 ` [PATCH v3 13/19] hw/virtio/virtio-pci: Assert before registering QOM types Philippe Mathieu-Daudé
2025-02-12 21:32 ` Philippe Mathieu-Daudé [this message]
2025-02-12 21:32 ` [PATCH v3 15/19] hw/virtio/virtio-pci: Constify base_type_info Philippe Mathieu-Daudé
2025-02-12 21:32 ` [PATCH v3 16/19] hw/virtio/virtio-pci: Constify generic_type_info Philippe Mathieu-Daudé
2025-02-12 21:32 ` [PATCH v3 17/19] hw/virtio/virtio-pci: Reduce generic_type_info scope Philippe Mathieu-Daudé
2025-02-12 21:32 ` [PATCH v3 18/19] hw: Constify various TypeInfo and associated structures Philippe Mathieu-Daudé
2025-02-12 22:10 ` Richard Henderson
2025-02-12 21:32 ` [PATCH v3 19/19] qom: Require TypeInfo::class_data points to const data Philippe Mathieu-Daudé
2025-02-12 22:11 ` Richard Henderson
2025-02-18 16:51 ` Philippe Mathieu-Daudé
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=20250212213249.45574-15-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).