Commit-ID: 4885b44fa39ea75b0efb92286d2d97f1421a6677 Gitweb: http://git.kernel.org/tip/4885b44fa39ea75b0efb92286d2d97f1421a6677 Author: Sasha Levin <levinsasha928@xxxxxxxxx> AuthorDate: Wed, 5 Sep 2012 10:32:02 +0200 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Wed, 5 Sep 2012 16:22:38 +0300 kvm tools: move the rest of the config initializations These should appear before running any init calls. Signed-off-by: Sasha Levin <levinsasha928@xxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/builtin-run.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index ecc80be..8209cf1 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); -- 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
|