[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/12] qapi: generalize documentation of streaming c
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 02/12] qapi: generalize documentation of streaming commands |
Date: |
Mon, 6 Aug 2012 22:44:41 +0200 |
From: Paolo Bonzini <address@hidden>
Talk about background operations in general, rather than specifically
about streaming.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
hmp-commands.hx | 2 +-
qapi-schema.json | 17 ++++++++---------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index eea8b32..9bbc7f7 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -101,7 +101,7 @@ ETEXI
.name = "block_job_cancel",
.args_type = "device:B",
.params = "device",
- .help = "stop an active block streaming operation",
+ .help = "stop an active background block operation",
.mhandler.cmd = hmp_block_job_cancel,
},
diff --git a/qapi-schema.json b/qapi-schema.json
index cddf63a..bd9c450 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1660,7 +1660,7 @@
# Returns: Nothing on success
# If the job type does not support throttling, NotSupported
# If the speed value is invalid, InvalidParameter
-# If streaming is not active on this device, DeviceNotActive
+# If no background operation is active on this device, DeviceNotActive
#
# Since: 1.1
##
@@ -1670,9 +1670,9 @@
##
# @block-job-cancel:
#
-# Stop an active block streaming operation.
+# Stop an active background block operation.
#
-# This command returns immediately after marking the active block streaming
+# This command returns immediately after marking the active background block
# operation for cancellation. It is an error to call this command if no
# operation is in progress.
#
@@ -1680,16 +1680,15 @@
# BLOCK_JOB_CANCELLED event. Before that happens the job is still visible when
# enumerated using query-block-jobs.
#
-# The image file retains its backing file unless the streaming operation
happens
-# to complete just as it is being cancelled.
-#
-# A new block streaming operation can be started at a later time to finish
-# copying all data from the backing file.
+# For streaming, the image file retains its backing file unless the streaming
+# operation happens to complete just as it is being cancelled. A new streaming
+# operation can be started at a later time to finish copying all data from the
+# backing file.
#
# @device: the device name
#
# Returns: Nothing on success
-# If streaming is not active on this device, DeviceNotActive
+# If no background operation is active on this device, DeviceNotActive
# If cancellation already in progress, DeviceInUse
#
# Since: 1.1
--
1.7.6.5
- [Qemu-devel] [PULL 00/12] Block patches, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 01/12] ide scsi: Mess with geometry only for hard disk devices, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 02/12] qapi: generalize documentation of streaming commands,
Kevin Wolf <=
- [Qemu-devel] [PATCH 03/12] qemu-iotests: add qed.py image manipulation utility, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 04/12] docs: add dirty bit to qcow2 specification, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 05/12] qcow2: introduce dirty bit, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 06/12] docs: add lazy refcounts bit to qcow2 specification, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 07/12] qemu-iotests: ignore qemu-img create lazy_refcounts output, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 09/12] qemu-io: add "abort" command to simulate program crash, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 08/12] qcow2: implement lazy refcounts, Kevin Wolf, 2012/08/06
- [Qemu-devel] [PATCH 11/12] qemu-iotests: Be more flexible with image creation options, Kevin Wolf, 2012/08/06