diff options
| author | Peter Maydell | 2018-04-04 13:33:23 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-04-04 13:33:23 +0200 |
| commit | e5efa1f5f2d32cbfbf18ba84300736503985b593 (patch) | |
| tree | bb798a0c7a82bf4375fb9f0933a5f6d9183f6627 /include/exec/memory.h | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' in... (diff) | |
| parent | gluster: Fix blockdev-add with server.N.type=unix (diff) | |
| download | qemu-e5efa1f5f2d32cbfbf18ba84300736503985b593.tar.gz qemu-e5efa1f5f2d32cbfbf18ba84300736503985b593.tar.xz qemu-e5efa1f5f2d32cbfbf18ba84300736503985b593.zip | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 03 Apr 2018 17:10:22 BST
# gpg: using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
gluster: Fix blockdev-add with server.N.type=unix
blockjob: use qapi enum helpers
blockjob: leak fix, remove from txn when failing early
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec/memory.h')
0 files changed, 0 insertions, 0 deletions