From 7ee3696c1005bf9b8c28aca5fa298c10584502a1 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 22 Aug 2019 20:00:35 +0100
Subject: [PATCH] KVM: Ignore ABI changes

We already ignored most of them, but missed some.  Group together
all the KVM patterns in debian/config/defines.
---
 debian/changelog      |  3 +++
 debian/config/defines | 14 ++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index faecba636..5c6128bfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ linux (4.19.67-2) UNRELEASED; urgency=medium
   * dm: disable DISCARD if the underlying storage no longer supports it
     (Closes: #934331)
 
+  [ Ben Hutchings ]
+  * KVM: Ignore ABI changes
+
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 21 Aug 2019 23:37:56 +0100
 
 linux (4.19.67-1) buster; urgency=medium
diff --git a/debian/config/defines b/debian/config/defines
index d812995ae..faa86c867 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -2,7 +2,6 @@
 abiname: 6
 ignore-changes:
  __cpuhp_*
- __xive_vm_h_*
  bpf_analyzer
  cxl_*
  dax_flush
@@ -10,8 +9,6 @@ ignore-changes:
  inet_add_protocol
  inet_del_protocol
  iommu_device_*
- kvm_async_pf_task_wait
- kvmppc_*
  mm_iommu_*
  mv_mbus_*
  perf_*
@@ -19,7 +16,6 @@ ignore-changes:
  register_key_type
  unregister_cxl_calls
  *_hw_breakpoint
- module:arch/x86/kvm/*
  module:drivers/crypto/ccp/*
  module:drivers/hv/*
  module:drivers/gpu/drm/sun4i/*
@@ -82,6 +78,16 @@ ignore-changes:
  nf_nat_masquerade_ipv6_register_notifier
 # ignore changes to hisi_sas/*
  module:drivers/scsi/hisi_sas/*
+# Private to KVM
+ __kvm_*
+ __xive_vm_h_*
+ _kvmppc_*
+ gfn_to_*
+ kvm_*
+ kvmppc_*
+ mark_page_dirty
+ vcpu_*
+ module:arch/x86/kvm/*
 
 [base]
 arches: