From: Peter Maydell Date: Mon, 2 Jun 2014 14:27:18 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f72b49398ffabf7276026a850cd7c1bba266cc4d;p=qemu.git Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging Block patches # gpg: Signature made Mon 02 Jun 2014 14:56:00 BST using RSA key ID C88F2FD6 # gpg: Good signature from "Kevin Wolf " * remotes/kevin/tags/for-upstream: qemu-img: Report error even with --oformat=json vmdk: Fix local_err in vmdk_create block/raw-posix.c: Avoid nonstandard LONG_LONG_MAX qemu-img: Plug memory leak in convert command block/sheepdog: Plug memory leak in sd_snapshot_create() block/vvfat: Plug memory leak in read_directory() block/vvfat: Plug memory leak in check_directory_consistency() block/qapi: Plug memory leak in dump_qobject() case QTYPE_QERROR blockdev: Plug memory leak in drive_init() blockdev: Plug memory leak in blockdev_init() qemu-io: Don't print NULL when open without non-option arg fails qemu-io: Plug memory leak in open command qemu-io: Support multiple -o in open command block: Plug memory leak on brv_open_image() error path qcow2: Plug memory leak on qcow2_invalidate_cache() error paths block/vvfat: Plug memory leak in enable_write_target() qemu-img: Plug memory leak on block option help error path Signed-off-by: Peter Maydell --- f72b49398ffabf7276026a850cd7c1bba266cc4d