Commit-ID: 42c61896a932f0a1c957def1e4b32b1ead4d8e7d
Gitweb: http://git.kernel.org/tip/42c61896a932f0a1c957def1e4b32b1ead4d8e7d
Author: Asias He <asias.hejun@xxxxxxxxx>
AuthorDate: Fri, 25 Jan 2013 19:42:02 +0800
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Sat, 26 Jan 2013 11:34:02 +0200
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@xxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/x86/kvm.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/kvm/x86/kvm.c b/tools/kvm/x86/kvm.c
index 687e6b7..2ba1db0 100644
--- a/tools/kvm/x86/kvm.c
+++ b/tools/kvm/x86/kvm.c
@@ -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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|