summaryrefslogtreecommitdiffstats
path: root/util/aes.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-04-28 11:50:30 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-04-28 11:50:31 +0100
commita41b2c995b52b2ce26c171c52ac7dc11c7dccd99 (patch)
tree63d44a2ccd30e219c4b10edc2b7fbb5f226a8756 /util/aes.c
parentd09a18d44d5bc0db10caa97cdd22c70e65adfe01 (diff)
parent172fc4dd33e604dcf868c28e73398c19e161708b (diff)
downloadhqemu-a41b2c995b52b2ce26c171c52ac7dc11c7dccd99.zip
hqemu-a41b2c995b52b2ce26c171c52ac7dc11c7dccd99.tar.gz
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Block pull request # gpg: Signature made Fri 25 Apr 2014 17:05:13 BST using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" * remotes/stefanha/tags/block-pull-request: iscsi: Don't use error_is_set() to suppress additional errors blockdev: Clean up fragile use of error_is_set() nbd: Use return values instead of error_is_set(errp) qemu-img: Consistently name Error * objects err, and not errp Use error_is_set() only when necessary (again) block: Expose host_* drivers in blockdev-add MAINTAINERS: Add qemu-img/io to block subsystem qemu-iotests: Improve and make use of QMPTestCase.wait_until_completed() doc: add -drive rerror=,werror= to qemu --help output block: Prevent coroutine stack overflow when recursing in bdrv_open_backing_file. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/aes.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud