Skip to content

Commit 9e27207

Browse files
author
Markus Armbruster
committed
qapi: Reformat recent doc comments to conform to current conventions
Since commit a937b6a (qapi: Reformat doc comments to conform to current conventions), a number of comments not conforming to the current formatting conventions were added. No problem, just sweep the entire documentation once more. To check the generated documentation does not change, I compared the generated HTML before and after this commit with "wdiff -3". Finds no differences. Comparing with diff is not useful, as the reflown paragraphs are visible there. Signed-off-by: Markus Armbruster <[email protected]> Message-ID: <[email protected]>
1 parent e27a9d6 commit 9e27207

File tree

9 files changed

+55
-57
lines changed

9 files changed

+55
-57
lines changed

qapi/block-core.json

Lines changed: 37 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
#
137137
# @filename: Name of the extent file
138138
#
139-
# @format: Extent type (e.g. FLAT or SPARSE)
139+
# @format: Extent type (e.g. FLAT or SPARSE)
140140
#
141141
# @virtual-size: Number of bytes covered by this extent
142142
#
@@ -853,9 +853,8 @@
853853
# @min_wr_latency_ns: Minimum latency of write operations in the
854854
# defined interval, in nanoseconds.
855855
#
856-
# @min_zone_append_latency_ns: Minimum latency of zone append operations
857-
# in the defined interval, in nanoseconds
858-
# (since 8.1)
856+
# @min_zone_append_latency_ns: Minimum latency of zone append
857+
# operations in the defined interval, in nanoseconds (since 8.1)
859858
#
860859
# @min_flush_latency_ns: Minimum latency of flush operations in the
861860
# defined interval, in nanoseconds.
@@ -866,9 +865,8 @@
866865
# @max_wr_latency_ns: Maximum latency of write operations in the
867866
# defined interval, in nanoseconds.
868867
#
869-
# @max_zone_append_latency_ns: Maximum latency of zone append operations
870-
# in the defined interval, in nanoseconds
871-
# (since 8.1)
868+
# @max_zone_append_latency_ns: Maximum latency of zone append
869+
# operations in the defined interval, in nanoseconds (since 8.1)
872870
#
873871
# @max_flush_latency_ns: Maximum latency of flush operations in the
874872
# defined interval, in nanoseconds.
@@ -879,9 +877,8 @@
879877
# @avg_wr_latency_ns: Average latency of write operations in the
880878
# defined interval, in nanoseconds.
881879
#
882-
# @avg_zone_append_latency_ns: Average latency of zone append operations
883-
# in the defined interval, in nanoseconds
884-
# (since 8.1)
880+
# @avg_zone_append_latency_ns: Average latency of zone append
881+
# operations in the defined interval, in nanoseconds (since 8.1)
885882
#
886883
# @avg_flush_latency_ns: Average latency of flush operations in the
887884
# defined interval, in nanoseconds.
@@ -893,8 +890,7 @@
893890
# the defined interval.
894891
#
895892
# @avg_zone_append_queue_depth: Average number of pending zone append
896-
# operations in the defined interval
897-
# (since 8.1).
893+
# operations in the defined interval (since 8.1).
898894
#
899895
# Since: 2.5
900896
##
@@ -919,8 +915,8 @@
919915
#
920916
# @wr_bytes: The number of bytes written by the device.
921917
#
922-
# @zone_append_bytes: The number of bytes appended by the zoned devices
923-
# (since 8.1)
918+
# @zone_append_bytes: The number of bytes appended by the zoned
919+
# devices (since 8.1)
924920
#
925921
# @unmap_bytes: The number of bytes unmapped by the device (Since 4.2)
926922
#
@@ -930,8 +926,8 @@
930926
# @wr_operations: The number of write operations performed by the
931927
# device.
932928
#
933-
# @zone_append_operations: The number of zone append operations performed
934-
# by the zoned devices (since 8.1)
929+
# @zone_append_operations: The number of zone append operations
930+
# performed by the zoned devices (since 8.1)
935931
#
936932
# @flush_operations: The number of cache flush operations performed by
937933
# the device (since 0.15)
@@ -946,7 +942,7 @@
946942
# 0.15).
947943
#
948944
# @zone_append_total_time_ns: Total time spent on zone append writes
949-
# in nanoseconds (since 8.1)
945+
# in nanoseconds (since 8.1)
950946
#
951947
# @flush_total_time_ns: Total time spent on cache flushes in
952948
# nanoseconds (since 0.15).
@@ -965,8 +961,8 @@
965961
# @wr_merged: Number of write requests that have been merged into
966962
# another request (Since 2.3).
967963
#
968-
# @zone_append_merged: Number of zone append requests that have been merged
969-
# into another request (since 8.1)
964+
# @zone_append_merged: Number of zone append requests that have been
965+
# merged into another request (since 8.1)
970966
#
971967
# @unmap_merged: Number of unmap requests that have been merged into
972968
# another request (Since 4.2)
@@ -981,9 +977,8 @@
981977
# @failed_wr_operations: The number of failed write operations
982978
# performed by the device (Since 2.5)
983979
#
984-
# @failed_zone_append_operations: The number of failed zone append write
985-
# operations performed by the zoned devices
986-
# (since 8.1)
980+
# @failed_zone_append_operations: The number of failed zone append
981+
# write operations performed by the zoned devices (since 8.1)
987982
#
988983
# @failed_flush_operations: The number of failed flush operations
989984
# performed by the device (Since 2.5)
@@ -997,8 +992,8 @@
997992
# @invalid_wr_operations: The number of invalid write operations
998993
# performed by the device (Since 2.5)
999994
#
1000-
# @invalid_zone_append_operations: The number of invalid zone append operations
1001-
# performed by the zoned device (since 8.1)
995+
# @invalid_zone_append_operations: The number of invalid zone append
996+
# operations performed by the zoned device (since 8.1)
1002997
#
1003998
# @invalid_flush_operations: The number of invalid flush operations
1004999
# performed by the device (Since 2.5)
@@ -1019,7 +1014,8 @@
10191014
#
10201015
# @wr_latency_histogram: @BlockLatencyHistogramInfo. (Since 4.0)
10211016
#
1022-
# @zone_append_latency_histogram: @BlockLatencyHistogramInfo. (since 8.1)
1017+
# @zone_append_latency_histogram: @BlockLatencyHistogramInfo.
1018+
# (since 8.1)
10231019
#
10241020
# @flush_latency_histogram: @BlockLatencyHistogramInfo. (Since 4.0)
10251021
#
@@ -1126,7 +1122,7 @@
11261122
#
11271123
# @parent: This describes the file block device if it has one.
11281124
# Contains recursively the statistics of the underlying protocol
1129-
# (e.g. the host file for a qcow2 image). If there is no
1125+
# (e.g. the host file for a qcow2 image). If there is no
11301126
# underlying protocol, this field is omitted
11311127
#
11321128
# @backing: This describes the backing block device if it has one.
@@ -1486,7 +1482,7 @@
14861482
# @format: the format of the overlay image, default is 'qcow2'.
14871483
#
14881484
# @mode: whether and how QEMU should create a new image, default is
1489-
# 'absolute-paths'.
1485+
# 'absolute-paths'.
14901486
##
14911487
{ 'struct': 'BlockdevSnapshotSync',
14921488
'data': { '*device': 'str', '*node-name': 'str',
@@ -1550,7 +1546,7 @@
15501546
#
15511547
# @bitmap: The name of a dirty bitmap to use. Must be present if sync
15521548
# is "bitmap" or "incremental". Can be present if sync is "full"
1553-
# or "top". Must not be present otherwise.
1549+
# or "top". Must not be present otherwise.
15541550
# (Since 2.4 (drive-backup), 3.1 (blockdev-backup))
15551551
#
15561552
# @bitmap-mode: Specifies the type of data the bitmap should contain
@@ -3477,16 +3473,16 @@
34773473
# @pass-discard-other: whether discard requests for the data source
34783474
# should be issued on other occasions where a cluster gets freed
34793475
#
3480-
# @discard-no-unref: when enabled, discards from the guest will not cause
3481-
# cluster allocations to be relinquished. This prevents qcow2 fragmentation
3482-
# that would be caused by such discards. Besides potential
3483-
# performance degradation, such fragmentation can lead to increased
3484-
# allocation of clusters past the end of the image file,
3485-
# resulting in image files whose file length can grow much larger
3486-
# than their guest disk size would suggest.
3487-
# If image file length is of concern (e.g. when storing qcow2
3488-
# images directly on block devices), you should consider enabling
3489-
# this option. (since 8.1)
3476+
# @discard-no-unref: when enabled, discards from the guest will not
3477+
# cause cluster allocations to be relinquished. This prevents
3478+
# qcow2 fragmentation that would be caused by such discards.
3479+
# Besides potential performance degradation, such fragmentation
3480+
# can lead to increased allocation of clusters past the end of the
3481+
# image file, resulting in image files whose file length can grow
3482+
# much larger than their guest disk size would suggest. If image
3483+
# file length is of concern (e.g. when storing qcow2 images
3484+
# directly on block devices), you should consider enabling this
3485+
# option. (since 8.1)
34903486
#
34913487
# @overlap-check: which overlap checks to perform for writes to the
34923488
# image, defaults to 'cached' (since 2.2)
@@ -5240,9 +5236,9 @@
52405236
#
52415237
# @subformat: vhdx subformat (default: dynamic)
52425238
#
5243-
# @block-state-zero: Force use of payload blocks of type
5244-
# 'ZERO'. Non-standard, but default. Do not set to 'off' when
5245-
# using 'qemu-img convert' with subformat=dynamic.
5239+
# @block-state-zero: Force use of payload blocks of type 'ZERO'.
5240+
# Non-standard, but default. Do not set to 'off' when using
5241+
# 'qemu-img convert' with subformat=dynamic.
52465242
#
52475243
# Since: 2.12
52485244
##

qapi/block.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,8 +534,8 @@
534534
# @boundaries-write: list of interval boundary values for write
535535
# latency histogram.
536536
#
537-
# @boundaries-zap: list of interval boundary values for zone append write
538-
# latency histogram.
537+
# @boundaries-zap: list of interval boundary values for zone append
538+
# write latency histogram.
539539
#
540540
# @boundaries-flush: list of interval boundary values for flush
541541
# latency histogram.

qapi/cxl.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@
172172
#
173173
# @temperature: Device temperature in degrees Celsius.
174174
#
175-
# @dirty-shutdown-count: Number of times the device has been unable
176-
# to determine whether data loss may have occurred.
175+
# @dirty-shutdown-count: Number of times the device has been unable to
176+
# determine whether data loss may have occurred.
177177
#
178178
# @corrected-volatile-error-count: Total number of correctable errors
179179
# in volatile memory.

qapi/machine-target.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
# @CpuModelCompareResult:
6262
#
6363
# An enumeration of CPU model comparison results. The result is
64-
# usually calculated using e.g. CPU features or CPU generations.
64+
# usually calculated using e.g. CPU features or CPU generations.
6565
#
6666
# @incompatible: If model A is incompatible to model B, model A is not
6767
# guaranteed to run where model B runs and the other way around.

qapi/migration.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,8 @@
465465
# block devices (and thus take locks) immediately at the end of
466466
# migration. (since 3.0)
467467
#
468-
# @x-ignore-shared: If enabled, QEMU will not migrate shared memory that is
469-
# accessible on the destination machine. (since 4.0)
468+
# @x-ignore-shared: If enabled, QEMU will not migrate shared memory
469+
# that is accessible on the destination machine. (since 4.0)
470470
#
471471
# @validate-uuid: Send the UUID of the source to allow the destination
472472
# to ensure it is the same. (since 4.2)
@@ -490,9 +490,9 @@
490490
# @switchover-ack: If enabled, migration will not stop the source VM
491491
# and complete the migration until an ACK is received from the
492492
# destination that it's OK to do so. Exactly when this ACK is
493-
# sent depends on the migrated devices that use this feature.
494-
# For example, a device can use it to make sure some of its data
495-
# is sent and loaded in the destination before doing switchover.
493+
# sent depends on the migrated devices that use this feature. For
494+
# example, a device can use it to make sure some of its data is
495+
# sent and loaded in the destination before doing switchover.
496496
# This can reduce downtime if devices that support this capability
497497
# are present. 'return-path' capability must be enabled to use
498498
# it. (since 8.1)

qapi/net.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,6 @@
663663
# @type: Specify the driver used for interpreting remaining arguments.
664664
#
665665
# Since: 1.2
666-
#
667666
##
668667
{ 'union': 'Netdev',
669668
'base': { 'id': 'str', 'type': 'NetClientDriver' },

qapi/qom.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -647,9 +647,10 @@
647647
# selects a default alignment (currently the page size).
648648
# (default: 0)
649649
#
650-
# @offset: the offset into the target file that the region starts at. You
651-
# can use this option to back multiple regions with a single file. Must
652-
# be a multiple of the page size. (default: 0) (since 8.1)
650+
# @offset: the offset into the target file that the region starts at.
651+
# You can use this option to back multiple regions with a single
652+
# file. Must be a multiple of the page size.
653+
# (default: 0) (since 8.1)
653654
#
654655
# @discard-data: if true, the file contents can be destroyed when QEMU
655656
# exits, to avoid unnecessarily flushing data to the backing file.
@@ -662,7 +663,7 @@
662663
#
663664
# @pmem: specifies whether the backing file specified by @mem-path is
664665
# in host persistent memory that can be accessed using the SNIA
665-
# NVM programming model (e.g. Intel NVDIMM).
666+
# NVM programming model (e.g. Intel NVDIMM).
666667
#
667668
# @readonly: if true, the backing file is opened read-only; if false,
668669
# it is opened read-write. (default: false)

qapi/trace.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
# @vcpu: Whether this is a per-vCPU event (since 2.7).
3939
#
4040
# Features:
41+
#
4142
# @deprecated: Member @vcpu is deprecated, and always ignored.
4243
#
4344
# Since: 2.2
@@ -56,6 +57,7 @@
5657
# @vcpu: The vCPU to query (since 2.7).
5758
#
5859
# Features:
60+
#
5961
# @deprecated: Member @vcpu is deprecated, and always ignored.
6062
#
6163
# Returns: a list of @TraceEventInfo for the matching events

qapi/ui.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1309,7 +1309,7 @@
13091309
# defaults to "off". (Since 3.1)
13101310
#
13111311
# @show-tabs: Display the tab bar for switching between the various
1312-
# graphical interfaces (e.g. VGA and virtual console character
1312+
# graphical interfaces (e.g. VGA and virtual console character
13131313
# devices) by default. (Since 7.1)
13141314
#
13151315
# @show-menubar: Display the main window menubar. Defaults to "on".

0 commit comments

Comments
 (0)