projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c44dfb b1ca639)
Merge remote-tracking branch 'mreitz/block' into queue-block
authorKevin Wolf <kwolf@redhat.com>
Fri, 6 Feb 2015 17:00:14 +0000 (18:00 +0100)
committerKevin Wolf <kwolf@redhat.com>
Fri, 6 Feb 2015 17:00:14 +0000 (18:00 +0100)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.