Il 28/09/2012 20:23, Kevin Wolf ha scritto: > Am 28.09.2012 17:22, schrieb Paolo Bonzini: >> Kevin, >> >> the following changes since commit ac05f3492421caeb05809ffa02c6198ede179e43: >> >> add a boot parameter to set reboot timeout (2012-09-25 20:05:04 -0500) >> >> are available in the git repository at: >> >> git://github.com/bonzini/qemu.git blkmirror-job-1.3-part1 >> >> for you to fetch changes up to ed306a929f16fda8a85561430b1ac370bde65097: >> >> qemu-iotests: add tests for streaming error handling (2012-09-27 15:11:22 >> +0200) >> >> This message has the diff from my post of Sep 25th. You reviewed 18 patches, >> these are 19 because of the new "qmp: add 'busy' member to BlockJobInfo" >> patch. >> >> ---------------------------------------------------------------- >> Jeff Cody (1): >> blockdev: rename block_stream_cb to a generic block_job_cb >> >> Paolo Bonzini (18): >> qerror/block: introduce QERR_BLOCK_JOB_NOT_ACTIVE >> block: fix documentation of block_job_cancel_sync >> block: move job APIs to separate files >> block: add block_job_query >> qmp: add 'busy' member to BlockJobInfo >> block: add support for job pause/resume >> qmp: add block-job-pause and block-job-resume >> qemu-iotests: add test for pausing a streaming operation >> block: rename block_job_complete to block_job_completed >> iostatus: rename BlockErrorAction, BlockQMPEventAction >> iostatus: move BlockdevOnError declaration to QAPI >> iostatus: change is_read to a bool >> iostatus: reorganize io error code >> block: introduce block job error >> stream: add on-error argument >> blkdebug: process all set_state rules in the old state >> qemu-iotests: map underscore to dash in QMP argument names >> qemu-iotests: add tests for streaming error handling >> >> Makefile.objs | 5 +- >> QMP/qmp-events.txt | 22 ++++ >> block.c | 187 ++++++++---------------------- >> block.h | 20 ++-- >> block/Makefile.objs | 3 +- >> block/blkdebug.c | 12 +- >> block/stream.c | 33 +++++- >> block_int.h | 162 ++------------------------ >> blockdev.c | 86 +++++++++----- >> blockjob.c | 249 ++++++++++++++++++++++++++++++++++++++++ >> blockjob.h | 243 +++++++++++++++++++++++++++++++++++++++ >> hmp-commands.hx | 35 +++++- >> hmp.c | 26 ++++- >> hmp.h | 2 + >> hw/fdc.c | 4 +- >> hw/ide/core.c | 22 +--- >> hw/ide/pci.c | 4 +- >> hw/scsi-disk.c | 25 ++-- >> hw/scsi-generic.c | 4 +- >> hw/virtio-blk.c | 23 ++-- >> monitor.c | 1 + >> monitor.h | 1 + >> qapi-schema.json | 91 ++++++++++++++- >> qemu-tool.c | 6 + >> qerror.h | 6 + >> qmp-commands.hx | 14 ++- >> tests/qemu-iotests/030 | 260 >> +++++++++++++++++++++++++++++++++++++++++- >> tests/qemu-iotests/030.out | 4 +- >> tests/qemu-iotests/group | 2 +- >> tests/qemu-iotests/iotests.py | 15 ++- >> trace-events | 4 +- >> 31 file modificati, 1152 inserzioni(+), 419 rimozioni(-) >> create mode 100644 blockjob.c >> create mode 100644 blockjob.h > > Thanks, applied all to the block branch.
Great, I rebased and only got mostly trivial conflicts. I pushed the outcome to the branch blkmirror-job-20120925-rebase of my github repository. Do I need to repost, or are you going to continue your review on the previous patchset? The next obvious points to step are: - part 2: "qemu-iotests: add mirroring test case" or "qemu-iotests: add testcases for mirroring on-source-error/on-target-error" - part 3: "mirror: perform COW if the cluster size is bigger than the granularity" or "mirror: allow customizing the granularity" - part 4: "mirror: support arbitrarily-sized iterations" Paolo
