diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-05 13:05:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-05 13:05:29 +0100 |
| commit | bd8eda537fbe6f28a94db30e8facab2bf528b204 (patch) | |
| tree | ffbddd89dfed1d48db6aa51aa093470d084919de /qapi | |
| parent | 8bfa87a231a846343a33bd817ea002740d84ae51 (diff) | |
| parent | 47989f14472262a289894058f7babf1db37edda5 (diff) | |
| download | qemu-bd8eda537fbe6f28a94db30e8facab2bf528b204.zip qemu-bd8eda537fbe6f28a94db30e8facab2bf528b204.tar.gz qemu-bd8eda537fbe6f28a94db30e8facab2bf528b204.tar.bz2 | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.7.0-rc2
# gpg: Signature made Fri 05 Aug 2016 10:30:12 BST
# gpg: using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
nvme: bump PCI revision
nvme: fix identify to be NVMe 1.1 compliant
block: Accept any target node for transactional blockdev-backup
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/block-core.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index 2bbc027..5e2d7d7 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -927,7 +927,7 @@ # # @device: the name of the device which should be copied. # -# @target: the name of the backup target device. +# @target: the device name or node-name of the backup target node. # # @sync: what parts of the disk image should be copied to the destination # (all the disk, only the sectors allocated in the topmost image, or |