The following changes since commit 53a259da5697ec8a82463161e2e32ff942a08bc2:
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-pci-for-qemu-20140630.0' into staging (2014-06-30 18:31:07 +0100) are available in the git repository at: git://github.com/bonzini/qemu.git memory for you to fetch changes up to 352e8da743f26948cb12d0ee53c455f328f59bbe: qdev: correctly send DEVICE_DELETED for recursively-deleted devices (2014-07-01 10:20:42 +0200) Patch 1 is shared with Stefan's upcoming pull request. We synchronized in order to use the same commit ID and thus avoid conflicts. ---------------------------------------------------------------- Marcelo Tosatti (1): mc146818rtc: add "rtc-time" link to "/machine/rtc" Paolo Bonzini (7): qom: add a generic mechanism to resolve paths qom: allow creating an alias of a child<> property libqtest: escape strings in QMP commands, fix leak memory: MemoryRegion: use /machine as default owner memory: MemoryRegion: replace owner field with QOM parent memory: do not give a name to the internal exec.c regions qdev: correctly send DEVICE_DELETED for recursively-deleted devices Peter Crosthwaite (6): qom: object: remove parent pointer when unparenting qom: object: Ignore refs/unrefs of NULL memory: MemoryRegion: QOMify memory: MemoryRegion: Add container and addr props memory: MemoryRegion: Add may-overlap and priority props memory: MemoryRegion: Add size property Stefan Hajnoczi (1): qom: add object_property_add_alias() exec.c | 12 +-- hw/core/qdev.c | 5 +- hw/timer/mc146818rtc.c | 9 ++ include/exec/memory.h | 9 +- include/hw/qdev-core.h | 1 + include/qom/object.h | 54 ++++++++++-- memory.c | 231 +++++++++++++++++++++++++++++++++++++++++++------ qom/object.c | 148 ++++++++++++++++++++++++------- tests/fdc-test.c | 2 +- tests/libqtest.c | 47 +++++++--- tests/qom-test.c | 6 +- tests/tmp105-test.c | 4 +- vl.c | 3 +- 13 files changed, 442 insertions(+), 89 deletions(-) -- 1.8.3.1