kvm tools: Fix SDL and VNC by setting vidmode correctly

In commit dfefbe9d4894efc44c39b2041bd667d0dea43eca
kvm tools: allow arch's to provide their own command-line options,
vidmode is not setup correctly.

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Asias He
2013-01-25 19:42:02 +08:00
committed by Will Deacon
parent b2cf1e9f5f
commit 6ad7171a69
+3 -3
View File
@@ -294,13 +294,13 @@ bool load_bzimage(struct kvm *kvm, int fd_kernel, int fd_initrd,
memcpy(p, kernel_cmdline, cmdline_size - 1);
}
if (!kvm->cfg.arch.vidmode)
vidmode = -1;
/* vidmode should be either specified or set by default */
if (kvm->cfg.vnc || kvm->cfg.sdl) {
if (vidmode == -1)
if (!kvm->cfg.arch.vidmode)
vidmode = 0x312;
else
vidmode = kvm->cfg.arch.vidmode;
} else {
vidmode = 0;
}