d461c27973
We do not need a dedicated section for notes. By eliminating a specially parsed section, these notes can be treated as normal rST paragraphs in the new QMP reference manual, and can be placed and styled much more flexibly. Convert all existing "Note" and "Notes" sections to pure rST. As part of the conversion, capitalize the first letter of each sentence and add trailing punctuation where appropriate to ensure notes look sensible and consistent in rendered HTML documentation. Markup is also re-aligned to the de-facto standard of 3 spaces for directives. Update docs/devel/qapi-code-gen.rst to reflect the new paradigm, and update the QAPI parser to prohibit "Note" sections while suggesting a new syntax. The exact formatting to use is a matter of taste, but a good candidate is simply: .. note:: lorem ipsum ... ... dolor sit amet ... ... consectetur adipiscing elit ... ... but there are other choices, too. The Sphinx readthedocs theme offers theming for the following forms (capitalization unimportant); all are adorned with a (!) symbol () in the title bar for rendered HTML docs. See https://sphinx-rtd-theme.readthedocs.io/en/stable/demo/demo.html#admonitions for examples of each directive/admonition in use. These are rendered in orange: .. Attention:: ... .. Caution:: ... .. WARNING:: ... These are rendered in red: .. DANGER:: ... .. Error:: ... These are rendered in green: .. Hint:: ... .. Important:: ... .. Tip:: ... These are rendered in blue: .. Note:: ... .. admonition:: custom title admonition body text This patch uses ".. note::" almost everywhere, with just two "caution" directives. Several instances of "Notes:" have been converted to merely ".. note::", or multiple ".. note::" where appropriate. ".. admonition:: notes" is used in a few places where we had an ordered list of multiple notes that would not make sense as standalone/separate admonitions. Two "Note:" following "Example:" have been turned into ordinary paragraphs within the example. NOTE: Because qapidoc.py does not attempt to preserve source ordering of sections, the conversion of Notes from a "tagged section" to an "untagged section" means that rendering order for some notes *may change* as a result of this patch. The forthcoming qapidoc.py rewrite strictly preserves source ordering in the rendered documentation, so this issue will be rectified in the new generator. Signed-off-by: John Snow <jsnow@redhat.com> Acked-by: Stefan Hajnoczi <stefanha@redhat.com> [for block*.json] Message-ID: <20240626222128.406106-11-jsnow@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> [Commit message clarified slightly, period added to one more note] Signed-off-by: Markus Armbruster <armbru@redhat.com>
278 lines
6.6 KiB
Python
278 lines
6.6 KiB
Python
# -*- Mode: Python -*-
|
|
# vim: filetype=python
|
|
#
|
|
# Copyright (c) 2022 Oracle and/or its affiliates.
|
|
#
|
|
# This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
# See the COPYING file in the top-level directory.
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
##
|
|
# = Statistics
|
|
##
|
|
|
|
##
|
|
# @StatsType:
|
|
#
|
|
# Enumeration of statistics types
|
|
#
|
|
# @cumulative: stat is cumulative; value can only increase.
|
|
#
|
|
# @instant: stat is instantaneous; value can increase or decrease.
|
|
#
|
|
# @peak: stat is the peak value; value can only increase.
|
|
#
|
|
# @linear-histogram: stat is a linear histogram.
|
|
#
|
|
# @log2-histogram: stat is a logarithmic histogram, with one bucket
|
|
# for each power of two.
|
|
#
|
|
# Since: 7.1
|
|
##
|
|
{ 'enum' : 'StatsType',
|
|
'data' : [ 'cumulative', 'instant', 'peak', 'linear-histogram',
|
|
'log2-histogram' ] }
|
|
|
|
##
|
|
# @StatsUnit:
|
|
#
|
|
# Enumeration of unit of measurement for statistics
|
|
#
|
|
# @bytes: stat reported in bytes.
|
|
#
|
|
# @seconds: stat reported in seconds.
|
|
#
|
|
# @cycles: stat reported in clock cycles.
|
|
#
|
|
# @boolean: stat is a boolean value.
|
|
#
|
|
# Since: 7.1
|
|
##
|
|
{ 'enum' : 'StatsUnit',
|
|
'data' : [ 'bytes', 'seconds', 'cycles', 'boolean' ] }
|
|
|
|
##
|
|
# @StatsProvider:
|
|
#
|
|
# Enumeration of statistics providers.
|
|
#
|
|
# @kvm: since 7.1
|
|
#
|
|
# @cryptodev: since 8.0
|
|
#
|
|
# Since: 7.1
|
|
##
|
|
{ 'enum': 'StatsProvider',
|
|
'data': [ 'kvm', 'cryptodev' ] }
|
|
|
|
##
|
|
# @StatsTarget:
|
|
#
|
|
# The kinds of objects on which one can request statistics.
|
|
#
|
|
# @vm: statistics that apply to the entire virtual machine or the
|
|
# entire QEMU process.
|
|
#
|
|
# @vcpu: statistics that apply to a single virtual CPU.
|
|
#
|
|
# @cryptodev: statistics that apply to a crypto device (since 8.0)
|
|
#
|
|
# Since: 7.1
|
|
##
|
|
{ 'enum': 'StatsTarget',
|
|
'data': [ 'vm', 'vcpu', 'cryptodev' ] }
|
|
|
|
##
|
|
# @StatsRequest:
|
|
#
|
|
# Indicates a set of statistics that should be returned by
|
|
# query-stats.
|
|
#
|
|
# @provider: provider for which to return statistics.
|
|
#
|
|
# @names: statistics to be returned (all if omitted).
|
|
#
|
|
# Since: 7.1
|
|
##
|
|
{ 'struct': 'StatsRequest',
|
|
'data': { 'provider': 'StatsProvider',
|
|
'*names': [ 'str' ] } }
|
|
|
|
##
|
|
# @StatsVCPUFilter:
|
|
#
|
|
# @vcpus: list of QOM paths for the desired vCPU objects.
|
|
#
|
|
# Since: 7.1
|
|
##
|
|
{ 'struct': 'StatsVCPUFilter',
|
|
'data': { '*vcpus': [ 'str' ] } }
|
|
|
|
##
|
|
# @StatsFilter:
|
|
#
|
|
# The arguments to the query-stats command; specifies a target for
|
|
# which to request statistics and optionally the required subset of
|
|
# information for that target.
|
|
#
|
|
# @target: the kind of objects to query. Note that each possible
|
|
# target may enable additional filtering options
|
|
#
|
|
# @providers: which providers to request statistics from, and optionally
|
|
# which named values to return within each provider
|
|
#
|
|
# Since: 7.1
|
|
##
|
|
{ 'union': 'StatsFilter',
|
|
'base': {
|
|
'target': 'StatsTarget',
|
|
'*providers': [ 'StatsRequest' ] },
|
|
'discriminator': 'target',
|
|
'data': { 'vcpu': 'StatsVCPUFilter' } }
|
|
|
|
##
|
|
# @StatsValue:
|
|
#
|
|
# @scalar: single unsigned 64-bit integers.
|
|
#
|
|
# @boolean: single boolean value.
|
|
#
|
|
# @list: list of unsigned 64-bit integers (used for histograms).
|
|
#
|
|
# Since: 7.1
|
|
##
|
|
{ 'alternate': 'StatsValue',
|
|
'data': { 'scalar': 'uint64',
|
|
'boolean': 'bool',
|
|
'list': [ 'uint64' ] } }
|
|
|
|
##
|
|
# @Stats:
|
|
#
|
|
# @name: name of stat.
|
|
#
|
|
# @value: stat value.
|
|
#
|
|
# Since: 7.1
|
|
##
|
|
{ 'struct': 'Stats',
|
|
'data': { 'name': 'str',
|
|
'value' : 'StatsValue' } }
|
|
|
|
##
|
|
# @StatsResult:
|
|
#
|
|
# @provider: provider for this set of statistics.
|
|
#
|
|
# @qom-path: Path to the object for which the statistics are returned,
|
|
# if the object is exposed in the QOM tree
|
|
#
|
|
# @stats: list of statistics.
|
|
#
|
|
# Since: 7.1
|
|
##
|
|
{ 'struct': 'StatsResult',
|
|
'data': { 'provider': 'StatsProvider',
|
|
'*qom-path': 'str',
|
|
'stats': [ 'Stats' ] } }
|
|
|
|
##
|
|
# @query-stats:
|
|
#
|
|
# Return runtime-collected statistics for objects such as the VM or
|
|
# its vCPUs.
|
|
#
|
|
# The arguments are a StatsFilter and specify the provider and objects
|
|
# to return statistics about.
|
|
#
|
|
# Returns: a list of StatsResult, one for each provider and object
|
|
# (e.g., for each vCPU).
|
|
#
|
|
# Since: 7.1
|
|
##
|
|
{ 'command': 'query-stats',
|
|
'data': 'StatsFilter',
|
|
'boxed': true,
|
|
'returns': [ 'StatsResult' ] }
|
|
|
|
##
|
|
# @StatsSchemaValue:
|
|
#
|
|
# Schema for a single statistic.
|
|
#
|
|
# @name: name of the statistic; each element of the schema is uniquely
|
|
# identified by a target, a provider (both available in
|
|
# @StatsSchema) and the name.
|
|
#
|
|
# @type: kind of statistic.
|
|
#
|
|
# @unit: basic unit of measure for the statistic; if missing, the
|
|
# statistic is a simple number or counter.
|
|
#
|
|
# @base: base for the multiple of @unit in which the statistic is
|
|
# measured. Only present if @exponent is non-zero; @base and
|
|
# @exponent together form a SI prefix (e.g., _nano-_ for
|
|
# ``base=10`` and ``exponent=-9``) or IEC binary prefix (e.g.
|
|
# _kibi-_ for ``base=2`` and ``exponent=10``)
|
|
#
|
|
# @exponent: exponent for the multiple of @unit in which the statistic
|
|
# is expressed, or 0 for the basic unit
|
|
#
|
|
# @bucket-size: Present when @type is "linear-histogram", contains the
|
|
# width of each bucket of the histogram.
|
|
#
|
|
# Since: 7.1
|
|
##
|
|
{ 'struct': 'StatsSchemaValue',
|
|
'data': { 'name': 'str',
|
|
'type': 'StatsType',
|
|
'*unit': 'StatsUnit',
|
|
'*base': 'int8',
|
|
'exponent': 'int16',
|
|
'*bucket-size': 'uint32' } }
|
|
|
|
##
|
|
# @StatsSchema:
|
|
#
|
|
# Schema for all available statistics for a provider and target.
|
|
#
|
|
# @provider: provider for this set of statistics.
|
|
#
|
|
# @target: the kind of object that can be queried through the
|
|
# provider.
|
|
#
|
|
# @stats: list of statistics.
|
|
#
|
|
# Since: 7.1
|
|
##
|
|
{ 'struct': 'StatsSchema',
|
|
'data': { 'provider': 'StatsProvider',
|
|
'target': 'StatsTarget',
|
|
'stats': [ 'StatsSchemaValue' ] } }
|
|
|
|
##
|
|
# @query-stats-schemas:
|
|
#
|
|
# Return the schema for all available runtime-collected statistics.
|
|
#
|
|
# @provider: a provider to restrict the query to.
|
|
#
|
|
# .. note:: Runtime-collected statistics and their names fall outside
|
|
# QEMU's usual deprecation policies. QEMU will try to keep the set
|
|
# of available data stable, together with their names, but will not
|
|
# guarantee stability at all costs; the same is true of providers
|
|
# that source statistics externally, e.g. from Linux. For example,
|
|
# if the same value is being tracked with different names on
|
|
# different architectures or by different providers, one of them
|
|
# might be renamed. A statistic might go away if an algorithm is
|
|
# changed or some code is removed; changing a default might cause
|
|
# previously useful statistics to always report 0. Such changes,
|
|
# however, are expected to be rare.
|
|
#
|
|
# Since: 7.1
|
|
##
|
|
{ 'command': 'query-stats-schemas',
|
|
'data': { '*provider': 'StatsProvider' },
|
|
'returns': [ 'StatsSchema' ] }
|