From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 1 Jul 2014 10:55:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/bonzini/memory' into staging
X-Git-Tag: v2.1.0-rc0~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c26f3a0a6dfe5ef2973ddfab03b1ceff641a7ebe;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/bonzini/memory' into staging

* remotes/bonzini/memory:
  qdev: correctly send DEVICE_DELETED for recursively-deleted devices
  memory: do not give a name to the internal exec.c regions
  memory: MemoryRegion: Add size property
  memory: MemoryRegion: Add may-overlap and priority props
  memory: MemoryRegion: Add container and addr props
  memory: MemoryRegion: replace owner field with QOM parent
  memory: MemoryRegion: QOMify
  memory: MemoryRegion: use /machine as default owner
  libqtest: escape strings in QMP commands, fix leak
  qom: object: Ignore refs/unrefs of NULL
  qom: object: remove parent pointer when unparenting
  mc146818rtc: add "rtc-time" link to "/machine/rtc"
  qom: allow creating an alias of a child<> property
  qom: add a generic mechanism to resolve paths
  qom: add object_property_add_alias()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

c26f3a0a6dfe5ef2973ddfab03b1ceff641a7ebe