From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: thuth@redhat.com, armbru@redhat.com
Subject: [PATCH 09/16] qom: add object_new_with_class
Date: Wed, 13 Nov 2019 15:38:58 +0100 [thread overview]
Message-ID: <1573655945-14912-10-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1573655945-14912-1-git-send-email-pbonzini@redhat.com>
Similar to CPU and machine classes, "-accel" class names are mangled,
so we have to first get a class via accel_find and then instantiate it.
Provide a new function to instantiate a class without going through
object_class_get_name, and use it for CPUs and machines already.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/qom/object.h | 12 ++++++++++++
qom/object.c | 5 +++++
target/i386/cpu.c | 8 ++++----
target/s390x/cpu_models.c | 4 ++--
vl.c | 3 +--
5 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index 230b18f..f9ad692 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -593,6 +593,18 @@ struct InterfaceClass
__FILE__, __LINE__, __func__))
/**
+ * object_new_with_class:
+ * @klass: The class to instantiate.
+ *
+ * This function will initialize a new object using heap allocated memory.
+ * The returned object has a reference count of 1, and will be freed when
+ * the last reference is dropped.
+ *
+ * Returns: The newly allocated and instantiated object.
+ */
+Object *object_new_with_class(ObjectClass *klass);
+
+/**
* object_new:
* @typename: The name of the type of the object to instantiate.
*
diff --git a/qom/object.c b/qom/object.c
index c7825dd..ee7708e 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -658,6 +658,11 @@ static Object *object_new_with_type(Type type)
return obj;
}
+Object *object_new_with_class(ObjectClass *klass)
+{
+ return object_new_with_type(klass->type);
+}
+
Object *object_new(const char *typename)
{
TypeImpl *ti = type_get_by_name(typename);
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index a624163..4742a0e 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -3881,7 +3881,7 @@ static void x86_cpu_class_check_missing_features(X86CPUClass *xcc,
return;
}
- xc = X86_CPU(object_new(object_class_get_name(OBJECT_CLASS(xcc))));
+ xc = X86_CPU(object_new_with_class(OBJECT_CLASS(xcc)));
x86_cpu_expand_features(xc, &err);
if (err) {
@@ -3952,7 +3952,7 @@ static GSList *get_sorted_cpu_model_list(void)
static char *x86_cpu_class_get_model_id(X86CPUClass *xc)
{
- Object *obj = object_new(object_class_get_name(OBJECT_CLASS(xc)));
+ Object *obj = object_new_with_class(OBJECT_CLASS(xc));
char *r = object_property_get_str(obj, "model-id", &error_abort);
object_unref(obj);
return r;
@@ -4333,7 +4333,7 @@ static X86CPU *x86_cpu_from_model(const char *model, QDict *props, Error **errp)
goto out;
}
- xc = X86_CPU(object_new(object_class_get_name(OBJECT_CLASS(xcc))));
+ xc = X86_CPU(object_new_with_class(OBJECT_CLASS(xcc)));
if (props) {
object_apply_props(OBJECT(xc), props, &err);
if (err) {
@@ -5177,7 +5177,7 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp)
APICCommonState *apic;
ObjectClass *apic_class = OBJECT_CLASS(apic_get_class());
- cpu->apic_state = DEVICE(object_new(object_class_get_name(apic_class)));
+ cpu->apic_state = DEVICE(object_new_with_class(apic_class));
object_property_add_child(OBJECT(cpu), "lapic",
OBJECT(cpu->apic_state), &error_abort);
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index 7e92fb2..72cf48b 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -440,7 +440,7 @@ static void create_cpu_model_list(ObjectClass *klass, void *opaque)
if (cpu_list_data->model) {
Object *obj;
S390CPU *sc;
- obj = object_new(object_class_get_name(klass));
+ obj = object_new_with_class(klass);
sc = S390_CPU(obj);
if (sc->model) {
info->has_unavailable_features = true;
@@ -501,7 +501,7 @@ static void cpu_model_from_info(S390CPUModel *model, const CpuModelInfo *info,
error_setg(errp, "The CPU definition '%s' requires KVM", info->name);
return;
}
- obj = object_new(object_class_get_name(oc));
+ obj = object_new_with_class(oc);
cpu = S390_CPU(obj);
if (!cpu->model) {
diff --git a/vl.c b/vl.c
index cb993dd..6e406d4 100644
--- a/vl.c
+++ b/vl.c
@@ -3988,8 +3988,7 @@ int main(int argc, char **argv, char **envp)
cleanup_add_fd, NULL, &error_fatal);
#endif
- current_machine = MACHINE(object_new(object_class_get_name(
- OBJECT_CLASS(machine_class))));
+ current_machine = MACHINE(object_new_with_class(OBJECT_CLASS(machine_class)));
if (machine_help_func(qemu_get_machine_opts(), current_machine)) {
exit(0);
}
--
1.8.3.1
next prev parent reply other threads:[~2019-11-13 14:49 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-13 14:38 [PATCH for-5.0 00/16] Complete the implementation of -accel Paolo Bonzini
2019-11-13 14:38 ` [PATCH 01/16] memory: do not look at current_machine->accel Paolo Bonzini
2019-11-14 8:56 ` Marc-André Lureau
2019-11-14 9:27 ` Paolo Bonzini
2019-11-14 9:31 ` Marc-André Lureau
2019-11-14 9:10 ` Thomas Huth
2019-11-14 9:35 ` Paolo Bonzini
2019-11-14 9:46 ` Thomas Huth
2019-11-14 10:21 ` Peter Maydell
2019-11-14 10:32 ` Paolo Bonzini
2019-11-14 10:40 ` Peter Maydell
2019-11-14 10:47 ` Paolo Bonzini
2019-11-13 14:38 ` [PATCH 02/16] vl: extract accelerator option processing to a separate function Paolo Bonzini
2019-11-14 7:55 ` Marc-André Lureau
2019-11-14 9:29 ` Paolo Bonzini
2019-11-18 10:58 ` Thomas Huth
2019-11-18 11:39 ` Paolo Bonzini
2019-11-13 14:38 ` [PATCH 03/16] vl: merge -accel processing into configure_accelerators Paolo Bonzini
2019-11-14 8:13 ` Marc-André Lureau
2019-11-18 11:27 ` Thomas Huth
2019-11-18 11:39 ` Paolo Bonzini
2019-11-18 15:12 ` Wainer dos Santos Moschetta
2019-11-13 14:38 ` [PATCH 04/16] vl: move icount configuration earlier Paolo Bonzini
2019-11-14 8:24 ` Marc-André Lureau
2019-11-18 11:53 ` Thomas Huth
2019-11-13 14:38 ` [PATCH 05/16] vl: introduce object_parse_property_opt Paolo Bonzini
2019-11-14 8:23 ` Marc-André Lureau
2019-11-14 9:46 ` Paolo Bonzini
2019-11-13 14:38 ` [PATCH 06/16] vl: configure accelerators from -accel options Paolo Bonzini
2019-11-18 17:59 ` Wainer dos Santos Moschetta
2019-11-13 14:38 ` [PATCH 07/16] vl: warn for unavailable accelerators, clarify messages Paolo Bonzini
2019-11-14 9:28 ` Marc-André Lureau
2019-11-13 14:38 ` [PATCH 08/16] qom: introduce object_register_sugar_prop Paolo Bonzini
2019-11-14 9:53 ` Marc-André Lureau
2019-11-14 10:03 ` Paolo Bonzini
2019-11-13 14:38 ` Paolo Bonzini [this message]
2019-11-14 9:56 ` [PATCH 09/16] qom: add object_new_with_class Marc-André Lureau
2019-11-13 14:38 ` [PATCH 10/16] accel: pass object to accel_init_machine Paolo Bonzini
2019-11-14 10:48 ` Marc-André Lureau
2019-11-13 14:39 ` [PATCH 11/16] tcg: convert "-accel threads" to a QOM property Paolo Bonzini
2019-11-14 11:08 ` Marc-André Lureau
2019-11-13 14:39 ` [PATCH 12/16] tcg: add "-accel tcg,tb-size" and deprecate "-tb-size" Paolo Bonzini
2019-11-19 10:44 ` Thomas Huth
2019-11-13 14:39 ` [PATCH 13/16] xen: convert "-machine igd-passthru" to an accelerator property Paolo Bonzini
2019-11-14 9:39 ` Paul Durrant
2019-11-14 9:47 ` Paolo Bonzini
2019-11-14 9:52 ` Paul Durrant
2019-11-19 11:02 ` Thomas Huth
2019-11-13 14:39 ` [PATCH 14/16] kvm: convert "-machine kvm_shadow_mem" " Paolo Bonzini
2019-11-19 11:33 ` Thomas Huth
2019-11-13 14:39 ` [PATCH 15/16] kvm: introduce kvm_kernel_irqchip_* functions Paolo Bonzini
2019-11-19 11:56 ` Thomas Huth
2019-11-19 12:13 ` Paolo Bonzini
2019-11-19 12:22 ` Thomas Huth
2019-11-13 14:39 ` [PATCH 16/16] kvm: convert "-machine kernel_irqchip" to an accelerator property Paolo Bonzini
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=1573655945-14912-10-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.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).