pv-grub: re-implement xc_map_foreign_ranges

Also get rid of va and npages members of privcmd_mmap_entry since we
do not need them any more.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

diff --git a/tools/include/xen-sys/MiniOS/privcmd.h b/tools/include/xen-sys/MiniOS/privcmd.h
index 97e0ceb5a0ea481849605b4d66241db813f3e7e4..db0f00e3ecbe40c22195c8100d7bcc085b4fb8eb 100644 (file)
--- a/tools/include/xen-sys/MiniOS/privcmd.h
+++ b/tools/include/xen-sys/MiniOS/privcmd.h
@@ -10,9 +10,7 @@ typedef struct privcmd_hypercall
 } privcmd_hypercall_t;
 
 typedef struct privcmd_mmap_entry {
-       u64 va;
        u64 mfn;
-       u64 npages;
 } privcmd_mmap_entry_t; 
 
 #endif /* __MINIOS_PUBLIC_PRIVCMD_H__ */

diff --git a/tools/libxc/xc_minios.c b/tools/libxc/xc_minios.c
index 89ab9ad44db5656109fc2a967f770485df83d21e..4a5a351aebac3ccacdc456298f4d33c6d933b151 100644 (file)
--- a/tools/libxc/xc_minios.c
+++ b/tools/libxc/xc_minios.c
@@ -80,23 +80,26 @@ void *xc_map_foreign_ranges(int xc_handle, uint32_t dom,
                             size_t size, int prot, size_t chunksize,
                             privcmd_mmap_entry_t entries[], int nentries)
 {
-    ERROR("%s: implement me\n");
-    return NULL;
-}
+    unsigned long mfns[size / PAGE_SIZE];
+    int i, j, n;
+    unsigned long pt_prot = 0;
+#ifdef __ia64__
+    /* TODO */
+#else
+    if (prot & PROT_READ)
+       pt_prot = L1_PROT_RO;
+    if (prot & PROT_WRITE)
+       pt_prot = L1_PROT;
+#endif
 
+    n = 0;
+    for (i = 0; i < nentries; i++)
+        for (j = 0; j < chunksize / PAGE_SIZE; j++)
+            mfns[n++] = entries[i].mfn + j;
 
-#if 0
-int xc_map_foreign_ranges(int xc_handle, uint32_t dom,
-                          privcmd_mmap_entry_t *entries, int nr)
-{
-    int i;
-    for (i = 0; i < nr; i++) {
-       unsigned long mfn = entries[i].mfn;
-        do_map_frames(entries[i].va, &mfn, entries[i].npages, 0, 1, dom, 0, L1_PROT);
-    }
-    return 0;
+    return map_frames_ex(mfns, n, 1, 0, 1, dom, 0, pt_prot);
 }
-#endif
+
 
 int do_xen_hypercall(int xc_handle, privcmd_hypercall_t *hypercall)
 {