From e9e1906bfb8392dc09985d2935cbdf56bcfbeed1 Mon Sep 17 00:00:00 2001 From: Asias He Date: Sun, 21 Oct 2012 16:46:58 +0800 Subject: [PATCH] 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 Signed-off-by: Pekka Enberg --- builtin-run.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/builtin-run.c b/builtin-run.c index 50495a3..709ed33 100644 --- a/builtin-run.c +++ b/builtin-run.c @@ -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;