[qemu-xen master] Merge remote-tracking branch 'remotes/armbru/tags/pull-qom-2020-07-21' into staging

[patchbot@xxxxxxx]

commit b50dab9ecac442acc1b316e4749dae36a2fe7d61
Merge: a418695e1b177da055d477c4e15ce900c01a94fd 
0dde9fd12fd39762ff68fca80d2f0a735d66e7bd
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Tue Jul 21 18:31:52 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Tue Jul 21 18:31:52 2020 +0100

    Merge remote-tracking branch 'remotes/armbru/tags/pull-qom-2020-07-21' into 
staging
    
    QOM patches for 2020-07-21
    
    # gpg: Signature made Tue 21 Jul 2020 16:40:27 BST
    # gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
    # gpg:                issuer "armbru@xxxxxxxxxx"
    # gpg: Good signature from "Markus Armbruster <armbru@xxxxxxxxxx>" [full]
    # gpg:                 aka "Markus Armbruster <armbru@xxxxxxxxxxxx>" [full]
    # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 
8653
    
    * remotes/armbru/tags/pull-qom-2020-07-21:
      qom: Make info qom-tree sort children more efficiently
      qom: Document object_get_canonical_path() returns malloced string
      qom: Change object_get_canonical_path_component() not to malloc
    
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>

 backends/hostmem.c         |  2 +-
 block/throttle-groups.c    |  2 +-
 gdbstub.c                  |  2 +-
 hw/arm/xlnx-zynqmp.c       |  6 ++----
 hw/block/nvme.c            |  5 ++---
 hw/core/machine-qmp-cmds.c |  2 +-
 hw/core/machine.c          |  5 ++---
 hw/mem/nvdimm.c            |  5 ++---
 hw/mem/pc-dimm.c           |  5 ++---
 hw/misc/ivshmem.c          |  5 ++---
 hw/ppc/spapr_drc.c         |  3 +--
 hw/ppc/trace-events        |  2 +-
 hw/virtio/virtio-crypto.c  |  5 ++---
 hw/virtio/virtio-mem.c     |  6 ++----
 hw/virtio/virtio-pmem.c    |  5 ++---
 include/qom/object.h       |  7 ++++---
 iothread.c                 |  9 ++++-----
 net/net.c                  |  6 ++----
 qom/object.c               |  7 +++----
 qom/qom-hmp-cmds.c         | 32 +++++++++++++++-----------------
 scsi/pr-manager-helper.c   |  3 +--
 scsi/pr-manager.c          |  2 +-
 softmmu/memory.c           |  2 +-
 23 files changed, 55 insertions(+), 73 deletions(-)

--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master