Touch up a few last things and remove the x- prefix. V2: - Adding R-Bs from Eric and Vladimir. - A few trivial patches for iotests... - Added quick smoke test.
John Snow (7): blockdev: abort transactions in reverse order blockdev: n-ary bitmap merge block: remove 'x' prefix from experimental bitmap APIs iotests.py: don't abort if IMGKEYSECRET is undefined iotests: add filter_generated_node_ids iotests: allow pretty-print for qmp_log iotests: add iotest 236 for testing bitmap merge blockdev.c | 96 +++++++----- qapi/block-core.json | 56 +++---- qapi/transaction.json | 12 +- tests/qemu-iotests/223 | 4 +- tests/qemu-iotests/236 | 123 ++++++++++++++++ tests/qemu-iotests/236.out | 265 ++++++++++++++++++++++++++++++++++ tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 9 +- 8 files changed, 489 insertions(+), 77 deletions(-) create mode 100755 tests/qemu-iotests/236 create mode 100644 tests/qemu-iotests/236.out -- 2.17.2
