Patchwork [15/20] target-i386: set custom 'xlevel' without intermediate x86_def_t

login
register
mail settings
Submitter Igor Mammedov
Date Dec. 27, 2012, 2:59 p.m.
Message ID <1356620376-23501-16-git-send-email-imammedo@redhat.com>
Download mbox | patch
Permalink /patch/208338/
State New
Headers show

Comments

Igor Mammedov - Dec. 27, 2012, 2:59 p.m.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 target-i386/cpu.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Eduardo Habkost - Dec. 27, 2012, 7:30 p.m.
On Thu, Dec 27, 2012 at 03:59:31PM +0100, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
>  target-i386/cpu.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 0764015..d8af528 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -1338,7 +1338,9 @@ static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features,
>                              ", fixup will be depricated in future versions\n");
>                      numvalue += 0x80000000;
>                  }
> -                x86_cpu_def->xlevel = numvalue;
> +                val = g_strdup_printf("%u", numvalue);
> +                qdict_put(*props, featurestr, qstring_from_str(val));
> +                g_free(val);

I would write that as:

  QString *s = qstring_new();
  qstring_append_int(s, numvalue);
  qdict_put(*props, featurestr, s);

So there would be no need for manual memory handling.

>              } else if (!strcmp(featurestr, "vendor")) {
>                  qdict_put(*props, featurestr, qstring_from_str(val));
>              } else if (!strcmp(featurestr, "model_id")) {
> -- 
> 1.7.1
>

Patch

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 0764015..d8af528 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1338,7 +1338,9 @@  static int cpu_x86_parse_featurestr(x86_def_t *x86_cpu_def, char *features,
                             ", fixup will be depricated in future versions\n");
                     numvalue += 0x80000000;
                 }
-                x86_cpu_def->xlevel = numvalue;
+                val = g_strdup_printf("%u", numvalue);
+                qdict_put(*props, featurestr, qstring_from_str(val));
+                g_free(val);
             } else if (!strcmp(featurestr, "vendor")) {
                 qdict_put(*props, featurestr, qstring_from_str(val));
             } else if (!strcmp(featurestr, "model_id")) {