diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-11 12:07:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-11 12:07:29 +0100 |
| commit | ba9cef7b6e487a5a8969db81d09b8eec8a2b50c6 (patch) | |
| tree | 5d864537d44177d855b5af77934e860b0d484ec5 /qapi-schema.json | |
| parent | 7b9c09f7d486647784c605739d69b708a7249c9b (diff) | |
| parent | af5b83d7d5297f8bdfd3353a420c120c4fd5adfd (diff) | |
| download | hqemu-ba9cef7b6e487a5a8969db81d09b8eec8a2b50c6.zip hqemu-ba9cef7b6e487a5a8969db81d09b8eec8a2b50c6.tar.gz | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-09-11' into staging
trivial patches for 2015-09-11
# gpg: Signature made Fri 11 Sep 2015 12:02:43 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-09-11: (26 commits)
virtio-vga: enable for i386
hw/arm/spitz: Remove meaningless blank Property
hw/gpio/zaurus: Remove meaningless blank Property
hw/virtio/virtio-pci: Remove meaningless blank Property
hw/s390x/s390-virtio-bus: Remove meaningless blank Property
typofixes - v4
qapi-schema: remove legacy<> from doc
disas/microblaze: Remove unused code
help: dd missing newline
Target-ppc: Remove unnecessary variable
baum: Fix build with debugging enabled
linux-user: Fix warnings caused by missing 'static' attribute
opts: produce valid command line in qemu_opts_print
docs: fix a qga/qapi-schema.json comment
trivial: remove trailing newline from error_report
maint: avoid useless "if (foo) free(foo)" pattern
maint: avoid useless "if (foo) free(foo)" pattern
maint: remove unused include for strings.h
maint: remove unused include for signal.h
maint: remove unused include for dirent.h
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index 67fef37..4060b78 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1632,13 +1632,10 @@ # 1) A primitive type such as 'u8', 'u16', 'bool', 'str', or 'double'. # These types are mapped to the appropriate JSON type. # -# 2) A legacy type in the form 'legacy<subtype>' where subtype is the -# legacy qdev typename. These types are always treated as strings. -# -# 3) A child type in the form 'child<subtype>' where subtype is a qdev +# 2) A child type in the form 'child<subtype>' where subtype is a qdev # device type name. Child properties create the composition tree. # -# 4) A link type in the form 'link<subtype>' where subtype is a qdev +# 3) A link type in the form 'link<subtype>' where subtype is a qdev # device type name. Link properties form the device model graph. # # Since: 1.2 @@ -1689,10 +1686,10 @@ # # @property: The property name to read # -# Returns: The property value. The type depends on the property type. legacy<> -# properties are returned as #str. child<> and link<> properties are -# returns as #str pathnames. All integer property types (u8, u16, etc) -# are returned as #int. +# Returns: The property value. The type depends on the property +# type. child<> and link<> properties are returned as #str +# pathnames. All integer property types (u8, u16, etc) are +# returned as #int. # # Since: 1.2 ## |
