diff options
author | Markus Armbruster <armbru@redhat.com> | 2011-11-08 15:36:48 +0100 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2011-11-10 12:29:50 +0000 |
commit | d3c481b357ee6f78d3df10ee30407fa05d85b76c (patch) | |
tree | 7df3a0c99923a9363393b7d97b52d00ed47da32e /target-i386/cpuid.c | |
parent | 302d9d6fd8cb34e393cc9bb101a1748bd53899d3 (diff) | |
download | qemu-d3c481b357ee6f78d3df10ee30407fa05d85b76c.zip |
x86/cpuid: Convert remaining strdup() to g_strdup()
Fixes missing error checking.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Diffstat (limited to 'target-i386/cpuid.c')
-rw-r--r-- | target-i386/cpuid.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index edac377a02..352c390d0c 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -581,7 +581,7 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) unsigned int i; x86_def_t *def; - char *s = strdup(cpu_model); + char *s = g_strdup(cpu_model); char *featurestr, *name = strtok(s, ","); /* Features to be added*/ uint32_t plus_features = 0, plus_ext_features = 0; @@ -727,11 +727,11 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) if (check_features_against_host(x86_cpu_def) && enforce_cpuid) goto error; } - free(s); + g_free(s); return 0; error: - free(s); + g_free(s); return -1; } @@ -950,7 +950,7 @@ static int cpudef_setfield(const char *name, const char *str, void *opaque) int err = 0; if (!strcmp(name, "name")) { - def->name = strdup(str); + def->name = g_strdup(str); } else if (!strcmp(name, "model_id")) { strncpy(def->model_id, str, sizeof (def->model_id)); } else if (!strcmp(name, "level")) { |