From 8f2c699960df206acc4b6579be10371ce14d1b80 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 18 Jan 2012 10:38:31 +0100 Subject: [PATCH 37/52] x86/cpuid: Convert remaining strdup() to g_strdup() RH-Author: Markus Armbruster Message-id: <1326883126-22053-38-git-send-email-armbru@redhat.com> Patchwork-id: 36615 O-Subject: [RHEL-6.3 PATCH qemu-kvm 37/52] x86/cpuid: Convert remaining strdup() to g_strdup() Bugzilla: 758194 RH-Acked-by: Miroslav Rezanina RH-Acked-by: Laszlo Ersek RH-Acked-by: Amit Shah Fixes missing error checking. Signed-off-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi (cherry picked from commit d3c481b357ee6f78d3df10ee30407fa05d85b76c) Conflicts: target-i386/cpuid.c --- target-i386/cpuid.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) Signed-off-by: Michal Novotny --- 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 aa205bf..61f609e 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -538,7 +538,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, ","); uint32_t plus_features = 0, plus_ext_features = 0, plus_ext2_features = 0, plus_ext3_features = 0, plus_kvm_features = 0; uint32_t minus_features = 0, minus_ext_features = 0, minus_ext2_features = 0, minus_ext3_features = 0, minus_kvm_features = 0; @@ -656,11 +656,11 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) x86_cpu_def->ext2_features &= ~minus_ext2_features; x86_cpu_def->ext3_features &= ~minus_ext3_features; x86_cpu_def->kvm_features &= ~minus_kvm_features; - free(s); + g_free(s); return 0; error: - free(s); + g_free(s); return -1; } @@ -864,7 +864,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")) { -- 1.7.7.5