From patchwork Thu Nov 10 12:36:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 124872 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9B680B6F7C for ; Fri, 11 Nov 2011 00:16:08 +1100 (EST) Received: from localhost ([::1]:59146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROTsk-0004kG-Na for incoming@patchwork.ozlabs.org; Thu, 10 Nov 2011 07:37:26 -0500 Received: from eggs.gnu.org ([140.186.70.92]:47470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROTsM-000422-C8 for qemu-devel@nongnu.org; Thu, 10 Nov 2011 07:37:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ROTsC-0005uH-P0 for qemu-devel@nongnu.org; Thu, 10 Nov 2011 07:37:02 -0500 Received: from mtagate1.uk.ibm.com ([194.196.100.161]:50478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROTsC-0005tN-HO for qemu-devel@nongnu.org; Thu, 10 Nov 2011 07:36:52 -0500 Received: from d06nrmr1307.portsmouth.uk.ibm.com (d06nrmr1307.portsmouth.uk.ibm.com [9.149.38.129]) by mtagate1.uk.ibm.com (8.13.1/8.13.1) with ESMTP id pAACaoTo031010 for ; Thu, 10 Nov 2011 12:36:50 GMT Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pAACaoj42015378 for ; Thu, 10 Nov 2011 12:36:50 GMT Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pAACanTv008846 for ; Thu, 10 Nov 2011 05:36:50 -0700 Received: from localhost (stefanha-thinkpad.manchester-maybrook.uk.ibm.com [9.174.219.31]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pAACanrT008826; Thu, 10 Nov 2011 05:36:49 -0700 From: Stefan Hajnoczi To: Date: Thu, 10 Nov 2011 12:36:41 +0000 Message-Id: <1320928604-6642-6-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1320928604-6642-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1320928604-6642-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 194.196.100.161 Cc: Anthony Liguori , Markus Armbruster , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 5/8] x86/cpuid: Convert remaining strdup() to g_strdup() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster Fixes missing error checking. Signed-off-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- 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")) {