From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxJxr-0008IC-Hz for qemu-devel@nongnu.org; Wed, 18 Jun 2014 13:48:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxJxk-0000sC-Mg for qemu-devel@nongnu.org; Wed, 18 Jun 2014 13:48:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56163) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxJxk-0000s3-E5 for qemu-devel@nongnu.org; Wed, 18 Jun 2014 13:47:56 -0400 Date: Wed, 18 Jun 2014 20:48:17 +0300 From: "Michael S. Tsirkin" Message-ID: <20140618174817.GA16091@redhat.com> References: <1403108034-32054-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1403108034-32054-1-git-send-email-mst@redhat.com> Subject: Re: [Qemu-devel] [PULL v2 000/106] pc, pci, virtio, hotplug fixes, enhancements List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori 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 --- 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,