From: Sasha Levin Date: Wed, 5 Sep 2012 08:32:02 +0000 (+0200) Subject: kvm tools: move the rest of the config initializations X-Git-Tag: next-20120910~8^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4885b44fa39ea75b0efb92286d2d97f1421a6677;p=karo-tx-linux.git kvm tools: move the rest of the config initializations These should appear before running any init calls. Signed-off-by: Sasha Levin Signed-off-by: Pekka Enberg --- diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index ecc80be42abb..8209cf19df89 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -643,6 +643,9 @@ static int kvm_cmd_run_init(int argc, const char **argv) if (!kvm->cfg.vnc && !kvm->cfg.sdl) kvm->cfg.vidmode = -1; + if (!kvm->cfg.network) + kvm->cfg.network = DEFAULT_NETWORK; + memset(real_cmdline, 0, sizeof(real_cmdline)); kvm__arch_set_cmdline(real_cmdline, kvm->cfg.vnc || kvm->cfg.sdl); @@ -789,9 +792,6 @@ static int kvm_cmd_run_init(int argc, const char **argv) goto fail; } - if (!kvm->cfg.network) - kvm->cfg.network = DEFAULT_NETWORK; - virtio_9p__init(kvm); r = virtio_net__init(kvm);