Message ID | 1464799050-11002-3-git-send-email-imammedo@redhat.com |
---|---|
State | New |
Headers | show |
On Wed, Jun 01, 2016 at 06:37:24PM +0200, Igor Mammedov wrote: > it will allow to drop custom cpu_x86_init() and use > cpu_generic_init() instead reducing cpu_x86_create() > to a simple 3-liner. > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Nice, it also gets us closer to finally making X86CPU qmp_device_list_properties()-safe. Only one request: > --- > target-i386/cpu.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 6159a7f..c31afc7 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -2200,7 +2200,6 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp) > X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) > { > X86CPU *cpu = NULL; > - X86CPUClass *xcc; > ObjectClass *oc; > gchar **model_pieces; > char *name, *features; > @@ -2219,12 +2218,6 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) > error_setg(&error, "Unable to find CPU definition: %s", name); > goto out; > } > - xcc = X86_CPU_CLASS(oc); > - > - if (xcc->kvm_required && !kvm_enabled()) { > - error_setg(&error, "CPU model '%s' requires KVM", name); > - goto out; > - } > > cpu = X86_CPU(object_new(object_class_get_name(oc))); > > @@ -2901,6 +2894,13 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) > static bool ht_warned; > FeatureWord w; > > + if (xcc->kvm_required && !kvm_enabled()) { > + char *name = g_strdup(object_get_typename(OBJECT(dev))); > + *strstr(name, X86_CPU_TYPE_SUFFIX) = 0; I am not sure if I actually like this trick, but in either case please use x86_cpu_class_get_model_name(). > + error_setg(&local_err, "CPU model '%s' requires KVM", name); > + goto out; > + } > + > if (cpu->apic_id < 0) { > error_setg(errp, "apic-id property was not initialized properly"); > return; > -- > 1.8.3.1 >
On Wed, 1 Jun 2016 14:46:51 -0300 Eduardo Habkost <ehabkost@redhat.com> wrote: > On Wed, Jun 01, 2016 at 06:37:24PM +0200, Igor Mammedov wrote: > > it will allow to drop custom cpu_x86_init() and use > > cpu_generic_init() instead reducing cpu_x86_create() > > to a simple 3-liner. > > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > > Nice, it also gets us closer to finally making X86CPU > qmp_device_list_properties()-safe. Only one request: > > > --- > > target-i386/cpu.c | 14 +++++++------- > > 1 file changed, 7 insertions(+), 7 deletions(-) > > > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > > index 6159a7f..c31afc7 100644 > > --- a/target-i386/cpu.c > > +++ b/target-i386/cpu.c > > @@ -2200,7 +2200,6 @@ static void x86_cpu_load_def(X86CPU *cpu, > > X86CPUDefinition *def, Error **errp) X86CPU *cpu_x86_create(const > > char *cpu_model, Error **errp) { > > X86CPU *cpu = NULL; > > - X86CPUClass *xcc; > > ObjectClass *oc; > > gchar **model_pieces; > > char *name, *features; > > @@ -2219,12 +2218,6 @@ X86CPU *cpu_x86_create(const char > > *cpu_model, Error **errp) error_setg(&error, "Unable to find CPU > > definition: %s", name); goto out; > > } > > - xcc = X86_CPU_CLASS(oc); > > - > > - if (xcc->kvm_required && !kvm_enabled()) { > > - error_setg(&error, "CPU model '%s' requires KVM", name); > > - goto out; > > - } > > > > cpu = X86_CPU(object_new(object_class_get_name(oc))); > > > > @@ -2901,6 +2894,13 @@ static void x86_cpu_realizefn(DeviceState > > *dev, Error **errp) static bool ht_warned; > > FeatureWord w; > > > > + if (xcc->kvm_required && !kvm_enabled()) { > > + char *name = g_strdup(object_get_typename(OBJECT(dev))); > > + *strstr(name, X86_CPU_TYPE_SUFFIX) = 0; > > I am not sure if I actually like this trick, but in either case > please use x86_cpu_class_get_model_name(). thanks for pointing out that x86_cpu_class_get_model_name() exists. > > > + error_setg(&local_err, "CPU model '%s' requires KVM", > > name); > > + goto out; > > + } > > + > > if (cpu->apic_id < 0) { > > error_setg(errp, "apic-id property was not initialized > > properly"); return; > > -- > > 1.8.3.1 > > >
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 6159a7f..c31afc7 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2200,7 +2200,6 @@ static void x86_cpu_load_def(X86CPU *cpu, X86CPUDefinition *def, Error **errp) X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) { X86CPU *cpu = NULL; - X86CPUClass *xcc; ObjectClass *oc; gchar **model_pieces; char *name, *features; @@ -2219,12 +2218,6 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error **errp) error_setg(&error, "Unable to find CPU definition: %s", name); goto out; } - xcc = X86_CPU_CLASS(oc); - - if (xcc->kvm_required && !kvm_enabled()) { - error_setg(&error, "CPU model '%s' requires KVM", name); - goto out; - } cpu = X86_CPU(object_new(object_class_get_name(oc))); @@ -2901,6 +2894,13 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) static bool ht_warned; FeatureWord w; + if (xcc->kvm_required && !kvm_enabled()) { + char *name = g_strdup(object_get_typename(OBJECT(dev))); + *strstr(name, X86_CPU_TYPE_SUFFIX) = 0; + error_setg(&local_err, "CPU model '%s' requires KVM", name); + goto out; + } + if (cpu->apic_id < 0) { error_setg(errp, "apic-id property was not initialized properly"); return;
it will allow to drop custom cpu_x86_init() and use cpu_generic_init() instead reducing cpu_x86_create() to a simple 3-liner. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- target-i386/cpu.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)