From c1a676afd73c9e16ee46118c57a54a137c4f014b Mon Sep 17 00:00:00 2001 From: Min Fanlei Date: Tue, 23 Aug 2022 09:18:11 +0800 Subject: [PATCH] sw64: kvm: fix wrong info print of KVM_MEMHOTPLUG Sunway inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I56WV8 -------------------------------- Due to the registration of guest IO address, there is wrong pr_info of "KVM MEMHOTPLUG support" when booting the guest, so we fix it. Signed-off-by: Min Fanlei Signed-off-by: Gu Zitao --- arch/sw_64/kvm/kvm-sw64.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/sw_64/kvm/kvm-sw64.c b/arch/sw_64/kvm/kvm-sw64.c index 9d209141820c..06e969caaaa6 100644 --- a/arch/sw_64/kvm/kvm-sw64.c +++ b/arch/sw_64/kvm/kvm-sw64.c @@ -308,6 +308,12 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, if (change == KVM_MR_FLAGS_ONLY || change == KVM_MR_DELETE) return 0; + if (test_bit(IO_MARK_BIT, &(mem->guest_phys_addr))) + return 0; + + if (test_bit(IO_MARK_BIT + 1, &(mem->guest_phys_addr))) + return 0; + #ifndef CONFIG_KVM_MEMHOTPLUG if (mem->guest_phys_addr) { pr_info("%s, No KVM MEMHOTPLUG support!\n", __func__); @@ -315,12 +321,6 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, } #endif - if (test_bit(IO_MARK_BIT, &(mem->guest_phys_addr))) - return 0; - - if (test_bit(IO_MARK_BIT + 1, &(mem->guest_phys_addr))) - return 0; - if (!sw64_kvm_pool) return -ENOMEM; -- GitLab