From 6ad7171a6969ed093ab19a45300ec6d3b1ee9dfd Mon Sep 17 00:00:00 2001 From: Asias He Date: Fri, 25 Jan 2013 19:42:02 +0800 Subject: [PATCH] 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 Signed-off-by: Pekka Enberg --- x86/kvm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x86/kvm.c b/x86/kvm.c index 687e6b7..2ba1db0 100644 --- a/x86/kvm.c +++ b/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; }