From 18358052f3f67143a9edadb57f244f4c83e4cf20 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 5 Sep 2012 10:32:00 +0200 Subject: [PATCH] kvm tools: ioport arch init Move ioport arch init into ioport init, which is the logical place for that instead of a random place in the global init code. Signed-off-by: Sasha Levin Signed-off-by: Pekka Enberg --- tools/kvm/builtin-run.c | 2 -- tools/kvm/ioport.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index ec783f60e331..44adf71b60ee 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -747,8 +747,6 @@ static int kvm_cmd_run_init(int argc, const char **argv) if (r < 0) pr_debug("symbol_init() failed with error %d\n", r); - ioport__setup_arch(); - r = rtc__init(kvm); if (r < 0) { pr_err("rtc__init() failed with error %d\n", r); diff --git a/tools/kvm/ioport.c b/tools/kvm/ioport.c index 2208c15e97b3..f5fb246cb1d6 100644 --- a/tools/kvm/ioport.c +++ b/tools/kvm/ioport.c @@ -184,6 +184,8 @@ error: int ioport__init(struct kvm *kvm) { + ioport__setup_arch(); + return 0; } -- 2.39.5