[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/8] x86/cpuid: Convert remaining strdup() to g_strd
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 5/8] x86/cpuid: Convert remaining strdup() to g_strdup() |
Date: |
Thu, 10 Nov 2011 12:36:41 +0000 |
From: Markus Armbruster <address@hidden>
Fixes missing error checking.
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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 edac377..352c390 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")) {
--
1.7.7.1
- [Qemu-devel] [PULL 0/8] Trivial patches for 8 to 10 November 2011, Stefan Hajnoczi, 2011/11/10
- [Qemu-devel] [PATCH 6/8] x86/cpuid: Plug memory leak in cpudef_setfield(), Stefan Hajnoczi, 2011/11/10
- [Qemu-devel] [PATCH 7/8] x86/cpuid: Fix crash on -cpu "", Stefan Hajnoczi, 2011/11/10
- [Qemu-devel] [PATCH 1/8] qemu-tech.texi: Update default code cache size, Stefan Hajnoczi, 2011/11/10
- [Qemu-devel] [PATCH 3/8] qdev: Fix crash on -device '?=x', Stefan Hajnoczi, 2011/11/10
- [Qemu-devel] [PATCH 4/8] ui/vnc: Convert sasl.mechlist to g_malloc() & friends, Stefan Hajnoczi, 2011/11/10
- [Qemu-devel] [PATCH 8/8] hw/lan9118.c: Add missing 'break' to fix buffer overrun, Stefan Hajnoczi, 2011/11/10
- [Qemu-devel] [PATCH 2/8] configure: Show --cpu option on the help list, Stefan Hajnoczi, 2011/11/10
- [Qemu-devel] [PATCH 5/8] x86/cpuid: Convert remaining strdup() to g_strdup(),
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PULL 0/8] Trivial patches for 8 to 10 November 2011, Anthony Liguori, 2011/11/10