The following changes since commit d7d3d6092cb7edc75dc49fb90c86dd5425ab4805:
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter'
into staging (2014-05-28 18:38:39 +0100)
are available in the git repository at:
git://repo.or.cz/qemu/kevin.git tags/for-upstream
for you to fetch changes up to 55d492d7602c27cabb605f42e72c755de1c186c1:
qemu-img: Report error even with --oformat=json (2014-06-02 13:58:40 +0200)
----------------------------------------------------------------
Block patches
----------------------------------------------------------------
Fam Zheng (1):
vmdk: Fix local_err in vmdk_create
Markus Armbruster (14):
qemu-img: Plug memory leak on block option help error path
block/vvfat: Plug memory leak in enable_write_target()
qcow2: Plug memory leak on qcow2_invalidate_cache() error paths
block: Plug memory leak on brv_open_image() error path
qemu-io: Support multiple -o in open command
qemu-io: Plug memory leak in open command
qemu-io: Don't print NULL when open without non-option arg fails
blockdev: Plug memory leak in blockdev_init()
blockdev: Plug memory leak in drive_init()
block/qapi: Plug memory leak in dump_qobject() case QTYPE_QERROR
block/vvfat: Plug memory leak in check_directory_consistency()
block/vvfat: Plug memory leak in read_directory()
block/sheepdog: Plug memory leak in sd_snapshot_create()
qemu-img: Plug memory leak in convert command
Max Reitz (1):
qemu-img: Report error even with --oformat=json
Peter Maydell (1):
block/raw-posix.c: Avoid nonstandard LONG_LONG_MAX
block.c | 1 +
block/qapi.c | 1 +
block/qcow2.c | 3 +--
block/raw-posix.c | 2 +-
block/sheepdog.c | 4 ++--
block/vmdk.c | 8 ++++----
block/vvfat.c | 7 +++++--
blockdev.c | 7 +++++--
qemu-img.c | 7 +++----
qemu-io.c | 22 +++++++++++++++-------
10 files changed, 38 insertions(+), 24 deletions(-)
