The following changes since commit 7260438b7056469610ee166f7abe9ff8a26b8b16:
Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-3.2-part2' into staging (2019-01-14 11:41:43 +0000) are available in the Git repository at: https://repo.or.cz/qemu/ericb.git tags/pull-nbd-2019-01-14 for you to fetch changes up to 636192c4b6052820ea126a5287c58a8f53f3c84f: qemu-nbd: Add --bitmap=NAME option (2019-01-14 10:09:46 -0600) ---------------------------------------------------------------- nbd patches for 2019-01-14 Promote bitmap/NBD interfaces to stable for use in incremental backups. Add 'qemu-nbd --bitmap'. - John Snow: 0/11 bitmaps: remove x- prefix from QMP api - Philippe Mathieu-Daudé: qemu-nbd: Rename 'exp' variable clashing with math::exp() symbol - Eric Blake: 0/8 Promote x-nbd-server-add-bitmap to stable ---------------------------------------------------------------- Eric Blake (8): nbd: Add some error case testing to iotests 223 nbd: Forbid nbd-server-stop when server is not running nbd: Only require disabled bitmap for read-only exports nbd: Merge nbd_export_set_name into nbd_export_new nbd: Allow bitmap export during QMP nbd-server-add nbd: Remove x-nbd-server-add-bitmap nbd: Merge nbd_export_bitmap into nbd_export_new qemu-nbd: Add --bitmap=NAME option John Snow (11): blockdev: abort transactions in reverse order block/dirty-bitmap: remove assertion from restore 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: add qmp recursive sorting function iotests: remove default filters from qmp_log iotests: change qmp_log filters to expect QMP objects only iotests: implement pretty-print for log and qmp_log iotests: add iotest 236 for testing bitmap merge Philippe Mathieu-Daudé (1): qemu-nbd: Rename 'exp' variable clashing with math::exp() symbol qemu-nbd.texi | 4 + qapi/block-core.json | 56 +++---- qapi/block.json | 30 +--- qapi/transaction.json | 12 +- include/block/nbd.h | 12 +- block/dirty-bitmap.c | 1 - blockdev-nbd.c | 36 ++--- blockdev.c | 107 ++++++++----- hmp.c | 5 +- nbd/server.c | 136 ++++++++-------- qemu-nbd.c | 26 ++-- tests/qemu-iotests/206 | 8 +- tests/qemu-iotests/223 | 52 +++++-- tests/qemu-iotests/223.out | 23 ++- tests/qemu-iotests/236 | 161 +++++++++++++++++++ tests/qemu-iotests/236.out | 351 ++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 64 ++++++-- 18 files changed, 841 insertions(+), 244 deletions(-) create mode 100755 tests/qemu-iotests/236 create mode 100644 tests/qemu-iotests/236.out -- 2.20.1
