diff mbox series

[1/1] KVM: Move kvm_gmem_migrate_folio inside CONFIG_MIGRATION

Message ID 20231211030518.2722714-1-guanjun@linux.alibaba.com
State New
Headers
Series [1/1] KVM: Move kvm_gmem_migrate_folio inside CONFIG_MIGRATION |

Commit Message

guanjun Dec. 11, 2023, 3:05 a.m. UTC 
  From: Guanjun <guanjun@linux.alibaba.com>

'kvm_gmem_migrate_folio' is only used when CONFIG_MIGRATION
is defined, And it will triggers the compiler warning about
'kvm_gmem_migrate_folio' defined but not used when CONFIG_MIGRATION
isn't defined.

The compiler complained like that:
arch/x86/kvm/../../../virt/kvm/guest_memfd.c:262:12: error: ‘kvm_gmem_migrate_folio’ defined but not used [-Werror=unused-function]
  262 | static int kvm_gmem_migrate_folio(struct address_space *mapping,
      |            ^~~~~~~~~~~~~~~~~~~~~~

Fixes: a7800aa80ea4 (KVM: Add KVM_CREATE_GUEST_MEMFD ioctl() for guest-specific backing memory)
Signed-off-by: Guanjun <guanjun@linux.alibaba.com>
---
 virt/kvm/guest_memfd.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Sean Christopherson Dec. 11, 2023, 3:15 p.m. UTC | #1 
On Mon, Dec 11, 2023, 'Guanjun' wrote:
> From: Guanjun <guanjun@linux.alibaba.com>
> 
> 'kvm_gmem_migrate_folio' is only used when CONFIG_MIGRATION
> is defined, And it will triggers the compiler warning about
> 'kvm_gmem_migrate_folio' defined but not used when CONFIG_MIGRATION
> isn't defined.
> 
> The compiler complained like that:
> arch/x86/kvm/../../../virt/kvm/guest_memfd.c:262:12: error: ‘kvm_gmem_migrate_folio’ defined but not used [-Werror=unused-function]
>   262 | static int kvm_gmem_migrate_folio(struct address_space *mapping,
>       |            ^~~~~~~~~~~~~~~~~~~~~~

Already fixed, commit 80583d0cfd8f ("KVM: guest-memfd: fix unused-function warning")
in kvm/next.

https://lore.kernel.org/all/20231208184908.2298225-1-pbonzini@redhat.com
diff mbox series

Patch

diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c
index 16d58806e913..62bb8a1a47d1 100644
--- a/virt/kvm/guest_memfd.c
+++ b/virt/kvm/guest_memfd.c
@@ -259,6 +259,7 @@  void kvm_gmem_init(struct module *module)
 	kvm_gmem_fops.owner = module;
 }
 
+#ifdef CONFIG_MIGRATION
 static int kvm_gmem_migrate_folio(struct address_space *mapping,
 				  struct folio *dst, struct folio *src,
 				  enum migrate_mode mode)
@@ -266,6 +267,7 @@  static int kvm_gmem_migrate_folio(struct address_space *mapping,
 	WARN_ON_ONCE(1);
 	return -EINVAL;
 }
+#endif
 
 static int kvm_gmem_error_folio(struct address_space *mapping,
 		struct folio *folio)