Revision e41d7c69 exec.c

b/exec.c
3020 3020
                munmap(block->host, block->length);
3021 3021
#else
3022 3022
                if (xen_mapcache_enabled()) {
3023
                    qemu_invalidate_entry(block->host);
3023
                    xen_invalidate_map_cache_entry(block->host);
3024 3024
                } else {
3025 3025
                    qemu_vfree(block->host);
3026 3026
                }
......
3118 3118
                 * In that case just map until the end of the page.
3119 3119
                 */
3120 3120
                if (block->offset == 0) {
3121
                    return qemu_map_cache(addr, 0, 0);
3121
                    return xen_map_cache(addr, 0, 0);
3122 3122
                } else if (block->host == NULL) {
3123
                    block->host = qemu_map_cache(block->offset, block->length, 1);
3123
                    block->host =
3124
                        xen_map_cache(block->offset, block->length, 1);
3124 3125
                }
3125 3126
            }
3126 3127
            return block->host + (addr - block->offset);
......
3148 3149
                 * In that case just map until the end of the page.
3149 3150
                 */
3150 3151
                if (block->offset == 0) {
3151
                    return qemu_map_cache(addr, 0, 0);
3152
                    return xen_map_cache(addr, 0, 0);
3152 3153
                } else if (block->host == NULL) {
3153
                    block->host = qemu_map_cache(block->offset, block->length, 1);
3154
                    block->host =
3155
                        xen_map_cache(block->offset, block->length, 1);
3154 3156
                }
3155 3157
            }
3156 3158
            return block->host + (addr - block->offset);
......
3168 3170
void *qemu_ram_ptr_length(target_phys_addr_t addr, target_phys_addr_t *size)
3169 3171
{
3170 3172
    if (xen_mapcache_enabled())
3171
        return qemu_map_cache(addr, *size, 1);
3173
        return xen_map_cache(addr, *size, 1);
3172 3174
    else {
3173 3175
        RAMBlock *block;
3174 3176

  
......
3199 3201
    uint8_t *host = ptr;
3200 3202

  
3201 3203
    if (xen_mapcache_enabled()) {
3202
        *ram_addr = qemu_ram_addr_from_mapcache(ptr);
3204
        *ram_addr = xen_ram_addr_from_mapcache(ptr);
3203 3205
        return 0;
3204 3206
    }
3205 3207

  
......
4114 4116
            }
4115 4117
        }
4116 4118
        if (xen_mapcache_enabled()) {
4117
            qemu_invalidate_entry(buffer);
4119
            xen_invalidate_map_cache_entry(buffer);
4118 4120
        }
4119 4121
        return;
4120 4122
    }

Also available in: Unified diff