From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Bernhard Beschow" <shentey@gmail.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Peter Xu" <peterx@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v2 4/5] hw/intc/apic: Rename x86_cpu_apic_create() -> x86_cpu_apic_new()
Date: Tue, 3 Oct 2023 10:27:27 +0200 [thread overview]
Message-ID: <20231003082728.83496-5-philmd@linaro.org> (raw)
In-Reply-To: <20231003082728.83496-1-philmd@linaro.org>
x86_cpu_apic_create()'s Error** parameter is unused, drop it.
While there is no convention, QDev methods are usually named
with _new() / _realize() suffixes. Rename as appropriate.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/i386/cpu-internal.h | 2 +-
hw/intc/apic_common.c | 2 +-
target/i386/cpu-sysemu.c | 2 +-
target/i386/cpu.c | 5 +----
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/target/i386/cpu-internal.h b/target/i386/cpu-internal.h
index 9baac5c0b4..8299b347f7 100644
--- a/target/i386/cpu-internal.h
+++ b/target/i386/cpu-internal.h
@@ -62,7 +62,7 @@ GuestPanicInformation *x86_cpu_get_crash_info(CPUState *cs);
void x86_cpu_get_crash_info_qom(Object *obj, Visitor *v,
const char *name, void *opaque, Error **errp);
-void x86_cpu_apic_create(X86CPU *cpu, Error **errp);
+void x86_cpu_apic_new(X86CPU *cpu);
void x86_cpu_apic_realize(X86CPU *cpu, Error **errp);
void x86_cpu_machine_reset_cb(void *opaque);
#endif /* !CONFIG_USER_ONLY */
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index bccb4241c2..8a79eacdb0 100644
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -451,7 +451,7 @@ static void apic_common_class_init(ObjectClass *klass, void *data)
dc->unrealize = apic_common_unrealize;
/*
* Reason: APIC and CPU need to be wired up by
- * x86_cpu_apic_create()
+ * x86_cpu_apic_new()
*/
dc->user_creatable = false;
}
diff --git a/target/i386/cpu-sysemu.c b/target/i386/cpu-sysemu.c
index 9038c65267..373dc6b1c7 100644
--- a/target/i386/cpu-sysemu.c
+++ b/target/i386/cpu-sysemu.c
@@ -263,7 +263,7 @@ APICCommonClass *apic_get_class(void)
return APIC_COMMON_CLASS(object_class_by_name(apic_type));
}
-void x86_cpu_apic_create(X86CPU *cpu, Error **errp)
+void x86_cpu_apic_new(X86CPU *cpu)
{
APICCommonState *apic;
APICCommonClass *apic_class = apic_get_class();
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index ed72883bf3..69d56bae91 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -7418,10 +7418,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
qemu_register_reset(x86_cpu_machine_reset_cb, cpu);
if (cpu->env.features[FEAT_1_EDX] & CPUID_APIC || ms->smp.cpus > 1) {
- x86_cpu_apic_create(cpu, &local_err);
- if (local_err != NULL) {
- goto out;
- }
+ x86_cpu_apic_new(cpu);
}
#endif
--
2.41.0
next prev parent reply other threads:[~2023-10-03 8:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-03 8:27 [PATCH v2 0/5] hw/intc/apic: QOM cleanup Philippe Mathieu-Daudé
2023-10-03 8:27 ` [PATCH v2 1/5] hw/intc/apic: Use ERRP_GUARD() in apic_common_realize() Philippe Mathieu-Daudé
2023-10-03 20:50 ` Peter Xu
2023-10-03 8:27 ` [PATCH v2 2/5] hw/i386/apic: Defer error check from apic_get_class to kvm_apic_realize Philippe Mathieu-Daudé
2023-10-03 20:49 ` Peter Xu
2023-10-03 23:21 ` Bernhard Beschow
2023-10-05 7:06 ` Philippe Mathieu-Daudé
2023-10-05 7:40 ` Bernhard Beschow
2023-10-03 8:27 ` [PATCH v2 3/5] hw/i386/apic: Simplify apic_get_class() Philippe Mathieu-Daudé
2023-10-03 20:51 ` Peter Xu
2023-10-03 23:41 ` Bernhard Beschow
2023-10-03 8:27 ` Philippe Mathieu-Daudé [this message]
2023-10-03 20:51 ` [PATCH v2 4/5] hw/intc/apic: Rename x86_cpu_apic_create() -> x86_cpu_apic_new() Peter Xu
2023-10-05 23:00 ` Paolo Bonzini
2023-10-03 8:27 ` [PATCH v2 5/5] hw/intc/apic: Pass CPU using QOM link property Philippe Mathieu-Daudé
2023-10-05 23:04 ` Paolo Bonzini
2023-10-16 14:38 ` 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=20231003082728.83496-5-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=armbru@redhat.com \
--cc=eduardo@habkost.net \
--cc=jasowang@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=shentey@gmail.com \
/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).