projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit8333c0dff14a8a16c8ad3a95c6ea09f9d6f395b3
tree76aa97eea763dd725edada2b3d210f27b8f7af5atree | snapshot
parent8c44dfbc62a50a8bc4113f199b8662861f757591commit | diff
parentb1ca639184d93984551b423d8e538ad4add5eb15commit | diff
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
Domain: SDK / Emulator;