]> git.ipfire.org Git - thirdparty/qemu.git/commit
hw/i386/pc: fix regression in parsing vga cmdline parameter
authorPeter Wu <peter@lekensteyn.nl>
Sat, 21 Dec 2019 16:21:24 +0000 (17:21 +0100)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Mon, 11 May 2020 23:06:14 +0000 (18:06 -0500)
commit0cfa46da8f175fbe16c1ad362282d59ccd9f026d
treefd1ffd659961ff1d812a6abbe91fd4f410b661e0
parentba6a94e64e9602ab9539a6464405b73b8b50ffda
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>
hw/i386/x86.c