kvm tools: Fix SDL and VNC by adding default vidmode

In commit d73b168b3145f7bfe3f0e5d968653a1125b93a4e (kvm tools: ui
improvements), the code to set a default vidmode was killed
accidentally. This makes SDL and VNC not working unless '--vidmode'
option is added, e.g lkvm run --sdl --vidmode 786.

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Asias He
2012-10-21 16:46:58 +08:00
committed by Will Deacon
parent 84d0138ddf
commit e9e1906bfb
+9 -1
View File
@@ -593,9 +593,17 @@ static struct kvm *kvm_cmd_run_init(int argc, const char **argv)
if (!kvm->cfg.script)
kvm->cfg.script = DEFAULT_SCRIPT;
if (!kvm->cfg.vnc && !kvm->cfg.sdl)
if (!kvm->cfg.vidmode)
kvm->cfg.vidmode = -1;
/* vidmode should be either specified or set by default */
if (kvm->cfg.vnc || kvm->cfg.sdl) {
if (kvm->cfg.vidmode == -1)
kvm->cfg.vidmode = 0x312;
} else {
kvm->cfg.vidmode = 0;
}
if (!kvm->cfg.network)
kvm->cfg.network = DEFAULT_NETWORK;