From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 22 May 2015 08:10:28 +0000 (+0200)
Subject: public: restrict xen_arch_domainconfig visibility
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3174
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8529d6a48158034e54d3a1be37bc87c01bf40232;p=xen.git

public: restrict xen_arch_domainconfig visibility

As an extension to 931f5777c7 ("public: clarify xen_arch_domainconfig
ABI statement") limit the respective definitions' visibility to
hypervisor and tools.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h
index 2cbd323387..6f24c5f14f 100644
--- a/xen/include/public/arch-arm.h
+++ b/xen/include/public/arch-arm.h
@@ -298,16 +298,6 @@ struct vcpu_guest_context {
 };
 typedef struct vcpu_guest_context vcpu_guest_context_t;
 DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t);
-#endif
-
-struct arch_vcpu_info {
-};
-typedef struct arch_vcpu_info arch_vcpu_info_t;
-
-struct arch_shared_info {
-};
-typedef struct arch_shared_info arch_shared_info_t;
-typedef uint64_t xen_callback_t;
 
 /*
  * struct xen_arch_domainconfig's ABI is covered by
@@ -322,6 +312,16 @@ struct xen_arch_domainconfig {
     /* IN */
     uint32_t nr_spis;
 };
+#endif /* __XEN__ || __XEN_TOOLS__ */
+
+struct arch_vcpu_info {
+};
+typedef struct arch_vcpu_info arch_vcpu_info_t;
+
+struct arch_shared_info {
+};
+typedef struct arch_shared_info arch_shared_info_t;
+typedef uint64_t xen_callback_t;
 
 #endif
 
diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h
index 8a52c04c45..2ecc9c9199 100644
--- a/xen/include/public/arch-x86/xen.h
+++ b/xen/include/public/arch-x86/xen.h
@@ -262,6 +262,7 @@ struct arch_shared_info {
 };
 typedef struct arch_shared_info arch_shared_info_t;
 
+#if defined(__XEN__) || defined(__XEN_TOOLS__)
 /*
  * struct xen_arch_domainconfig's ABI is covered by
  * XEN_DOMCTL_INTERFACE_VERSION.
@@ -269,6 +270,7 @@ typedef struct arch_shared_info arch_shared_info_t;
 struct xen_arch_domainconfig {
     char dummy;
 };
+#endif
 
 #endif /* !__ASSEMBLY__ */