diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-19 17:47:08 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-19 17:47:08 +0000 |
| commit | 3e5f6234b4f45a11b7c357dde2d6da36641bc6f6 (patch) | |
| tree | f6770b2c458dbfeedccd2346543107971654b783 /qmp-commands.hx | |
| parent | 33a8d5b72d63fe44f08614408284fa934dee1edd (diff) | |
| parent | 5b347c541017b9ced10e8e9bce02d25bcf04c7af (diff) | |
| download | qemu-3e5f6234b4f45a11b7c357dde2d6da36641bc6f6.tar.gz qemu-3e5f6234b4f45a11b7c357dde2d6da36641bc6f6.tar.bz2 qemu-3e5f6234b4f45a11b7c357dde2d6da36641bc6f6.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches for 2.3.0-rc1
# gpg: Signature made Thu Mar 19 15:03:26 2015 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
block: Fix blockdev-backup not to use funky error class
raw-posix: Deprecate aio=threads fallback without O_DIRECT
raw-posix: Deprecate host floppy passthrough
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qmp-commands.hx')
| -rw-r--r-- | qmp-commands.hx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmp-commands.hx b/qmp-commands.hx index 87f0f01636..7f6876077b 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2150,7 +2150,7 @@ Each json-object contain the following: - "drv": driver format name (json-string) - Possible values: "blkdebug", "bochs", "cloop", "dmg", "file", "file", "ftp", "ftps", "host_cdrom", - "host_device", "host_floppy", "http", "https", + "host_device", "http", "https", "nbd", "parallels", "qcow", "qcow2", "raw", "tftp", "vdi", "vmdk", "vpc", "vvfat" - "backing_file": backing file name (json-string, optional) |