diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-07 09:46:24 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-07 09:46:24 -0500 |
| commit | b262fce11a7409d71be84f68637cf4005e995822 (patch) | |
| tree | ab8fcdcd608718e38ce9772ccdc4f54cafa15b05 /hmp-commands.hx | |
| parent | 0b8db8fe15d17a529a5ea90614c11e9f031dfee8 (diff) | |
| parent | 20caf0f766b48fbbf718eb20aaddb7ffa356a21f (diff) | |
| download | qemu-b262fce11a7409d71be84f68637cf4005e995822.tar.gz | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony:
qemu-img: use QemuOpts instead of QEMUOptionParameter in resize function
qemu-iotests: Be more flexible with image creation options
qemu-iotests: add 039 qcow2 lazy refcounts test
qemu-io: add "abort" command to simulate program crash
qcow2: implement lazy refcounts
qemu-iotests: ignore qemu-img create lazy_refcounts output
docs: add lazy refcounts bit to qcow2 specification
qcow2: introduce dirty bit
docs: add dirty bit to qcow2 specification
qemu-iotests: add qed.py image manipulation utility
qapi: generalize documentation of streaming commands
ide scsi: Mess with geometry only for hard disk devices
Diffstat (limited to 'hmp-commands.hx')
| -rw-r--r-- | hmp-commands.hx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx index eea8b32894..9bbc7f7555 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, }, |