hmp-commands.hx | 14 +++++ qapi/block-core.json | 117 +++++++++++++++++++++++++++-------------- qapi/block-export.json | 21 +++++--- qapi/block.json | 6 ++- 4 files changed, 110 insertions(+), 48 deletions(-)
Most block device commands do not require a fully constructed machine.
Allow running them before machine initialization has concluded.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hmp-commands.hx | 14 +++++
qapi/block-core.json | 117 +++++++++++++++++++++++++++--------------
qapi/block-export.json | 21 +++++---
qapi/block.json | 6 ++-
4 files changed, 110 insertions(+), 48 deletions(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 146a13c896..901a50ebd1 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -78,6 +78,7 @@ ERST
.help = "resize a block image",
.cmd = hmp_block_resize,
.coroutine = true,
+ .flags = "p",
},
SRST
@@ -94,6 +95,7 @@ ERST
.params = "device [speed [base]]",
.help = "copy data from a backing file into a block device",
.cmd = hmp_block_stream,
+ .flags = "p",
},
SRST
@@ -107,6 +109,7 @@ ERST
.params = "device speed",
.help = "set maximum speed for a background block operation",
.cmd = hmp_block_job_set_speed,
+ .flags = "p",
},
SRST
@@ -122,6 +125,7 @@ ERST
"\n\t\t\t if you want to abort the operation immediately"
"\n\t\t\t instead of keep running until data is in sync)",
.cmd = hmp_block_job_cancel,
+ .flags = "p",
},
SRST
@@ -135,6 +139,7 @@ ERST
.params = "device",
.help = "stop an active background block operation",
.cmd = hmp_block_job_complete,
+ .flags = "p",
},
SRST
@@ -149,6 +154,7 @@ ERST
.params = "device",
.help = "pause an active background block operation",
.cmd = hmp_block_job_pause,
+ .flags = "p",
},
SRST
@@ -162,6 +168,7 @@ ERST
.params = "device",
.help = "resume a paused background block operation",
.cmd = hmp_block_job_resume,
+ .flags = "p",
},
SRST
@@ -1396,6 +1403,7 @@ ERST
.params = "nbd_server_start [-a] [-w] host:port",
.help = "serve block devices on the given host and port",
.cmd = hmp_nbd_server_start,
+ .flags = "p",
},
SRST
``nbd_server_start`` *host*:*port*
@@ -1411,6 +1419,7 @@ ERST
.params = "nbd_server_add [-w] device [name]",
.help = "export a block device via NBD",
.cmd = hmp_nbd_server_add,
+ .flags = "p",
},
SRST
``nbd_server_add`` *device* [ *name* ]
@@ -1426,6 +1435,7 @@ ERST
.params = "nbd_server_remove [-f] name",
.help = "remove an export previously exposed via NBD",
.cmd = hmp_nbd_server_remove,
+ .flags = "p",
},
SRST
``nbd_server_remove [-f]`` *name*
@@ -1442,6 +1452,7 @@ ERST
.params = "nbd_server_stop",
.help = "stop serving block devices using the NBD protocol",
.cmd = hmp_nbd_server_stop,
+ .flags = "p",
},
SRST
``nbd_server_stop``
@@ -1471,6 +1482,7 @@ ERST
.params = "getfd name",
.help = "receive a file descriptor via SCM rights and assign it a name",
.cmd = hmp_getfd,
+ .flags = "p",
},
SRST
@@ -1486,6 +1498,7 @@ ERST
.params = "closefd name",
.help = "close a file descriptor previously passed via SCM rights",
.cmd = hmp_closefd,
+ .flags = "p",
},
SRST
@@ -1501,6 +1514,7 @@ ERST
.params = "device bps bps_rd bps_wr iops iops_rd iops_wr",
.help = "change I/O throttle limits for a block drive",
.cmd = hmp_block_set_io_throttle,
+ .flags = "p",
},
SRST
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 6d227924d0..8bbc06ac86 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -680,7 +680,8 @@
# }
#
##
-{ 'command': 'query-block', 'returns': ['BlockInfo'] }
+{ 'command': 'query-block', 'returns': ['BlockInfo'],
+ 'allow-preconfig': true }
##
@@ -1056,7 +1057,8 @@
##
{ 'command': 'query-blockstats',
'data': { '*query-nodes': 'bool' },
- 'returns': ['BlockStats'] }
+ 'returns': ['BlockStats'],
+ 'allow-preconfig': true }
##
# @BlockdevOnError:
@@ -1205,7 +1207,8 @@
#
# Since: 1.1
##
-{ 'command': 'query-block-jobs', 'returns': ['BlockJobInfo'] }
+{ 'command': 'query-block-jobs', 'returns': ['BlockJobInfo'],
+ 'allow-preconfig': true }
##
# @block_resize:
@@ -1236,7 +1239,8 @@
'data': { '*device': 'str',
'*node-name': 'str',
'size': 'int' },
- 'coroutine': true }
+ 'coroutine': true,
+ 'allow-preconfig': true }
##
# @NewImageMode:
@@ -1447,7 +1451,8 @@
#
##
{ 'command': 'blockdev-snapshot-sync',
- 'data': 'BlockdevSnapshotSync' }
+ 'data': 'BlockdevSnapshotSync',
+ 'allow-preconfig': true }
##
@@ -1489,7 +1494,8 @@
##
{ 'command': 'blockdev-snapshot',
'data': 'BlockdevSnapshot',
- 'features': [ 'allow-write-only-overlay' ] }
+ 'features': [ 'allow-write-only-overlay' ],
+ 'allow-preconfig': true }
##
# @change-backing-file:
@@ -1521,7 +1527,8 @@
##
{ 'command': 'change-backing-file',
'data': { 'device': 'str', 'image-node-name': 'str',
- 'backing-file': 'str' } }
+ 'backing-file': 'str' },
+ 'allow-preconfig': true }
##
# @block-commit:
@@ -1631,7 +1638,8 @@
'*backing-file': 'str', '*speed': 'int',
'*on-error': 'BlockdevOnError',
'*filter-node-name': 'str',
- '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
+ '*auto-finalize': 'bool', '*auto-dismiss': 'bool' },
+ 'allow-preconfig': true }
##
# @drive-backup:
@@ -1657,7 +1665,8 @@
#
##
{ 'command': 'drive-backup', 'boxed': true,
- 'data': 'DriveBackup' }
+ 'data': 'DriveBackup',
+ 'allow-preconfig': true }
##
# @blockdev-backup:
@@ -1682,7 +1691,8 @@
#
##
{ 'command': 'blockdev-backup', 'boxed': true,
- 'data': 'BlockdevBackup' }
+ 'data': 'BlockdevBackup',
+ 'allow-preconfig': true }
##
@@ -1748,7 +1758,8 @@
##
{ 'command': 'query-named-block-nodes',
'returns': [ 'BlockDeviceInfo' ],
- 'data': { '*flat': 'bool' } }
+ 'data': { '*flat': 'bool' },
+ 'allow-preconfig': true }
##
# @XDbgBlockGraphNodeType:
@@ -1856,7 +1867,8 @@
#
# Since: 4.0
##
-{ 'command': 'x-debug-query-block-graph', 'returns': 'XDbgBlockGraph' }
+{ 'command': 'x-debug-query-block-graph', 'returns': 'XDbgBlockGraph',
+ 'allow-preconfig': true }
##
# @drive-mirror:
@@ -1884,7 +1896,8 @@
#
##
{ 'command': 'drive-mirror', 'boxed': true,
- 'data': 'DriveMirror' }
+ 'data': 'DriveMirror',
+ 'allow-preconfig': true }
##
# @DriveMirror:
@@ -2055,7 +2068,8 @@
#
##
{ 'command': 'block-dirty-bitmap-add',
- 'data': 'BlockDirtyBitmapAdd' }
+ 'data': 'BlockDirtyBitmapAdd',
+ 'allow-preconfig': true }
##
# @block-dirty-bitmap-remove:
@@ -2079,7 +2093,8 @@
#
##
{ 'command': 'block-dirty-bitmap-remove',
- 'data': 'BlockDirtyBitmap' }
+ 'data': 'BlockDirtyBitmap',
+ 'allow-preconfig': true }
##
# @block-dirty-bitmap-clear:
@@ -2102,7 +2117,8 @@
#
##
{ 'command': 'block-dirty-bitmap-clear',
- 'data': 'BlockDirtyBitmap' }
+ 'data': 'BlockDirtyBitmap',
+ 'allow-preconfig': true }
##
# @block-dirty-bitmap-enable:
@@ -2123,7 +2139,8 @@
#
##
{ 'command': 'block-dirty-bitmap-enable',
- 'data': 'BlockDirtyBitmap' }
+ 'data': 'BlockDirtyBitmap',
+ 'allow-preconfig': true }
##
# @block-dirty-bitmap-disable:
@@ -2144,7 +2161,8 @@
#
##
{ 'command': 'block-dirty-bitmap-disable',
- 'data': 'BlockDirtyBitmap' }
+ 'data': 'BlockDirtyBitmap',
+ 'allow-preconfig': true }
##
# @block-dirty-bitmap-merge:
@@ -2176,7 +2194,8 @@
#
##
{ 'command': 'block-dirty-bitmap-merge',
- 'data': 'BlockDirtyBitmapMerge' }
+ 'data': 'BlockDirtyBitmapMerge',
+ 'allow-preconfig': true }
##
# @BlockDirtyBitmapSha256:
@@ -2203,7 +2222,8 @@
# Since: 2.10
##
{ 'command': 'x-debug-block-dirty-bitmap-sha256',
- 'data': 'BlockDirtyBitmap', 'returns': 'BlockDirtyBitmapSha256' }
+ 'data': 'BlockDirtyBitmap', 'returns': 'BlockDirtyBitmapSha256',
+ 'allow-preconfig': true }
##
# @blockdev-mirror:
@@ -2288,7 +2308,8 @@
'*on-target-error': 'BlockdevOnError',
'*filter-node-name': 'str',
'*copy-mode': 'MirrorCopyMode',
- '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
+ '*auto-finalize': 'bool', '*auto-dismiss': 'bool' },
+ 'allow-preconfig': true }
##
# @BlockIOThrottle:
@@ -2560,7 +2581,8 @@
'*base-node': 'str', '*backing-file': 'str', '*bottom': 'str',
'*speed': 'int', '*on-error': 'BlockdevOnError',
'*filter-node-name': 'str',
- '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
+ '*auto-finalize': 'bool', '*auto-dismiss': 'bool' },
+ 'allow-preconfig': true }
##
# @block-job-set-speed:
@@ -2584,7 +2606,8 @@
# Since: 1.1
##
{ 'command': 'block-job-set-speed',
- 'data': { 'device': 'str', 'speed': 'int' } }
+ 'data': { 'device': 'str', 'speed': 'int' },
+ 'allow-preconfig': true }
##
# @block-job-cancel:
@@ -2623,7 +2646,8 @@
#
# Since: 1.1
##
-{ 'command': 'block-job-cancel', 'data': { 'device': 'str', '*force': 'bool' } }
+{ 'command': 'block-job-cancel', 'data': { 'device': 'str', '*force': 'bool' },
+ 'allow-preconfig': true }
##
# @block-job-pause:
@@ -2647,7 +2671,8 @@
#
# Since: 1.3
##
-{ 'command': 'block-job-pause', 'data': { 'device': 'str' } }
+{ 'command': 'block-job-pause', 'data': { 'device': 'str' },
+ 'allow-preconfig': true }
##
# @block-job-resume:
@@ -2669,7 +2694,8 @@
#
# Since: 1.3
##
-{ 'command': 'block-job-resume', 'data': { 'device': 'str' } }
+{ 'command': 'block-job-resume', 'data': { 'device': 'str' },
+ 'allow-preconfig': true }
##
# @block-job-complete:
@@ -2697,7 +2723,8 @@
#
# Since: 1.3
##
-{ 'command': 'block-job-complete', 'data': { 'device': 'str' } }
+{ 'command': 'block-job-complete', 'data': { 'device': 'str' },
+ 'allow-preconfig': true }
##
# @block-job-dismiss:
@@ -2717,7 +2744,8 @@
#
# Since: 2.12
##
-{ 'command': 'block-job-dismiss', 'data': { 'id': 'str' } }
+{ 'command': 'block-job-dismiss', 'data': { 'id': 'str' },
+ 'allow-preconfig': true }
##
# @block-job-finalize:
@@ -2735,7 +2763,8 @@
#
# Since: 2.12
##
-{ 'command': 'block-job-finalize', 'data': { 'id': 'str' } }
+{ 'command': 'block-job-finalize', 'data': { 'id': 'str' },
+ 'allow-preconfig': true }
##
# @BlockdevDiscardOptions:
@@ -4127,7 +4156,8 @@
# <- { "return": {} }
#
##
-{ 'command': 'blockdev-add', 'data': 'BlockdevOptions', 'boxed': true }
+{ 'command': 'blockdev-add', 'data': 'BlockdevOptions', 'boxed': true,
+ 'allow-preconfig': true }
##
# @x-blockdev-reopen:
@@ -4169,7 +4199,8 @@
# Since: 4.0
##
{ 'command': 'x-blockdev-reopen',
- 'data': 'BlockdevOptions', 'boxed': true }
+ 'data': 'BlockdevOptions', 'boxed': true,
+ 'allow-preconfig': true }
##
# @blockdev-del:
@@ -4202,7 +4233,8 @@
# <- { "return": {} }
#
##
-{ 'command': 'blockdev-del', 'data': { 'node-name': 'str' } }
+{ 'command': 'blockdev-del', 'data': { 'node-name': 'str' },
+ 'allow-preconfig': true }
##
# @BlockdevCreateOptionsFile:
@@ -4709,7 +4741,8 @@
##
{ 'command': 'blockdev-create',
'data': { 'job-id': 'str',
- 'options': 'BlockdevCreateOptions' } }
+ 'options': 'BlockdevCreateOptions' },
+ 'allow-preconfig': true }
##
# @BlockdevAmendOptionsLUKS:
@@ -4777,7 +4810,8 @@
'data': { 'job-id': 'str',
'node-name': 'str',
'options': 'BlockdevAmendOptions',
- '*force': 'bool' } }
+ '*force': 'bool' },
+ 'allow-preconfig': true }
##
# @BlockErrorAction:
@@ -5128,7 +5162,8 @@
#
##
{ 'command': 'block-set-write-threshold',
- 'data': { 'node-name': 'str', 'write-threshold': 'uint64' } }
+ 'data': { 'node-name': 'str', 'write-threshold': 'uint64' },
+ 'allow-preconfig': true }
##
# @x-blockdev-change:
@@ -5186,7 +5221,8 @@
{ 'command': 'x-blockdev-change',
'data' : { 'parent': 'str',
'*child': 'str',
- '*node': 'str' } }
+ '*node': 'str' },
+ 'allow-preconfig': true }
##
# @x-blockdev-set-iothread:
@@ -5226,7 +5262,8 @@
{ 'command': 'x-blockdev-set-iothread',
'data' : { 'node-name': 'str',
'iothread': 'StrOrNull',
- '*force': 'bool' } }
+ '*force': 'bool' },
+ 'allow-preconfig': true }
##
# @QuorumOpType:
@@ -5358,7 +5395,8 @@
#
##
{ 'command': 'blockdev-snapshot-internal-sync',
- 'data': 'BlockdevSnapshotInternal' }
+ 'data': 'BlockdevSnapshotInternal',
+ 'allow-preconfig': true }
##
# @blockdev-snapshot-delete-internal-sync:
@@ -5405,4 +5443,5 @@
##
{ 'command': 'blockdev-snapshot-delete-internal-sync',
'data': { 'device': 'str', '*id': 'str', '*name': 'str'},
- 'returns': 'SnapshotInfo' }
+ 'returns': 'SnapshotInfo',
+ 'allow-preconfig': true }
diff --git a/qapi/block-export.json b/qapi/block-export.json
index e819e70cac..c03bc9da2f 100644
--- a/qapi/block-export.json
+++ b/qapi/block-export.json
@@ -60,7 +60,8 @@
'data': { 'addr': 'SocketAddressLegacy',
'*tls-creds': 'str',
'*tls-authz': 'str',
- '*max-connections': 'uint32' } }
+ '*max-connections': 'uint32' },
+ 'allow-preconfig': true }
##
# @BlockExportOptionsNbdBase:
@@ -177,7 +178,8 @@
# Since: 1.3
##
{ 'command': 'nbd-server-add',
- 'data': 'NbdServerAddOptions', 'boxed': true, 'features': ['deprecated'] }
+ 'data': 'NbdServerAddOptions', 'boxed': true, 'features': ['deprecated'],
+ 'allow-preconfig': true }
##
# @BlockExportRemoveMode:
@@ -222,7 +224,8 @@
##
{ 'command': 'nbd-server-remove',
'data': {'name': 'str', '*mode': 'BlockExportRemoveMode'},
- 'features': ['deprecated'] }
+ 'features': ['deprecated'],
+ 'allow-preconfig': true }
##
# @nbd-server-stop:
@@ -232,7 +235,8 @@
#
# Since: 1.3
##
-{ 'command': 'nbd-server-stop' }
+{ 'command': 'nbd-server-stop',
+ 'allow-preconfig': true }
##
# @BlockExportType:
@@ -301,7 +305,8 @@
# Since: 5.2
##
{ 'command': 'block-export-add',
- 'data': 'BlockExportOptions', 'boxed': true }
+ 'data': 'BlockExportOptions', 'boxed': true,
+ 'allow-preconfig': true }
##
# @block-export-del:
@@ -321,7 +326,8 @@
# Since: 5.2
##
{ 'command': 'block-export-del',
- 'data': { 'id': 'str', '*mode': 'BlockExportRemoveMode' } }
+ 'data': { 'id': 'str', '*mode': 'BlockExportRemoveMode' },
+ 'allow-preconfig': true }
##
# @BLOCK_EXPORT_DELETED:
@@ -365,4 +371,5 @@
#
# Since: 5.2
##
-{ 'command': 'query-block-exports', 'returns': ['BlockExportInfo'] }
+{ 'command': 'query-block-exports', 'returns': ['BlockExportInfo'],
+ 'allow-preconfig': true }
diff --git a/qapi/block.json b/qapi/block.json
index 82fcf2c914..cc500df865 100644
--- a/qapi/block.json
+++ b/qapi/block.json
@@ -493,7 +493,8 @@
# <- { "return": {} }
##
{ 'command': 'block_set_io_throttle', 'boxed': true,
- 'data': 'BlockIOThrottle' }
+ 'data': 'BlockIOThrottle',
+ 'allow-preconfig': true }
##
# @block-latency-histogram-set:
@@ -569,4 +570,5 @@
'*boundaries': ['uint64'],
'*boundaries-read': ['uint64'],
'*boundaries-write': ['uint64'],
- '*boundaries-flush': ['uint64'] } }
+ '*boundaries-flush': ['uint64'] },
+ 'allow-preconfig': true }
--
2.26.2
On 11/05/21 17:39, Paolo Bonzini wrote:
> Most block device commands do not require a fully constructed machine.
> Allow running them before machine initialization has concluded.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> hmp-commands.hx | 14 +++++
> qapi/block-core.json | 117 +++++++++++++++++++++++++++--------------
> qapi/block-export.json | 21 +++++---
> qapi/block.json | 6 ++-
> 4 files changed, 110 insertions(+), 48 deletions(-)
>
> diff --git a/hmp-commands.hx b/hmp-commands.hx
> index 146a13c896..901a50ebd1 100644
> --- a/hmp-commands.hx
> +++ b/hmp-commands.hx
> @@ -78,6 +78,7 @@ ERST
> .help = "resize a block image",
> .cmd = hmp_block_resize,
> .coroutine = true,
> + .flags = "p",
> },
>
> SRST
> @@ -94,6 +95,7 @@ ERST
> .params = "device [speed [base]]",
> .help = "copy data from a backing file into a block device",
> .cmd = hmp_block_stream,
> + .flags = "p",
> },
>
> SRST
> @@ -107,6 +109,7 @@ ERST
> .params = "device speed",
> .help = "set maximum speed for a background block operation",
> .cmd = hmp_block_job_set_speed,
> + .flags = "p",
> },
>
> SRST
> @@ -122,6 +125,7 @@ ERST
> "\n\t\t\t if you want to abort the operation immediately"
> "\n\t\t\t instead of keep running until data is in sync)",
> .cmd = hmp_block_job_cancel,
> + .flags = "p",
> },
>
> SRST
> @@ -135,6 +139,7 @@ ERST
> .params = "device",
> .help = "stop an active background block operation",
> .cmd = hmp_block_job_complete,
> + .flags = "p",
> },
>
> SRST
> @@ -149,6 +154,7 @@ ERST
> .params = "device",
> .help = "pause an active background block operation",
> .cmd = hmp_block_job_pause,
> + .flags = "p",
> },
>
> SRST
> @@ -162,6 +168,7 @@ ERST
> .params = "device",
> .help = "resume a paused background block operation",
> .cmd = hmp_block_job_resume,
> + .flags = "p",
> },
>
> SRST
> @@ -1396,6 +1403,7 @@ ERST
> .params = "nbd_server_start [-a] [-w] host:port",
> .help = "serve block devices on the given host and port",
> .cmd = hmp_nbd_server_start,
> + .flags = "p",
> },
> SRST
> ``nbd_server_start`` *host*:*port*
> @@ -1411,6 +1419,7 @@ ERST
> .params = "nbd_server_add [-w] device [name]",
> .help = "export a block device via NBD",
> .cmd = hmp_nbd_server_add,
> + .flags = "p",
> },
> SRST
> ``nbd_server_add`` *device* [ *name* ]
> @@ -1426,6 +1435,7 @@ ERST
> .params = "nbd_server_remove [-f] name",
> .help = "remove an export previously exposed via NBD",
> .cmd = hmp_nbd_server_remove,
> + .flags = "p",
> },
> SRST
> ``nbd_server_remove [-f]`` *name*
> @@ -1442,6 +1452,7 @@ ERST
> .params = "nbd_server_stop",
> .help = "stop serving block devices using the NBD protocol",
> .cmd = hmp_nbd_server_stop,
> + .flags = "p",
> },
> SRST
> ``nbd_server_stop``
> @@ -1471,6 +1482,7 @@ ERST
> .params = "getfd name",
> .help = "receive a file descriptor via SCM rights and assign it a name",
> .cmd = hmp_getfd,
> + .flags = "p",
> },
>
> SRST
> @@ -1486,6 +1498,7 @@ ERST
> .params = "closefd name",
> .help = "close a file descriptor previously passed via SCM rights",
> .cmd = hmp_closefd,
> + .flags = "p",
> },
>
> SRST
> @@ -1501,6 +1514,7 @@ ERST
> .params = "device bps bps_rd bps_wr iops iops_rd iops_wr",
> .help = "change I/O throttle limits for a block drive",
> .cmd = hmp_block_set_io_throttle,
> + .flags = "p",
> },
>
> SRST
> diff --git a/qapi/block-core.json b/qapi/block-core.json
> index 6d227924d0..8bbc06ac86 100644
> --- a/qapi/block-core.json
> +++ b/qapi/block-core.json
> @@ -680,7 +680,8 @@
> # }
> #
> ##
> -{ 'command': 'query-block', 'returns': ['BlockInfo'] }
> +{ 'command': 'query-block', 'returns': ['BlockInfo'],
> + 'allow-preconfig': true }
>
>
> ##
> @@ -1056,7 +1057,8 @@
> ##
> { 'command': 'query-blockstats',
> 'data': { '*query-nodes': 'bool' },
> - 'returns': ['BlockStats'] }
> + 'returns': ['BlockStats'],
> + 'allow-preconfig': true }
>
> ##
> # @BlockdevOnError:
> @@ -1205,7 +1207,8 @@
> #
> # Since: 1.1
> ##
> -{ 'command': 'query-block-jobs', 'returns': ['BlockJobInfo'] }
> +{ 'command': 'query-block-jobs', 'returns': ['BlockJobInfo'],
> + 'allow-preconfig': true }
>
> ##
> # @block_resize:
> @@ -1236,7 +1239,8 @@
> 'data': { '*device': 'str',
> '*node-name': 'str',
> 'size': 'int' },
> - 'coroutine': true }
> + 'coroutine': true,
> + 'allow-preconfig': true }
>
> ##
> # @NewImageMode:
> @@ -1447,7 +1451,8 @@
> #
> ##
> { 'command': 'blockdev-snapshot-sync',
> - 'data': 'BlockdevSnapshotSync' }
> + 'data': 'BlockdevSnapshotSync',
> + 'allow-preconfig': true }
>
>
> ##
> @@ -1489,7 +1494,8 @@
> ##
> { 'command': 'blockdev-snapshot',
> 'data': 'BlockdevSnapshot',
> - 'features': [ 'allow-write-only-overlay' ] }
> + 'features': [ 'allow-write-only-overlay' ],
> + 'allow-preconfig': true }
>
> ##
> # @change-backing-file:
> @@ -1521,7 +1527,8 @@
> ##
> { 'command': 'change-backing-file',
> 'data': { 'device': 'str', 'image-node-name': 'str',
> - 'backing-file': 'str' } }
> + 'backing-file': 'str' },
> + 'allow-preconfig': true }
>
> ##
> # @block-commit:
> @@ -1631,7 +1638,8 @@
> '*backing-file': 'str', '*speed': 'int',
> '*on-error': 'BlockdevOnError',
> '*filter-node-name': 'str',
> - '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
> + '*auto-finalize': 'bool', '*auto-dismiss': 'bool' },
> + 'allow-preconfig': true }
>
> ##
> # @drive-backup:
> @@ -1657,7 +1665,8 @@
> #
> ##
> { 'command': 'drive-backup', 'boxed': true,
> - 'data': 'DriveBackup' }
> + 'data': 'DriveBackup',
> + 'allow-preconfig': true }
>
> ##
> # @blockdev-backup:
> @@ -1682,7 +1691,8 @@
> #
> ##
> { 'command': 'blockdev-backup', 'boxed': true,
> - 'data': 'BlockdevBackup' }
> + 'data': 'BlockdevBackup',
> + 'allow-preconfig': true }
>
>
> ##
> @@ -1748,7 +1758,8 @@
> ##
> { 'command': 'query-named-block-nodes',
> 'returns': [ 'BlockDeviceInfo' ],
> - 'data': { '*flat': 'bool' } }
> + 'data': { '*flat': 'bool' },
> + 'allow-preconfig': true }
>
> ##
> # @XDbgBlockGraphNodeType:
> @@ -1856,7 +1867,8 @@
> #
> # Since: 4.0
> ##
> -{ 'command': 'x-debug-query-block-graph', 'returns': 'XDbgBlockGraph' }
> +{ 'command': 'x-debug-query-block-graph', 'returns': 'XDbgBlockGraph',
> + 'allow-preconfig': true }
>
> ##
> # @drive-mirror:
> @@ -1884,7 +1896,8 @@
> #
> ##
> { 'command': 'drive-mirror', 'boxed': true,
> - 'data': 'DriveMirror' }
> + 'data': 'DriveMirror',
> + 'allow-preconfig': true }
>
> ##
> # @DriveMirror:
> @@ -2055,7 +2068,8 @@
> #
> ##
> { 'command': 'block-dirty-bitmap-add',
> - 'data': 'BlockDirtyBitmapAdd' }
> + 'data': 'BlockDirtyBitmapAdd',
> + 'allow-preconfig': true }
>
> ##
> # @block-dirty-bitmap-remove:
> @@ -2079,7 +2093,8 @@
> #
> ##
> { 'command': 'block-dirty-bitmap-remove',
> - 'data': 'BlockDirtyBitmap' }
> + 'data': 'BlockDirtyBitmap',
> + 'allow-preconfig': true }
>
> ##
> # @block-dirty-bitmap-clear:
> @@ -2102,7 +2117,8 @@
> #
> ##
> { 'command': 'block-dirty-bitmap-clear',
> - 'data': 'BlockDirtyBitmap' }
> + 'data': 'BlockDirtyBitmap',
> + 'allow-preconfig': true }
>
> ##
> # @block-dirty-bitmap-enable:
> @@ -2123,7 +2139,8 @@
> #
> ##
> { 'command': 'block-dirty-bitmap-enable',
> - 'data': 'BlockDirtyBitmap' }
> + 'data': 'BlockDirtyBitmap',
> + 'allow-preconfig': true }
>
> ##
> # @block-dirty-bitmap-disable:
> @@ -2144,7 +2161,8 @@
> #
> ##
> { 'command': 'block-dirty-bitmap-disable',
> - 'data': 'BlockDirtyBitmap' }
> + 'data': 'BlockDirtyBitmap',
> + 'allow-preconfig': true }
>
> ##
> # @block-dirty-bitmap-merge:
> @@ -2176,7 +2194,8 @@
> #
> ##
> { 'command': 'block-dirty-bitmap-merge',
> - 'data': 'BlockDirtyBitmapMerge' }
> + 'data': 'BlockDirtyBitmapMerge',
> + 'allow-preconfig': true }
>
> ##
> # @BlockDirtyBitmapSha256:
> @@ -2203,7 +2222,8 @@
> # Since: 2.10
> ##
> { 'command': 'x-debug-block-dirty-bitmap-sha256',
> - 'data': 'BlockDirtyBitmap', 'returns': 'BlockDirtyBitmapSha256' }
> + 'data': 'BlockDirtyBitmap', 'returns': 'BlockDirtyBitmapSha256',
> + 'allow-preconfig': true }
>
> ##
> # @blockdev-mirror:
> @@ -2288,7 +2308,8 @@
> '*on-target-error': 'BlockdevOnError',
> '*filter-node-name': 'str',
> '*copy-mode': 'MirrorCopyMode',
> - '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
> + '*auto-finalize': 'bool', '*auto-dismiss': 'bool' },
> + 'allow-preconfig': true }
>
> ##
> # @BlockIOThrottle:
> @@ -2560,7 +2581,8 @@
> '*base-node': 'str', '*backing-file': 'str', '*bottom': 'str',
> '*speed': 'int', '*on-error': 'BlockdevOnError',
> '*filter-node-name': 'str',
> - '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
> + '*auto-finalize': 'bool', '*auto-dismiss': 'bool' },
> + 'allow-preconfig': true }
>
> ##
> # @block-job-set-speed:
> @@ -2584,7 +2606,8 @@
> # Since: 1.1
> ##
> { 'command': 'block-job-set-speed',
> - 'data': { 'device': 'str', 'speed': 'int' } }
> + 'data': { 'device': 'str', 'speed': 'int' },
> + 'allow-preconfig': true }
>
> ##
> # @block-job-cancel:
> @@ -2623,7 +2646,8 @@
> #
> # Since: 1.1
> ##
> -{ 'command': 'block-job-cancel', 'data': { 'device': 'str', '*force': 'bool' } }
> +{ 'command': 'block-job-cancel', 'data': { 'device': 'str', '*force': 'bool' },
> + 'allow-preconfig': true }
>
> ##
> # @block-job-pause:
> @@ -2647,7 +2671,8 @@
> #
> # Since: 1.3
> ##
> -{ 'command': 'block-job-pause', 'data': { 'device': 'str' } }
> +{ 'command': 'block-job-pause', 'data': { 'device': 'str' },
> + 'allow-preconfig': true }
>
> ##
> # @block-job-resume:
> @@ -2669,7 +2694,8 @@
> #
> # Since: 1.3
> ##
> -{ 'command': 'block-job-resume', 'data': { 'device': 'str' } }
> +{ 'command': 'block-job-resume', 'data': { 'device': 'str' },
> + 'allow-preconfig': true }
>
> ##
> # @block-job-complete:
> @@ -2697,7 +2723,8 @@
> #
> # Since: 1.3
> ##
> -{ 'command': 'block-job-complete', 'data': { 'device': 'str' } }
> +{ 'command': 'block-job-complete', 'data': { 'device': 'str' },
> + 'allow-preconfig': true }
>
> ##
> # @block-job-dismiss:
> @@ -2717,7 +2744,8 @@
> #
> # Since: 2.12
> ##
> -{ 'command': 'block-job-dismiss', 'data': { 'id': 'str' } }
> +{ 'command': 'block-job-dismiss', 'data': { 'id': 'str' },
> + 'allow-preconfig': true }
>
> ##
> # @block-job-finalize:
> @@ -2735,7 +2763,8 @@
> #
> # Since: 2.12
> ##
> -{ 'command': 'block-job-finalize', 'data': { 'id': 'str' } }
> +{ 'command': 'block-job-finalize', 'data': { 'id': 'str' },
> + 'allow-preconfig': true }
>
> ##
> # @BlockdevDiscardOptions:
> @@ -4127,7 +4156,8 @@
> # <- { "return": {} }
> #
> ##
> -{ 'command': 'blockdev-add', 'data': 'BlockdevOptions', 'boxed': true }
> +{ 'command': 'blockdev-add', 'data': 'BlockdevOptions', 'boxed': true,
> + 'allow-preconfig': true }
>
> ##
> # @x-blockdev-reopen:
> @@ -4169,7 +4199,8 @@
> # Since: 4.0
> ##
> { 'command': 'x-blockdev-reopen',
> - 'data': 'BlockdevOptions', 'boxed': true }
> + 'data': 'BlockdevOptions', 'boxed': true,
> + 'allow-preconfig': true }
>
> ##
> # @blockdev-del:
> @@ -4202,7 +4233,8 @@
> # <- { "return": {} }
> #
> ##
> -{ 'command': 'blockdev-del', 'data': { 'node-name': 'str' } }
> +{ 'command': 'blockdev-del', 'data': { 'node-name': 'str' },
> + 'allow-preconfig': true }
>
> ##
> # @BlockdevCreateOptionsFile:
> @@ -4709,7 +4741,8 @@
> ##
> { 'command': 'blockdev-create',
> 'data': { 'job-id': 'str',
> - 'options': 'BlockdevCreateOptions' } }
> + 'options': 'BlockdevCreateOptions' },
> + 'allow-preconfig': true }
>
> ##
> # @BlockdevAmendOptionsLUKS:
> @@ -4777,7 +4810,8 @@
> 'data': { 'job-id': 'str',
> 'node-name': 'str',
> 'options': 'BlockdevAmendOptions',
> - '*force': 'bool' } }
> + '*force': 'bool' },
> + 'allow-preconfig': true }
>
> ##
> # @BlockErrorAction:
> @@ -5128,7 +5162,8 @@
> #
> ##
> { 'command': 'block-set-write-threshold',
> - 'data': { 'node-name': 'str', 'write-threshold': 'uint64' } }
> + 'data': { 'node-name': 'str', 'write-threshold': 'uint64' },
> + 'allow-preconfig': true }
>
> ##
> # @x-blockdev-change:
> @@ -5186,7 +5221,8 @@
> { 'command': 'x-blockdev-change',
> 'data' : { 'parent': 'str',
> '*child': 'str',
> - '*node': 'str' } }
> + '*node': 'str' },
> + 'allow-preconfig': true }
>
> ##
> # @x-blockdev-set-iothread:
> @@ -5226,7 +5262,8 @@
> { 'command': 'x-blockdev-set-iothread',
> 'data' : { 'node-name': 'str',
> 'iothread': 'StrOrNull',
> - '*force': 'bool' } }
> + '*force': 'bool' },
> + 'allow-preconfig': true }
>
> ##
> # @QuorumOpType:
> @@ -5358,7 +5395,8 @@
> #
> ##
> { 'command': 'blockdev-snapshot-internal-sync',
> - 'data': 'BlockdevSnapshotInternal' }
> + 'data': 'BlockdevSnapshotInternal',
> + 'allow-preconfig': true }
>
> ##
> # @blockdev-snapshot-delete-internal-sync:
> @@ -5405,4 +5443,5 @@
> ##
> { 'command': 'blockdev-snapshot-delete-internal-sync',
> 'data': { 'device': 'str', '*id': 'str', '*name': 'str'},
> - 'returns': 'SnapshotInfo' }
> + 'returns': 'SnapshotInfo',
> + 'allow-preconfig': true }
> diff --git a/qapi/block-export.json b/qapi/block-export.json
> index e819e70cac..c03bc9da2f 100644
> --- a/qapi/block-export.json
> +++ b/qapi/block-export.json
> @@ -60,7 +60,8 @@
> 'data': { 'addr': 'SocketAddressLegacy',
> '*tls-creds': 'str',
> '*tls-authz': 'str',
> - '*max-connections': 'uint32' } }
> + '*max-connections': 'uint32' },
> + 'allow-preconfig': true }
>
> ##
> # @BlockExportOptionsNbdBase:
> @@ -177,7 +178,8 @@
> # Since: 1.3
> ##
> { 'command': 'nbd-server-add',
> - 'data': 'NbdServerAddOptions', 'boxed': true, 'features': ['deprecated'] }
> + 'data': 'NbdServerAddOptions', 'boxed': true, 'features': ['deprecated'],
> + 'allow-preconfig': true }
>
> ##
> # @BlockExportRemoveMode:
> @@ -222,7 +224,8 @@
> ##
> { 'command': 'nbd-server-remove',
> 'data': {'name': 'str', '*mode': 'BlockExportRemoveMode'},
> - 'features': ['deprecated'] }
> + 'features': ['deprecated'],
> + 'allow-preconfig': true }
>
> ##
> # @nbd-server-stop:
> @@ -232,7 +235,8 @@
> #
> # Since: 1.3
> ##
> -{ 'command': 'nbd-server-stop' }
> +{ 'command': 'nbd-server-stop',
> + 'allow-preconfig': true }
>
> ##
> # @BlockExportType:
> @@ -301,7 +305,8 @@
> # Since: 5.2
> ##
> { 'command': 'block-export-add',
> - 'data': 'BlockExportOptions', 'boxed': true }
> + 'data': 'BlockExportOptions', 'boxed': true,
> + 'allow-preconfig': true }
>
> ##
> # @block-export-del:
> @@ -321,7 +326,8 @@
> # Since: 5.2
> ##
> { 'command': 'block-export-del',
> - 'data': { 'id': 'str', '*mode': 'BlockExportRemoveMode' } }
> + 'data': { 'id': 'str', '*mode': 'BlockExportRemoveMode' },
> + 'allow-preconfig': true }
>
> ##
> # @BLOCK_EXPORT_DELETED:
> @@ -365,4 +371,5 @@
> #
> # Since: 5.2
> ##
> -{ 'command': 'query-block-exports', 'returns': ['BlockExportInfo'] }
> +{ 'command': 'query-block-exports', 'returns': ['BlockExportInfo'],
> + 'allow-preconfig': true }
> diff --git a/qapi/block.json b/qapi/block.json
> index 82fcf2c914..cc500df865 100644
> --- a/qapi/block.json
> +++ b/qapi/block.json
> @@ -493,7 +493,8 @@
> # <- { "return": {} }
> ##
> { 'command': 'block_set_io_throttle', 'boxed': true,
> - 'data': 'BlockIOThrottle' }
> + 'data': 'BlockIOThrottle',
> + 'allow-preconfig': true }
>
> ##
> # @block-latency-histogram-set:
> @@ -569,4 +570,5 @@
> '*boundaries': ['uint64'],
> '*boundaries-read': ['uint64'],
> '*boundaries-write': ['uint64'],
> - '*boundaries-flush': ['uint64'] } }
> + '*boundaries-flush': ['uint64'] },
> + 'allow-preconfig': true }
>
Ping.
Paolo
On Tue, May 11, 2021 at 11:39:49AM -0400, Paolo Bonzini wrote: > Most block device commands do not require a fully constructed machine. > Allow running them before machine initialization has concluded. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > hmp-commands.hx | 14 +++++ > qapi/block-core.json | 117 +++++++++++++++++++++++++++-------------- > qapi/block-export.json | 21 +++++--- > qapi/block.json | 6 ++- > 4 files changed, 110 insertions(+), 48 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
© 2016 - 2024 Red Hat, Inc.