From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSJxf-00017f-Uy for qemu-devel@nongnu.org; Fri, 12 Sep 2014 02:04:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSJxb-0004n3-4f for qemu-devel@nongnu.org; Fri, 12 Sep 2014 02:03:59 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:4916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSJtF-00033m-Gh for qemu-devel@nongnu.org; Fri, 12 Sep 2014 01:59:26 -0400 From: zhanghailiang Date: Fri, 12 Sep 2014 13:58:55 +0800 Message-ID: <1410501536-1516-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 1/2] vl: Fix the confused logic for '-m' option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, luonengjun@huawei.com, peter.huangpeng@huawei.com, aliguori@amazon.com, zhanghailiang It should be valid for the follow configure: -m 256,slots=0 -m 256,maxmem=256M -m 256,slots=0,maxmem=256M -m 256,slots=x,maxmem=y where x > 0 and y > 256M Fix the confused code logic and use error_report instead of fprintf. Printing the maxmem in hex, same with ram_size. Signed-off-by: zhanghailiang --- vl.c | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/vl.c b/vl.c index 9c9acf5..f547405 100644 --- a/vl.c +++ b/vl.c @@ -3306,6 +3306,7 @@ int main(int argc, char **argv, char **envp) break; case QEMU_OPTION_m: { uint64_t sz; + uint64_t slots; const char *mem_str; const char *maxmem_str, *slots_str; @@ -3353,40 +3354,47 @@ int main(int argc, char **argv, char **envp) maxmem_str = qemu_opt_get(opts, "maxmem"); slots_str = qemu_opt_get(opts, "slots"); - if (maxmem_str && slots_str) { - uint64_t slots; - + if (maxmem_str) { sz = qemu_opt_get_size(opts, "maxmem", 0); + } + if (slots_str) { + slots = qemu_opt_get_number(opts, "slots", 0); + } + if (maxmem_str && slots_str) { if (sz < ram_size) { - fprintf(stderr, "qemu: invalid -m option value: maxmem " - "(%" PRIu64 ") <= initial memory (" + error_report("qemu: invalid -m option value: maxmem " + "(%" PRIx64 ") < initial memory (" RAM_ADDR_FMT ")\n", sz, ram_size); exit(EXIT_FAILURE); } - - slots = qemu_opt_get_number(opts, "slots", 0); - if ((sz > ram_size) && !slots) { - fprintf(stderr, "qemu: invalid -m option value: maxmem " - "(%" PRIu64 ") more than initial memory (" + if (!slots && (sz != ram_size)) { + error_report("qemu: invalid -m option value: maxmem " + "(%" PRIx64 ") more than initial memory (" RAM_ADDR_FMT ") but no hotplug slots where " "specified\n", sz, ram_size); exit(EXIT_FAILURE); } - - if ((sz <= ram_size) && slots) { - fprintf(stderr, "qemu: invalid -m option value: %" + if (slots && (sz == ram_size)) { + error_report("qemu: invalid -m option value: %" PRIu64 " hotplug slots where specified but " - "maxmem (%" PRIu64 ") <= initial memory (" + "maxmem (%" PRIx64 ") = initial memory (" RAM_ADDR_FMT ")\n", slots, sz, ram_size); exit(EXIT_FAILURE); } maxram_size = sz; ram_slots = slots; - } else if ((!maxmem_str && slots_str) || - (maxmem_str && !slots_str)) { - fprintf(stderr, "qemu: invalid -m option value: missing " - "'%s' option\n", slots_str ? "maxmem" : "slots"); - exit(EXIT_FAILURE); + } else if (!maxmem_str && slots_str) { + if (slots > 0) { + error_report("qemu: invalid -m option value: missing " + "'maxmem' option\n"); + exit(EXIT_FAILURE); + } + } else if (maxmem_str && !slots_str) { + if (sz != ram_size) { + error_report("qemu: invalid -m option value: missing " + "'slot' option\n"); + exit(EXIT_FAILURE); + } } break; } -- 1.7.12.4