5682929111
A few more bug fixes from upstream. Also stop using system membarriers, and revert a recent xen migration fix (not the right one). OBS-URL: https://build.opensuse.org/request/show/768144 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=528
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
From: Peter Wu <peter@lekensteyn.nl>
|
|
Date: Sat, 21 Dec 2019 17:21:24 +0100
|
|
Subject: hw/i386/pc: fix regression in parsing vga cmdline parameter
|
|
|
|
Git-commit: a88c40f02ace88f09b2a85a64831b277b2ebc88c
|
|
|
|
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>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/i386/x86.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
|
|
index 394edc2f720985c0910396181eeb..121650ae511c3814dcdbb908abdc 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);
|
|
}
|
|
}
|