Revision e41d7c69 xen-mapcache.c

b/xen-mapcache.c
40 40
#endif
41 41
#define MCACHE_BUCKET_SIZE (1UL << MCACHE_BUCKET_SHIFT)
42 42

  
43
#define mapcache_lock()   ((void)0)
44
#define mapcache_unlock() ((void)0)
45

  
43 46
typedef struct MapCacheEntry {
44 47
    target_phys_addr_t paddr_index;
45 48
    uint8_t *vaddr_base;
......
79 82
        return 0;
80 83
}
81 84

  
82
void qemu_map_cache_init(void)
85
void xen_map_cache_init(void)
83 86
{
84 87
    unsigned long size;
85 88
    struct rlimit rlimit_as;
......
106 109

  
107 110
    size = mapcache->nr_buckets * sizeof (MapCacheEntry);
108 111
    size = (size + XC_PAGE_SIZE - 1) & ~(XC_PAGE_SIZE - 1);
109
    DPRINTF("qemu_map_cache_init, nr_buckets = %lx size %lu\n", mapcache->nr_buckets, size);
112
    DPRINTF("%s, nr_buckets = %lx size %lu\n", __func__,
113
            mapcache->nr_buckets, size);
110 114
    mapcache->entry = qemu_mallocz(size);
111 115
}
112 116

  
113
static void qemu_remap_bucket(MapCacheEntry *entry,
114
                              target_phys_addr_t size,
115
                              target_phys_addr_t address_index)
117
static void xen_remap_bucket(MapCacheEntry *entry,
118
                             target_phys_addr_t size,
119
                             target_phys_addr_t address_index)
116 120
{
117 121
    uint8_t *vaddr_base;
118 122
    xen_pfn_t *pfns;
......
120 124
    unsigned int i;
121 125
    target_phys_addr_t nb_pfn = size >> XC_PAGE_SHIFT;
122 126

  
123
    trace_qemu_remap_bucket(address_index);
127
    trace_xen_remap_bucket(address_index);
124 128

  
125 129
    pfns = qemu_mallocz(nb_pfn * sizeof (xen_pfn_t));
126 130
    err = qemu_mallocz(nb_pfn * sizeof (int));
......
164 168
    qemu_free(err);
165 169
}
166 170

  
167
uint8_t *qemu_map_cache(target_phys_addr_t phys_addr, target_phys_addr_t size, uint8_t lock)
171
uint8_t *xen_map_cache(target_phys_addr_t phys_addr, target_phys_addr_t size,
172
                       uint8_t lock)
168 173
{
169 174
    MapCacheEntry *entry, *pentry = NULL;
170 175
    target_phys_addr_t address_index  = phys_addr >> MCACHE_BUCKET_SHIFT;
171 176
    target_phys_addr_t address_offset = phys_addr & (MCACHE_BUCKET_SIZE - 1);
172 177
    target_phys_addr_t __size = size;
173 178

  
174
    trace_qemu_map_cache(phys_addr);
179
    trace_xen_map_cache(phys_addr);
175 180

  
176 181
    if (address_index == mapcache->last_address_index && !lock && !__size) {
177
        trace_qemu_map_cache_return(mapcache->last_address_vaddr + address_offset);
182
        trace_xen_map_cache_return(mapcache->last_address_vaddr + address_offset);
178 183
        return mapcache->last_address_vaddr + address_offset;
179 184
    }
180 185

  
......
198 203
    if (!entry) {
199 204
        entry = qemu_mallocz(sizeof (MapCacheEntry));
200 205
        pentry->next = entry;
201
        qemu_remap_bucket(entry, __size, address_index);
206
        xen_remap_bucket(entry, __size, address_index);
202 207
    } else if (!entry->lock) {
203 208
        if (!entry->vaddr_base || entry->paddr_index != address_index ||
204 209
                entry->size != __size ||
205 210
                !test_bits(address_offset >> XC_PAGE_SHIFT, size >> XC_PAGE_SHIFT,
206 211
                    entry->valid_mapping)) {
207
            qemu_remap_bucket(entry, __size, address_index);
212
            xen_remap_bucket(entry, __size, address_index);
208 213
        }
209 214
    }
210 215

  
211 216
    if(!test_bits(address_offset >> XC_PAGE_SHIFT, size >> XC_PAGE_SHIFT,
212 217
                entry->valid_mapping)) {
213 218
        mapcache->last_address_index = -1;
214
        trace_qemu_map_cache_return(NULL);
219
        trace_xen_map_cache_return(NULL);
215 220
        return NULL;
216 221
    }
217 222

  
......
226 231
        QTAILQ_INSERT_HEAD(&mapcache->locked_entries, reventry, next);
227 232
    }
228 233

  
229
    trace_qemu_map_cache_return(mapcache->last_address_vaddr + address_offset);
234
    trace_xen_map_cache_return(mapcache->last_address_vaddr + address_offset);
230 235
    return mapcache->last_address_vaddr + address_offset;
231 236
}
232 237

  
233
ram_addr_t qemu_ram_addr_from_mapcache(void *ptr)
238
ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
234 239
{
235 240
    MapCacheEntry *entry = NULL, *pentry = NULL;
236 241
    MapCacheRev *reventry;
......
247 252
        }
248 253
    }
249 254
    if (!found) {
250
        fprintf(stderr, "qemu_ram_addr_from_mapcache, could not find %p\n", ptr);
255
        fprintf(stderr, "%s, could not find %p\n", __func__, ptr);
251 256
        QTAILQ_FOREACH(reventry, &mapcache->locked_entries, next) {
252 257
            DPRINTF("   "TARGET_FMT_plx" -> %p is present\n", reventry->paddr_index,
253 258
                    reventry->vaddr_req);
......
269 274
        ((unsigned long) ptr - (unsigned long) entry->vaddr_base);
270 275
}
271 276

  
272
void qemu_invalidate_entry(uint8_t *buffer)
277
void xen_invalidate_map_cache_entry(uint8_t *buffer)
273 278
{
274 279
    MapCacheEntry *entry = NULL, *pentry = NULL;
275 280
    MapCacheRev *reventry;
......
290 295
        }
291 296
    }
292 297
    if (!found) {
293
        DPRINTF("qemu_invalidate_entry, could not find %p\n", buffer);
298
        DPRINTF("%s, could not find %p\n", __func__, buffer);
294 299
        QTAILQ_FOREACH(reventry, &mapcache->locked_entries, next) {
295 300
            DPRINTF("   "TARGET_FMT_plx" -> %p is present\n", reventry->paddr_index, reventry->vaddr_req);
296 301
        }
......
322 327
    qemu_free(entry);
323 328
}
324 329

  
325
void qemu_invalidate_map_cache(void)
330
void xen_invalidate_map_cache(void)
326 331
{
327 332
    unsigned long i;
328 333
    MapCacheRev *reventry;

Also available in: Unified diff