solve merging conflict

2015-09-03 18:05:21 +08:00
parent 46cc510dfe ad877e6af0
commit b8d4240240
25 changed files with 1343 additions and 76 deletions
--- a/qemu/include/exec/memory.h
+++ b/qemu/include/exec/memory.h
@@ -939,6 +939,7 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len,
 void memory_register_types(struct uc_struct *uc);

 MemoryRegion *memory_map(struct uc_struct *uc, ram_addr_t begin, size_t size, uint32_t perms);
+void memory_unmap(struct uc_struct *uc, MemoryRegion *mr);
 int memory_free(struct uc_struct *uc);

 #endif