[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/6] docs: Drop deprecated 'props' from object-add
From: |
Thomas Huth |
Subject: |
[PULL 4/6] docs: Drop deprecated 'props' from object-add |
Date: |
Mon, 22 Nov 2021 15:43:18 +0100 |
From: "Rao, Lei" <lei.rao@intel.com>
In commit 5024340745 "qapi/qom: Drop deprecated 'props' from
object-add" (v6.0.0), we also should update documents.
Signed-off-by: Lei Rao <lei.rao@intel.com>
Message-Id: <1637567387-28250-1-git-send-email-lei.rao@intel.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
docs/COLO-FT.txt | 16 ++++++++--------
docs/system/authz.rst | 26 ++++++++++----------------
docs/throttle.txt | 8 +++-----
docs/tools/qemu-nbd.rst | 2 +-
4 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt
index 8d6d53a5a2..fd5ffcc6e5 100644
--- a/docs/COLO-FT.txt
+++ b/docs/COLO-FT.txt
@@ -289,11 +289,11 @@ Wait until disk is synced, then:
{'execute': 'human-monitor-command', 'arguments':{ 'command-line': 'drive_add
-n buddy
driver=replication,mode=primary,file.driver=nbd,file.host=127.0.0.2,file.port=9999,file.export=parent0,node-name=replication0'}}
{'execute': 'x-blockdev-change', 'arguments':{ 'parent': 'colo-disk0', 'node':
'replication0' } }
-{'execute': 'object-add', 'arguments':{ 'qom-type': 'filter-mirror', 'id':
'm0', 'props': { 'netdev': 'hn0', 'queue': 'tx', 'outdev': 'mirror0' } } }
-{'execute': 'object-add', 'arguments':{ 'qom-type': 'filter-redirector', 'id':
'redire0', 'props': { 'netdev': 'hn0', 'queue': 'rx', 'indev': 'compare_out' }
} }
-{'execute': 'object-add', 'arguments':{ 'qom-type': 'filter-redirector', 'id':
'redire1', 'props': { 'netdev': 'hn0', 'queue': 'rx', 'outdev': 'compare0' } } }
+{'execute': 'object-add', 'arguments':{ 'qom-type': 'filter-mirror', 'id':
'm0', 'netdev': 'hn0', 'queue': 'tx', 'outdev': 'mirror0' } }
+{'execute': 'object-add', 'arguments':{ 'qom-type': 'filter-redirector', 'id':
'redire0', 'netdev': 'hn0', 'queue': 'rx', 'indev': 'compare_out' } }
+{'execute': 'object-add', 'arguments':{ 'qom-type': 'filter-redirector', 'id':
'redire1', 'netdev': 'hn0', 'queue': 'rx', 'outdev': 'compare0' } }
{'execute': 'object-add', 'arguments':{ 'qom-type': 'iothread', 'id':
'iothread1' } }
-{'execute': 'object-add', 'arguments':{ 'qom-type': 'colo-compare', 'id':
'comp0', 'props': { 'primary_in': 'compare0-0', 'secondary_in': 'compare1',
'outdev': 'compare_out0', 'iothread': 'iothread1' } } }
+{'execute': 'object-add', 'arguments':{ 'qom-type': 'colo-compare', 'id':
'comp0', 'primary_in': 'compare0-0', 'secondary_in': 'compare1', 'outdev':
'compare_out0', 'iothread': 'iothread1' } }
{'execute': 'migrate-set-capabilities', 'arguments':{ 'capabilities': [
{'capability': 'x-colo', 'state': true } ] } }
{'execute': 'migrate', 'arguments':{ 'uri': 'tcp:127.0.0.2:9998' } }
@@ -318,11 +318,11 @@ Wait until disk is synced, then:
{'execute': 'human-monitor-command', 'arguments':{ 'command-line': 'drive_add
-n buddy
driver=replication,mode=primary,file.driver=nbd,file.host=127.0.0.1,file.port=9999,file.export=parent0,node-name=replication0'}}
{'execute': 'x-blockdev-change', 'arguments':{ 'parent': 'colo-disk0', 'node':
'replication0' } }
-{'execute': 'object-add', 'arguments':{ 'qom-type': 'filter-mirror', 'id':
'm0', 'props': { 'insert': 'before', 'position': 'id=rew0', 'netdev': 'hn0',
'queue': 'tx', 'outdev': 'mirror0' } } }
-{'execute': 'object-add', 'arguments':{ 'qom-type': 'filter-redirector', 'id':
'redire0', 'props': { 'insert': 'before', 'position': 'id=rew0', 'netdev':
'hn0', 'queue': 'rx', 'indev': 'compare_out' } } }
-{'execute': 'object-add', 'arguments':{ 'qom-type': 'filter-redirector', 'id':
'redire1', 'props': { 'insert': 'before', 'position': 'id=rew0', 'netdev':
'hn0', 'queue': 'rx', 'outdev': 'compare0' } } }
+{'execute': 'object-add', 'arguments':{ 'qom-type': 'filter-mirror', 'id':
'm0', 'insert': 'before', 'position': 'id=rew0', 'netdev': 'hn0', 'queue':
'tx', 'outdev': 'mirror0' } }
+{'execute': 'object-add', 'arguments':{ 'qom-type': 'filter-redirector', 'id':
'redire0', 'insert': 'before', 'position': 'id=rew0', 'netdev': 'hn0', 'queue':
'rx', 'indev': 'compare_out' } }
+{'execute': 'object-add', 'arguments':{ 'qom-type': 'filter-redirector', 'id':
'redire1', 'insert': 'before', 'position': 'id=rew0', 'netdev': 'hn0', 'queue':
'rx', 'outdev': 'compare0' } }
{'execute': 'object-add', 'arguments':{ 'qom-type': 'iothread', 'id':
'iothread1' } }
-{'execute': 'object-add', 'arguments':{ 'qom-type': 'colo-compare', 'id':
'comp0', 'props': { 'primary_in': 'compare0-0', 'secondary_in': 'compare1',
'outdev': 'compare_out0', 'iothread': 'iothread1' } } }
+{'execute': 'object-add', 'arguments':{ 'qom-type': 'colo-compare', 'id':
'comp0', 'primary_in': 'compare0-0', 'secondary_in': 'compare1', 'outdev':
'compare_out0', 'iothread': 'iothread1' } }
{'execute': 'migrate-set-capabilities', 'arguments':{ 'capabilities': [
{'capability': 'x-colo', 'state': true } ] } }
{'execute': 'migrate', 'arguments':{ 'uri': 'tcp:127.0.0.1:9998' } }
diff --git a/docs/system/authz.rst b/docs/system/authz.rst
index 942af39602..55b7315e49 100644
--- a/docs/system/authz.rst
+++ b/docs/system/authz.rst
@@ -77,9 +77,7 @@ To create an instance of this driver via QMP:
"arguments": {
"qom-type": "authz-simple",
"id": "authz0",
- "props": {
- "identity": "fred"
- }
+ "identity": "fred"
}
}
@@ -110,15 +108,13 @@ To create an instance of this class via QMP:
"arguments": {
"qom-type": "authz-list",
"id": "authz0",
- "props": {
- "rules": [
- { "match": "fred", "policy": "allow", "format": "exact" },
- { "match": "bob", "policy": "allow", "format": "exact" },
- { "match": "danb", "policy": "deny", "format": "exact" },
- { "match": "dan*", "policy": "allow", "format": "glob" }
- ],
- "policy": "deny"
- }
+ "rules": [
+ { "match": "fred", "policy": "allow", "format": "exact" },
+ { "match": "bob", "policy": "allow", "format": "exact" },
+ { "match": "danb", "policy": "deny", "format": "exact" },
+ { "match": "dan*", "policy": "allow", "format": "glob" }
+ ],
+ "policy": "deny"
}
}
@@ -143,10 +139,8 @@ To create an instance of this class via QMP:
"arguments": {
"qom-type": "authz-list-file",
"id": "authz0",
- "props": {
- "filename": "/etc/qemu/myvm-vnc.acl",
- "refresh": true
- }
+ "filename": "/etc/qemu/myvm-vnc.acl",
+ "refresh": true
}
}
diff --git a/docs/throttle.txt b/docs/throttle.txt
index b5b78b7326..0a0453a5ee 100644
--- a/docs/throttle.txt
+++ b/docs/throttle.txt
@@ -273,11 +273,9 @@ A group can be created using the object-add QMP function:
"arguments": {
"qom-type": "throttle-group",
"id": "group0",
- "props": {
- "limits" : {
- "iops-total": 1000
- "bps-write": 2097152
- }
+ "limits" : {
+ "iops-total": 1000,
+ "bps-write": 2097152
}
}
}
diff --git a/docs/tools/qemu-nbd.rst b/docs/tools/qemu-nbd.rst
index 56e54cd441..726cd18960 100644
--- a/docs/tools/qemu-nbd.rst
+++ b/docs/tools/qemu-nbd.rst
@@ -31,7 +31,7 @@ driver options if ``--image-opts`` is specified.
*dev* is an NBD device.
-.. option:: --object type,id=ID,...props...
+.. option:: --object type,id=ID,...
Define a new instance of the *type* object class identified by *ID*.
See the :manpage:`qemu(1)` manual page for full details of the properties
--
2.27.0
- [PULL 0/6] Documentation updates, Thomas Huth, 2021/11/22
- [PULL 1/6] docs: Fix botched rST conversion of 'submitting-a-patch.rst', Thomas Huth, 2021/11/22
- [PULL 4/6] docs: Drop deprecated 'props' from object-add,
Thomas Huth <=
- [PULL 3/6] Fix some typos in documentation (found by codespell), Thomas Huth, 2021/11/22
- [PULL 2/6] docs: List more commit-message tags in "submitting-a-patch", Thomas Huth, 2021/11/22
- [PULL 5/6] docs: Use double quotes instead of single quotes for COLO, Thomas Huth, 2021/11/22
- [PULL 6/6] docs: Render binary names as monospaced text, Thomas Huth, 2021/11/22
- Re: [PULL 0/6] Documentation updates, Richard Henderson, 2021/11/22