diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-11 10:43:37 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-11 10:43:37 +0100 |
| commit | 75e50c80e051423a6f55a34ee4a1eec842444a5b (patch) | |
| tree | bc52115bc7254051864a725f0d44f2f53511f8e9 /qapi | |
| parent | 53a19a9a5f9811a911e9b69ef36afb0d66b5d85c (diff) | |
| parent | b266f1d1123396f9f5df865508f7555ab0c9582a (diff) | |
| download | qemu-75e50c80e051423a6f55a34ee4a1eec842444a5b.zip qemu-75e50c80e051423a6f55a34ee4a1eec842444a5b.tar.gz qemu-75e50c80e051423a6f55a34ee4a1eec842444a5b.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-10-10' into staging
Miscellaneous patches for 2018-10-10
# gpg: Signature made Wed 10 Oct 2018 07:03:10 BST
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-misc-2018-10-10:
ivshmem: Fix unplug of device "ivshmem-plain"
libqtest: Inline g_assert_no_errno()
tests: Restore check-qdict unit test
qapi/misc.json: Remove superfluous words in CpuModelExpansionType
tests/check-qjson: fix a leak
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/misc.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qapi/misc.json b/qapi/misc.json index ada9af5..f98de3a 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -2017,7 +2017,7 @@ # # @migration-safe: whether a CPU definition can be safely used for # migration in combination with a QEMU compatibility machine -# when migrating between different QMU versions and between +# when migrating between different QEMU versions and between # hosts with different sets of (hardware or software) # capabilities. If not provided, information is not available # and callers should not assume the CPU definition to be @@ -2126,11 +2126,11 @@ # @static: Expand to a static CPU model, a combination of a static base # model name and property delta changes. As the static base model will # never change, the expanded CPU model will be the same, independent of -# independent of QEMU version, machine type, machine options, and -# accelerator options. Therefore, the resulting model can be used by -# tooling without having to specify a compatibility machine - e.g. when -# displaying the "host" model. static CPU models are migration-safe. -# +# QEMU version, machine type, machine options, and accelerator options. +# Therefore, the resulting model can be used by tooling without having +# to specify a compatibility machine - e.g. when displaying the "host" +# model. The @static CPU models are migration-safe. + # @full: Expand all properties. The produced model is not guaranteed to be # migration-safe, but allows tooling to get an insight and work with # model details. |