From patchwork Fri Jun 21 06:25:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanlong Gao X-Patchwork-Id: 253145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EE34C2C0209 for ; Fri, 21 Jun 2013 17:07:22 +1000 (EST) Received: from localhost ([::1]:48348 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpvRI-0003XJ-Oq for incoming@patchwork.ozlabs.org; Fri, 21 Jun 2013 03:07:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpvQz-0003Wm-Jt for qemu-devel@nongnu.org; Fri, 21 Jun 2013 03:07:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UpvQy-0005kj-0P for qemu-devel@nongnu.org; Fri, 21 Jun 2013 03:07:01 -0400 Received: from [222.73.24.84] (port=56916 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpvPX-0003uG-Ib for qemu-devel@nongnu.org; Fri, 21 Jun 2013 03:06:59 -0400 X-IronPort-AV: E=Sophos;i="4.87,910,1363104000"; d="scan'208";a="7624925" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 21 Jun 2013 14:25:21 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r5L6SC3a022945; Fri, 21 Jun 2013 14:28:14 +0800 Received: from G08FNSTD121251.fnst.cn.fujitsu.com ([10.167.233.84]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013062114270584-2357112 ; Fri, 21 Jun 2013 14:27:05 +0800 From: Wanlong Gao To: qemu-devel@nongnu.org Date: Fri, 21 Jun 2013 14:25:57 +0800 Message-Id: <1371795960-10478-7-git-send-email-gaowanlong@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1.448.gfb7dfaa In-Reply-To: <1371795960-10478-1-git-send-email-gaowanlong@cn.fujitsu.com> References: <1371795960-10478-1-git-send-email-gaowanlong@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/21 14:27:06, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/21 14:27:08, Serialize complete at 2013/06/21 14:27:08 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: aliguori@us.ibm.com, ehabkost@redhat.com, bsd@redhat.com, pbonzini@redhat.com, y-goto@jp.fujitsu.com, afaerber@suse.de, gaowanlong@cn.fujitsu.com Subject: [Qemu-devel] [PATCH V2 6/9] NUMA: handle Error in mpol and hostnode parser 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 As Paolo pointed out that, handle Error in mpol and hostnode parser will make it easier to be used for example in mem-hotplug in the future. And this will be used later in set-mpol QMP command. Signed-off-by: Wanlong Gao --- include/sysemu/sysemu.h | 4 ++++ vl.c | 28 ++++++++++++++++++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 993b8e0..0f135fe 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -144,6 +144,10 @@ struct node_info { unsigned int flags; }; extern struct node_info numa_info[MAX_NODES]; +extern void numa_node_parse_mpol(int nodenr, const char *hostnode, + Error **errp); +extern void numa_node_parse_hostnode(int nodenr, const char *hostnode, + Error **errp); #define MAX_OPTION_ROMS 16 typedef struct QEMUOptionRom { diff --git a/vl.c b/vl.c index 4dbf5cc..4933d22 100644 --- a/vl.c +++ b/vl.c @@ -1382,9 +1382,10 @@ error: exit(1); } -static void numa_node_parse_mpol(int nodenr, const char *mpol) +void numa_node_parse_mpol(int nodenr, const char *mpol, Error **errp) { if (!mpol) { + error_setg(errp, "Should specify memory policy"); return; } @@ -1395,11 +1396,11 @@ static void numa_node_parse_mpol(int nodenr, const char *mpol) } else if (!strcmp(mpol, "membind")) { numa_info[nodenr].flags |= NODE_HOST_BIND; } else { - fprintf(stderr, "qemu: Invalid memory policy: %s\n", mpol); + error_setg(errp, "Invalid memory policy: %s", mpol); } } -static void numa_node_parse_hostnode(int nodenr, const char *hostnode) +void numa_node_parse_hostnode(int nodenr, const char *hostnode, Error **errp) { unsigned long long value, endvalue; char *endptr; @@ -1452,7 +1453,7 @@ static void numa_node_parse_hostnode(int nodenr, const char *hostnode) return; error: - fprintf(stderr, "qemu: Invalid host NUMA nodes range: %s\n", hostnode); + error_setg(errp, "Invalid host NUMA nodes range: %s", hostnode); return; } @@ -1469,19 +1470,34 @@ static int numa_add_cpus(const char *name, const char *value, void *opaque) static int numa_add_mpol(const char *name, const char *value, void *opaque) { int *nodenr = opaque; + Error *err = NULL; if (!strcmp(name, "mem-policy")) { - numa_node_parse_mpol(*nodenr, value); + numa_node_parse_mpol(*nodenr, value, &err); } + if (error_is_set(&err)) { + fprintf(stderr, "qemu: %s\n", error_get_pretty(err)); + error_free(err); + return -1; + } + return 0; } static int numa_add_hostnode(const char *name, const char *value, void *opaque) { int *nodenr = opaque; + Error *err = NULL; + if (!strcmp(name, "mem-hostnode")) { - numa_node_parse_hostnode(*nodenr, value); + numa_node_parse_hostnode(*nodenr, value, &err); } + if (error_is_set(&err)) { + fprintf(stderr, "qemu: %s\n", error_get_pretty(err)); + error_free(err); + return -1; + } + return 0; }