|
| From: | Michael S. Tsirkin |
| Subject: | Re: [Qemu-devel] [PULL v2 000/106] pc, pci, virtio, hotplug fixes, enhancements |
| Date: | Wed, 18 Jun 2014 20:48:17 +0300 |
On Wed, Jun 18, 2014 at 07:15:24PM +0300, Michael S. Tsirkin wrote:
> The following changes since commit 0360fbd076e8bdbb9498598b0c559464346babe4:
>
> Merge remote-tracking branch 'remotes/riku/linux-user-for-upstream' into
> staging (2014-06-17 16:08:06 +0100)
>
the following is needed to resolve the conflict with Paolo's
renames:
memory: fix up parent->container
resolve merge conflict
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
diff --git a/memory.c b/memory.c
index 3f3dc5c..b91a60a 100644
--- a/memory.c
+++ b/memory.c
@@ -1624,7 +1624,7 @@ bool memory_region_present(MemoryRegion *container,
hwaddr addr)
bool memory_region_is_mapped(MemoryRegion *mr)
{
- return mr->parent ? true : false;
+ return mr->container ? true : false;
}
MemoryRegionSection memory_region_find(MemoryRegion *mr,
| [Prev in Thread] | Current Thread | [Next in Thread] |