[RFC Patch 7/8] kvm: Adjust system/kvm.h for updated KVM kernel headers

[Bjoern Walk <bwalk@linux.ibm.com>]

For the per-target code path which needs architecture-specific
definitions, include <asm/kvm.h>.

For the common code path, declare structs that <linux/kvm.h> consumes
from <asm/kvm.h> as empty and poison all identifiers that are size
dependent. This should allow common files to consume "system/kvm.h" with
a guarantee that there is no size inconsistency.

Signed-off-by: Andreas Grapentin <gra@linux.ibm.com>
Signed-off-by: Bjoern Walk <bwalk@linux.ibm.com>
---
 include/system/kvm.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/system/kvm.h b/include/system/kvm.h
index 84c2efe9..51f360cd 100644
--- a/include/system/kvm.h
+++ b/include/system/kvm.h
@@ -24,12 +24,20 @@
 
 #ifdef COMPILING_PER_TARGET
 # ifdef CONFIG_KVM
+#  include <asm/kvm.h>
 #  include <linux/kvm.h>
 #  define CONFIG_KVM_IS_POSSIBLE
 # endif
 #else
 # define CONFIG_KVM_IS_POSSIBLE
+  struct kvm_debug_exit_arch {};
+  struct kvm_sync_regs {};
+  struct kvm_guest_debug_arch {};
 # include <linux/kvm.h>
+# pragma GCC poison kvm_debug_exit_arch
+# pragma GCC poison kvm_sync_regs
+# pragma GCC poison kvm_guest_debug_arch
+# pragma GCC poison kvm_guest_debug
 #endif
 
 #ifdef CONFIG_KVM_IS_POSSIBLE
-- 
2.56.0