From f6da5a80d06fe33832c6210da95a2d031c5e67b9 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Tue, 8 Jan 2008 18:24:34 +0530 Subject: [PATCH] qemu: Add support for suffixes to the -m parameter The -m parameter doesn't take suffixes like G or M currently and it doesn't complain if such a suffix is given. Add support for the G and M suffixes and update the usage instructions appropriately. Signed-off-by: Amit Shah --- qemu/vl.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/qemu/vl.c b/qemu/vl.c index 0f023ac..2ed2469 100644 --- a/qemu/vl.c +++ b/qemu/vl.c @@ -7927,7 +7927,9 @@ static void help(int exitcode) #ifdef TARGET_I386 "-no-fd-bootchk disable boot signature checking for floppy disks\n" #endif - "-m megs set virtual RAM size to megs MB [default=%d]\n" + "-m size set virtual RAM size to size megs [default=%d MB].\n" + " Optional suffixes 'M' (megabyte) and 'G' (gigabyte)" + " are supported\n" "-smp n set the number of CPUs to 'n' [default=1]\n" "-nographic disable graphical output and redirect serial I/Os to console\n" "-portrait rotate graphical output 90 deg left (only PXA LCD)\n" @@ -8858,7 +8860,26 @@ int main(int argc, char **argv) help(0); break; case QEMU_OPTION_m: - ram_size = (int64_t)atoi(optarg) * 1024 * 1024; + errno = 0; + ram_size = (uint64_t) strtoul(optarg, (char **)&optarg, 0); + if (errno) + help(1); + switch (*optarg) { + case 'G': + case 'g': + ram_size *= 1024; + /* fall through */ + case 'M': + case 'm': + case '\0': + ram_size *= 1024 * 1024; + optarg++; + break; + default: + help(1); + break; + } + if (ram_size <= 0) help(1); if (ram_size > PHYS_RAM_MAX_SIZE) { -- 1.5.2.5