From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur0zS-0008J2-4e for qemu-devel@nongnu.org; Mon, 24 Jun 2013 03:15:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ur0zN-0001fU-Rv for qemu-devel@nongnu.org; Mon, 24 Jun 2013 03:15:06 -0400 Received: from [222.73.24.84] (port=7364 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur0zN-0001bJ-DO for qemu-devel@nongnu.org; Mon, 24 Jun 2013 03:15:01 -0400 From: Wanlong Gao Date: Mon, 24 Jun 2013 15:12:03 +0800 Message-Id: <1372057928-20248-6-git-send-email-gaowanlong@cn.fujitsu.com> In-Reply-To: <1372057928-20248-1-git-send-email-gaowanlong@cn.fujitsu.com> References: <1372057928-20248-1-git-send-email-gaowanlong@cn.fujitsu.com> Subject: [Qemu-devel] [PATCH V3 05/10] NUMA: handle Error in cpus, mpol and hostnode parser List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 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. Also handle Error in cpus parser to be consistent with others. Signed-off-by: Wanlong Gao --- include/sysemu/sysemu.h | 4 ++++ vl.c | 42 ++++++++++++++++++++++++++++++++---------- 2 files changed, 36 insertions(+), 10 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..79c39b9 100644 --- a/vl.c +++ b/vl.c @@ -1338,7 +1338,7 @@ char *get_boot_devices_list(size_t *size) return list; } -static void numa_node_parse_cpus(int nodenr, const char *cpus) +static void numa_node_parse_cpus(int nodenr, const char *cpus, Error **errp) { char *endptr; unsigned long long value, endvalue; @@ -1378,13 +1378,14 @@ static void numa_node_parse_cpus(int nodenr, const char *cpus) return; error: - fprintf(stderr, "qemu: Invalid NUMA CPU range: %s\n", cpus); - exit(1); + error_setg(errp, "Invalid NUMA CPU range: %s\n", cpus); + return; } -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,16 +1453,22 @@ 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; } static int numa_add_cpus(const char *name, const char *value, void *opaque) { int *nodenr = opaque; + Error *err = NULL; if (!strcmp(name, "cpu")) { - numa_node_parse_cpus(*nodenr, value); + numa_node_parse_cpus(*nodenr, value, &err); + } + if (error_is_set(&err)) { + fprintf(stderr, "qemu: %s\n", error_get_pretty(err)); + error_free(err); + return -1; } return 0; } @@ -1469,19 +1476,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; } -- 1.8.3.1.448.gfb7dfaa