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 <levinsasha928@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c
index ec783f60e331170b5c049920d4b6ad2f9f239552..44adf71b60eed7c1ace24fc203bb065629010f10 100644 (file)
--- 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 2208c15e97b3eca7ce506c5b862a5c39925e8ba0..f5fb246cb1d63edf0051059c87d222f6b547fcd4 100644 (file)
--- 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;
 }