diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2019-12-21 17:21:24 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2020-05-11 18:06:14 -0500 |
| commit | 0cfa46da8f175fbe16c1ad362282d59ccd9f026d (patch) | |
| tree | fd1ffd659961ff1d812a6abbe91fd4f410b661e0 /hw/i386 | |
| parent | ba6a94e64e9602ab9539a6464405b73b8b50ffda (diff) | |
| download | qemu-0cfa46da8f175fbe16c1ad362282d59ccd9f026d.zip qemu-0cfa46da8f175fbe16c1ad362282d59ccd9f026d.tar.gz qemu-0cfa46da8f175fbe16c1ad362282d59ccd9f026d.tar.bz2 | |
hw/i386/pc: fix regression in parsing vga cmdline parameter
When the 'vga=' parameter is succeeded by another parameter, QEMU 4.2.0
would refuse to start with a rather cryptic message:
$ qemu-system-x86_64 -kernel /boot/vmlinuz-linux -append 'vga=792 quiet'
qemu: can't parse 'vga' parameter: Invalid argument
It was not clear whether this applied to the '-vga std' parameter or the
'-append' one. Fix the parsing regression and clarify the error.
Fixes: 133ef074bd ("hw/i386/pc: replace use of strtol with qemu_strtoui in x86_load_linux()")
Cc: Sergio Lopez <slp@redhat.com>
Signed-off-by: Peter Wu <peter@lekensteyn.nl>
Message-Id: <20191221162124.1159291-1-peter@lekensteyn.nl>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit a88c40f02ace88f09b2a85a64831b277b2ebc88c)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/x86.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 394edc2..121650a 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -508,6 +508,7 @@ void x86_load_linux(X86MachineState *x86ms, vmode = strstr(kernel_cmdline, "vga="); if (vmode) { unsigned int video_mode; + const char *end; int ret; /* skip "vga=" */ vmode += 4; @@ -518,10 +519,9 @@ void x86_load_linux(X86MachineState *x86ms, } else if (!strncmp(vmode, "ask", 3)) { video_mode = 0xfffd; } else { - ret = qemu_strtoui(vmode, NULL, 0, &video_mode); - if (ret != 0) { - fprintf(stderr, "qemu: can't parse 'vga' parameter: %s\n", - strerror(-ret)); + ret = qemu_strtoui(vmode, &end, 0, &video_mode); + if (ret != 0 || (*end && *end != ' ')) { + fprintf(stderr, "qemu: invalid 'vga=' kernel parameter.\n"); exit(1); } } |