From: Kevin Wolf <kwolf@redhat.com>
Date: Fri, 6 Feb 2015 17:00:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'mreitz/block' into queue-block
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8333c0dff14a8a16c8ad3a95c6ea09f9d6f395b3;p=qemu.git

Merge remote-tracking branch 'mreitz/block' into queue-block

* mreitz/block:
  block: Eliminate silly QERR_ macros used for encryption keys
  block: New bdrv_add_key(), convert monitor to use it
  blockdev: Eliminate silly QERR_BLOCK_JOB_NOT_ACTIVE macro
  blockdev: Give find_block_job() an Error ** parameter
---

8333c0dff14a8a16c8ad3a95c6ea09f9d6f395b3