[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/30] qmp-commands: move 'query-cpus' doc to schema
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 19/30] qmp-commands: move 'query-cpus' doc to schema |
Date: |
Tue, 13 Sep 2016 17:01:58 +0400 |
Signed-off-by: Marc-André Lureau <address@hidden>
---
docs/qmp-commands.txt | 46 ----------------------------------------------
qapi-schema.json | 26 ++++++++++++++++++++++++++
2 files changed, 26 insertions(+), 46 deletions(-)
diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index c066833..3f44375 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -1929,52 +1929,6 @@ Example:
]
}
-query-cpus
-----------
-
-Show CPU information.
-
-Return a json-array. Each CPU is represented by a json-object, which contains:
-
-- "CPU": CPU index (json-int)
-- "current": true if this is the current CPU, false otherwise (json-bool)
-- "halted": true if the cpu is halted, false otherwise (json-bool)
-- "qom_path": path to the CPU object in the QOM tree (json-str)
-- "arch": architecture of the cpu, which determines what additional
- keys will be present (json-str)
-- Current program counter. The key's name depends on the architecture:
- "pc": i386/x86_64 (json-int)
- "nip": PPC (json-int)
- "pc" and "npc": sparc (json-int)
- "PC": mips (json-int)
-- "thread_id": ID of the underlying host thread (json-int)
-
-Example:
-
--> { "execute": "query-cpus" }
-<- {
- "return":[
- {
- "CPU":0,
- "current":true,
- "halted":false,
- "qom_path":"/machine/unattached/device[0]",
- "arch":"x86",
- "pc":3227107138,
- "thread_id":3134
- },
- {
- "CPU":1,
- "current":false,
- "halted":true,
- "qom_path":"/machine/unattached/device[2]",
- "arch":"x86",
- "pc":7108165,
- "thread_id":3135
- }
- ]
- }
-
query-iothreads
---------------
diff --git a/qapi-schema.json b/qapi-schema.json
index d9e45dc..c1183d0 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1248,6 +1248,32 @@
# Returns: a list of @CpuInfo for each virtual CPU
#
# Since: 0.14.0
+#
+# Example:
+#
+# -> { "execute": "query-cpus" }
+# <- { "return": [
+# {
+# "CPU":0,
+# "current":true,
+# "halted":false,
+# "qom_path":"/machine/unattached/device[0]",
+# "arch":"x86",
+# "pc":3227107138,
+# "thread_id":3134
+# },
+# {
+# "CPU":1,
+# "current":false,
+# "halted":true,
+# "qom_path":"/machine/unattached/device[2]",
+# "arch":"x86",
+# "pc":7108165,
+# "thread_id":3135
+# }
+# ]
+# }
+#
##
{ 'command': 'query-cpus', 'returns': ['CpuInfo'] }
--
2.10.0
- [Qemu-devel] [PATCH 09/30] qmp-commands: move 'ringbuf-read' doc to schema, (continued)
- [Qemu-devel] [PATCH 09/30] qmp-commands: move 'ringbuf-read' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 11/30] qmp-commands: move 'query-migrate' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 10/30] qmp-commands: move 'query-events' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 12/30] qmp-commands: move 'migrate-set-capabilities' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 13/30] qmp-commands: move 'query-migrate-capabilities' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 14/30] qmp-commands: move 'migrate-set-parameters' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 15/30] qmp-commands: move 'query-migrate-parameters' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 16/30] qmp-commands: move 'client_migrate_info' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 17/30] qmp-commands: move 'migrate-start-postcopy' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 18/30] qmp-commands: move 'query-mice' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 19/30] qmp-commands: move 'query-cpus' doc to schema,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 20/30] qmp-commands: move 'query-iothreads' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 23/30] qmp-commands: move 'query-balloon' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 21/30] qmp-commands: move 'query-vnc' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 22/30] qmp-commands: move 'query-spice' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 25/30] qmp-commands: move 'quit' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 24/30] qmp-commands: move 'query-pci' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 27/30] qmp-commands: move 'system_reset' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 26/30] qmp-commands: move 'stop' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 28/30] qmp-commands: move 'system_powerdown' doc to schema, Marc-André Lureau, 2016/09/13
- [Qemu-devel] [PATCH 29/30] qmp-commands: move 'cpu-add' doc to schema, Marc-André Lureau, 2016/09/13