From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:44735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RnWhP-0001Mv-UD for qemu-devel@nongnu.org; Wed, 18 Jan 2012 09:41:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RnWhL-0007lj-7n for qemu-devel@nongnu.org; Wed, 18 Jan 2012 09:41:15 -0500 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:56621) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RnWhK-0007lK-Sh for qemu-devel@nongnu.org; Wed, 18 Jan 2012 09:41:11 -0500 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 18 Jan 2012 14:41:07 -0000 Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q0IEf5N81712248 for ; Wed, 18 Jan 2012 14:41:05 GMT Received: from d06av06.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q0IEf4N5015981 for ; Wed, 18 Jan 2012 07:41:05 -0700 From: Stefan Hajnoczi Date: Wed, 18 Jan 2012 14:40:39 +0000 Message-Id: <1326897655-2799-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v6 00/16] block: generic image streaming List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Marcelo Tosatti , Stefan Hajnoczi This series adds the 'block_stream' command which copies the contents of a backing file into the image file while the VM is running. These patches are based on Kevin Wolf's block tree. Previously this series was based on the zero detection series but Kevin pointed out there is no hard dependency, so they are now independent. The image streaming HMP/QMP commands are documented in the patch and also described here: http://wiki.qemu.org/Features/LiveBlockMigration/ImageStreamingAPI The basic idea is to execute 'block_stream virtio0' while the guest is running. Progress can be monitored using 'info block-jobs'. When the streaming operation completes it raises a QMP event. Note: The last patch includes includes a Python test script called test-stream.py, I do not propose to merge it. When run in a QEMU source tree it performs basic image streaming QMP tests. v6: * Use per-request copy-on-read when doing partial streaming [Kevin] v5: * Handle block_job_create() failure [Luiz] * Mark BLOCK_JOB_COMPLETED error field optional [Luiz] * Mark block_stream base parameter optional [Luiz] * Check bdrv_getlength() failure and don't call twice [Kevin] * Rename "id" to "backing_file" in bdrv_find_backing_image() [Kevin] * Rename BaseIdNotFound qerror to BaseNotFound [Kevin] * Document BaseNotFound qerror from block_stream * Document that qemu_co_sleep_ns() needs main loop [Kevin] * Make bdrv_co_is_allocated_base() private to block/stream.c [Kevin] * Clean up commit messages v4: * Drop SQMP/EQMP docs from qmp-commands.hx [Luiz] * Follow QAPI doc conventions [Luiz] * Document QMP events in QMP/qmp-events.txt [Luiz] * Protect against hotplug, resize, eject, etc [Kevin] * Move block job functions from header to block.c [Kevin] * Return error from bdrg_change_backing_file() [Kevin] * Merge Marcelo's block_stream base partial streaming series [Marcelo] Luiz has reviewed the QMP/QAPI parts, which remain unchanged from v5. Acked-by: Luiz Capitulino Marcelo Tosatti (4): block: add bdrv_find_backing_image add QERR_BASE_NOT_FOUND block: add support for partial streaming docs: describe live block operations Stefan Hajnoczi (12): coroutine: add co_sleep_ns() coroutine sleep function block: check bdrv_in_use() before blockdev operations block: make copy-on-read a per-request flag block: add BlockJob interface for long-running operations block: add image streaming block job block: rate-limit streaming operations qmp: add block_stream command qmp: add block_job_set_speed command qmp: add block_job_cancel command qmp: add query-block-jobs blockdev: make image streaming safe across hotplug test: add image streaming test cases Makefile.objs | 2 + QMP/qmp-events.txt | 53 +++++++++ block.c | 119 +++++++++++++++++++-- block.h | 4 + block/stream.c | 269 +++++++++++++++++++++++++++++++++++++++++++++++ block_int.h | 47 ++++++++ blockdev.c | 199 ++++++++++++++++++++++++++++++++++- docs/live-block-ops.txt | 58 ++++++++++ hmp-commands.hx | 41 +++++++ hmp.c | 68 ++++++++++++ hmp.h | 4 + monitor.c | 13 +++ monitor.h | 2 + qapi-schema.json | 116 ++++++++++++++++++++ qemu-coroutine-sleep.c | 38 +++++++ qemu-coroutine.h | 9 ++ qerror.c | 8 ++ qerror.h | 6 + qmp-commands.hx | 24 ++++ test-stream.py | 208 ++++++++++++++++++++++++++++++++++++ trace-events | 12 ++- 21 files changed, 1287 insertions(+), 13 deletions(-) create mode 100644 block/stream.c create mode 100644 docs/live-block-ops.txt create mode 100644 qemu-coroutine-sleep.c create mode 100644 test-stream.py -- 1.7.8.3