mini-os: support newer xen interface

Mini-OS is currently setting __XEN_INTERFACE_VERSION__ to a rather
ancient version.

To be able to use a more recent variant garnt_entry_t must be changed
to grant_entry_v1_t. In balloon.c we omit initializing elements of
struct xen_memory_reservation with 0 to avoid problems with different
named structure elements in different Xen interface versions.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

diff --git a/arch/arm/mm.c b/arch/arm/mm.c
index 8c156c48429e8b7b418903e53a0751c3d8470925..f806c9f9372414b0d751bac0060c90c5ea18e5e6 100644 (file)
--- a/arch/arm/mm.c
+++ b/arch/arm/mm.c
@@ -116,7 +116,7 @@ static paddr_t get_gnttab_base(void)
     return gnttab_base;
 }
 
-grant_entry_t *arch_init_gnttab(int nr_grant_frames)
+grant_entry_v1_t *arch_init_gnttab(int nr_grant_frames)
 {
     struct xen_add_to_physmap xatp;
     struct gnttab_setup_table setup;

diff --git a/arch/x86/mm.c b/arch/x86/mm.c
index 8dd90b84749656876c71f6604502b040c5c70c05..05ad029147e846226b63a85e08dae9bb2eeb923e 100644 (file)
--- a/arch/x86/mm.c
+++ b/arch/x86/mm.c
@@ -890,7 +890,7 @@ void arch_init_mm(unsigned long* start_pfn_p, unsigned long* max_pfn_p)
 #endif
 }
 
-grant_entry_t *arch_init_gnttab(int nr_grant_frames)
+grant_entry_v1_t *arch_init_gnttab(int nr_grant_frames)
 {
     struct gnttab_setup_table setup;
     unsigned long frames[nr_grant_frames];

diff --git a/balloon.c b/balloon.c
index b0d0230e0a6af4be83e82c91a4648f979ab9d915..5676d3b47a1fdc3032a28d288048838e30069a79 100644 (file)
--- a/balloon.c
+++ b/balloon.c
@@ -73,8 +73,6 @@ int balloon_up(unsigned long n_pages)
     unsigned long page, pfn;
     int rc;
     struct xen_memory_reservation reservation = {
-        .address_bits = 0,
-        .extent_order = 0,
         .domid        = DOMID_SELF
     };
 

diff --git a/gnttab.c b/gnttab.c
index f395d12ab6e18ff60ca4b2dc5933342941d4290e..3f0e35f044802ae93be3c05e3f35e6bacd99612d 100644 (file)
--- a/gnttab.c
+++ b/gnttab.c
@@ -24,9 +24,9 @@
 
 /* NR_GRANT_FRAMES must be less than or equal to that configured in Xen */
 #define NR_GRANT_FRAMES 4
-#define NR_GRANT_ENTRIES (NR_GRANT_FRAMES * PAGE_SIZE / sizeof(grant_entry_t))
+#define NR_GRANT_ENTRIES (NR_GRANT_FRAMES * PAGE_SIZE / sizeof(grant_entry_v1_t))
 
-static grant_entry_t *gnttab_table;
+static grant_entry_v1_t *gnttab_table;
 static grant_ref_t gnttab_list[NR_GRANT_ENTRIES];
 #ifdef GNT_DEBUG
 static char inuse[NR_GRANT_ENTRIES];

diff --git a/include/gnttab.h b/include/gnttab.h
index c43ad4255dc54236bce4ec9c9906898d44982ca2..a9d8e09d051d682d638cb931b5541784cd8ba24b 100644 (file)
--- a/include/gnttab.h
+++ b/include/gnttab.h
@@ -12,6 +12,6 @@ unsigned long gnttab_end_transfer(grant_ref_t gref);
 int gnttab_end_access(grant_ref_t ref);
 const char *gnttabop_error(int16_t status);
 void fini_gnttab(void);
-grant_entry_t *arch_init_gnttab(int nr_grant_frames);
+grant_entry_v1_t *arch_init_gnttab(int nr_grant_frames);
 
 #endif /* !__GNTTAB_H__ */