From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 10 Nov 2014 16:28:51 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
X-Git-Tag: qemu-xen-4.6.0-rc1~83
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=558c2c8ddfb165a36eb95dc93125c04829d68aa7;p=qemu-upstream-4.6-testing.git

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block patches

# gpg: Signature made Mon 10 Nov 2014 09:42:07 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream:
  block/vdi: Limit maximum size even futher
  qapi: Complete BlkdebugEvent
  iotests: Add test for non-existing backing file
  block: Propagate error in bdrv_img_create()
  qemu-img: Omit error_report() after img_open()

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

558c2c8ddfb165a36eb95dc93125c04829d68aa7