diff options
| author | Anthony Liguori | 2012-03-13 02:51:42 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2012-03-13 02:51:42 +0100 |
| commit | fb23ae6e41aad0404154be7af576e76f16466f8e (patch) | |
| tree | ecdecee94946580232309f51d1498897fe552f49 /hmp-commands.hx | |
| parent | Merge remote-tracking branch 'qemu-kvm/memory/core' into staging (diff) | |
| parent | test-coroutine: add performance test for nesting (diff) | |
| download | qemu-fb23ae6e41aad0404154be7af576e76f16466f8e.tar.gz qemu-fb23ae6e41aad0404154be7af576e76f16466f8e.tar.xz qemu-fb23ae6e41aad0404154be7af576e76f16466f8e.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony:
test-coroutine: add performance test for nesting
coroutine: adding configure option for sigaltstack coroutine backend
coroutine: adding configure choose mechanism for coroutine backend
coroutine: adding sigaltstack method (.c source)
qcow2: Reduce number of I/O requests
qcow2: Add qcow2_alloc_clusters_at()
qcow2: Factor out count_cow_clusters
qmp: convert blockdev-snapshot-sync to a wrapper around transactions
add mode field to blockdev-snapshot-sync transaction item
rename blockdev-group-snapshot-sync
qapi: complete implementation of unions
use QSIMPLEQ_FOREACH_SAFE when freeing list elements
Add 'make check-block'
make check: Add qemu-iotests subset
qemu-iotests: Mark some tests as quick
qcow2: Add error messages in qcow2_truncate
block: handle -EBUSY in bdrv_commit_all()
qcow2: Add some tracing
qed: do not evict in-use L2 table cache entries
Group snapshot: Fix format name for backing file
Diffstat (limited to 'hmp-commands.hx')
| -rw-r--r-- | hmp-commands.hx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx index ed88877230..6980214a1a 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -882,14 +882,17 @@ ETEXI { .name = "snapshot_blkdev", - .args_type = "device:B,snapshot-file:s?,format:s?", - .params = "device [new-image-file] [format]", + .args_type = "reuse:-n,device:B,snapshot-file:s?,format:s?", + .params = "[-n] device [new-image-file] [format]", .help = "initiates a live snapshot\n\t\t\t" "of device. If a new image file is specified, the\n\t\t\t" "new image file will become the new root image.\n\t\t\t" "If format is specified, the snapshot file will\n\t\t\t" "be created in that format. Otherwise the\n\t\t\t" - "snapshot will be internal! (currently unsupported)", + "snapshot will be internal! (currently unsupported).\n\t\t\t" + "The default format is qcow2. The -n flag requests QEMU\n\t\t\t" + "to reuse the image found in new-image-file, instead of\n\t\t\t" + "recreating it from scratch.", .mhandler.cmd = hmp_snapshot_blkdev, }, |