diff options
| author | Peter Maydell | 2015-07-21 21:56:20 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-07-21 21:56:20 +0200 |
| commit | b9c46307996856d03ddc1527468ff5401ac03a79 (patch) | |
| tree | c431c27f791344248212b2abc8a3b4b50efb0765 | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150721'... (diff) | |
| parent | qga: fixed versions for guest bus types in qapi-schema (diff) | |
| download | qemu-b9c46307996856d03ddc1527468ff5401ac03a79.tar.gz qemu-b9c46307996856d03ddc1527468ff5401ac03a79.tar.xz qemu-b9c46307996856d03ddc1527468ff5401ac03a79.zip | |
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-07-21-tag' into staging
tag for qga-pull-2015-07-21
Small fix to correct schema versioning annotations for recently-added
GuestDiskBusType enum values. Not the end of the world, but ideally
this inconsistency would be corrected prior to 2.4 release.
# gpg: Signature made Tue Jul 21 20:43:24 2015 BST using RSA key ID F108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
# gpg: aka "Michael Roth <mdroth@utexas.edu>"
# gpg: aka "Michael Roth <mdroth@linux.vnet.ibm.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: CEAC C9E1 5534 EBAB B82D 3FA0 3353 C9CE F108 B584
* remotes/mdroth/tags/qga-pull-2015-07-21-tag:
qga: fixed versions for guest bus types in qapi-schema
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | qga/qapi-schema.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index 8a9b818d18..18e3cc37d4 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -714,7 +714,7 @@ # @virtual: Win virtual bus type # @file-backed virtual: Win file-backed bus type # -# Since: 2.2 +# Since: 2.2; 'Unknown' and all entries below since 2.4 ## { 'enum': 'GuestDiskBusType', 'data': [ 'ide', 'fdc', 'scsi', 'virtio', 'xen', 'usb', 'uml', 'sata', |