mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 02:03:56 -06:00
qom: add object_new_with_class
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. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
1fff3c206f
commit
3c75e12ea6
6 changed files with 25 additions and 11 deletions
|
@ -4695,7 +4695,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) {
|
||||
|
@ -4763,7 +4763,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;
|
||||
|
@ -5141,7 +5141,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) {
|
||||
|
@ -5983,7 +5983,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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue