ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QAPI patches patches for 2022-09-07 

-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmMYp0sSHGFybWJydUBy
 ZWRoYXQuY29tAAoJEDhwtADrkYZTtbUP/3bHyjF4xamMwlXHi/nY/zlNKkZyhMul
 SdS+KVLBxufuYmlP2mPGqG/wnK4geWnduwprl/SCSd8NdymWDVxu6tUjdPAdW6S4
 27WZUADZtXow2tOczcKFKMve4qBZXNKtv4W/eBTDMMpfje3dWBuEx70xN1HgpCWw
 i/h3J5dKwwWmHnyqroFJAEUPTx0jEk9GhzZCQ4hey2CFXDc5sgywliJA+pKv+1sF
 z1g2S0rq35jd7YZnPF0M3J2MdqQo6AaOsoPqRSJMpuma0Cfvwj0UmjzQAIeaahrD
 1uEP3YEGXeOQlocDv3zqA6VFympAyFv+Ljj4XW3dsu9waBvtg2FYXQOrizxDuj1Y
 nAGJ6/xYrvZ+8Eb0tbdJYnxWv7MESbswhabJA+YfnjKOTD6TV5hmuHEzoR5c5Mly
 RYT+68WANXveOZ+f4oiqHQ4Gxuvp9+rU2uHQ+MvMhScDmJE7E+Gg8zELwKiQWu2q
 lU5vOv55fZTHhLt/gyOAEuNvFCnbfdYluV845GBaaqLRjBPMfSoNKBtswzQbCgKH
 vy5R+omAxQjjXzEL9GO2Wm50xYk5Er14ad5vAQ1256/sx3zuzQ/O0jzvGsKNPIXG
 Y/dnFg3e9eT18gQ+uDyZGpYf0XV5PKlUUcomIPikWogTiZvTXMdYNWz+gt2taatE
 jbxTea7AU3ty
 =L82X
 -----END PGP SIGNATURE-----

Merge tag 'pull-qapi-2022-09-07' of git://repo.or.cz/qemu/armbru into staging

QAPI patches patches for 2022-09-07

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmMYp0sSHGFybWJydUBy
# ZWRoYXQuY29tAAoJEDhwtADrkYZTtbUP/3bHyjF4xamMwlXHi/nY/zlNKkZyhMul
# SdS+KVLBxufuYmlP2mPGqG/wnK4geWnduwprl/SCSd8NdymWDVxu6tUjdPAdW6S4
# 27WZUADZtXow2tOczcKFKMve4qBZXNKtv4W/eBTDMMpfje3dWBuEx70xN1HgpCWw
# i/h3J5dKwwWmHnyqroFJAEUPTx0jEk9GhzZCQ4hey2CFXDc5sgywliJA+pKv+1sF
# z1g2S0rq35jd7YZnPF0M3J2MdqQo6AaOsoPqRSJMpuma0Cfvwj0UmjzQAIeaahrD
# 1uEP3YEGXeOQlocDv3zqA6VFympAyFv+Ljj4XW3dsu9waBvtg2FYXQOrizxDuj1Y
# nAGJ6/xYrvZ+8Eb0tbdJYnxWv7MESbswhabJA+YfnjKOTD6TV5hmuHEzoR5c5Mly
# RYT+68WANXveOZ+f4oiqHQ4Gxuvp9+rU2uHQ+MvMhScDmJE7E+Gg8zELwKiQWu2q
# lU5vOv55fZTHhLt/gyOAEuNvFCnbfdYluV845GBaaqLRjBPMfSoNKBtswzQbCgKH
# vy5R+omAxQjjXzEL9GO2Wm50xYk5Er14ad5vAQ1256/sx3zuzQ/O0jzvGsKNPIXG
# Y/dnFg3e9eT18gQ+uDyZGpYf0XV5PKlUUcomIPikWogTiZvTXMdYNWz+gt2taatE
# jbxTea7AU3ty
# =L82X
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 07 Sep 2022 10:14:35 EDT
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* tag 'pull-qapi-2022-09-07' of git://repo.or.cz/qemu/armbru:
  qapi: fix examples of events missing timestamp
  qapi: fix example of query-hotpluggable-cpus command
  qapi: fix examples of blockdev-add with qcow2
  qapi: fix example of MEM_UNPLUG_ERROR event
  qapi: fix example of DEVICE_UNPLUG_GUEST_ERROR event
  qapi: fix example of NIC_RX_FILTER_CHANGED event
  qapi: fix example of BLOCK_JOB_READY event
  qapi: fix example of query-dump-guest-memory-capability command
  qapi: fix example of query-vnc command
  qapi: fix example of query-ballon command

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2022-09-07 13:13:30 -04:00
parent e46e2628e9 6e7a37ffc2
commit 79dfa177ae
7 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qapi/block-core.json
View File

@ -1541,8 +1541,8 @@
# -> { "execute": "blockdev-add", # -> { "execute": "blockdev-add",
# "arguments": { "driver": "qcow2", # "arguments": { "driver": "qcow2",
# "node-name": "node1534", # "node-name": "node1534",
# "file": { "driver": "file", # "data-file": { "driver": "file",
# "filename": "hd1.qcow2" }, # "filename": "hd1.qcow2" },
# "backing": null } } # "backing": null } }
# #
# <- { "return": {} } # <- { "return": {} }
@ -4378,7 +4378,7 @@
# "arguments": { # "arguments": {
# "driver": "qcow2", # "driver": "qcow2",
# "node-name": "test1", # "node-name": "test1",
# "file": { # "data-file": {
# "driver": "file", # "driver": "file",
# "filename": "test.qcow2" # "filename": "test.qcow2"
# } # }
@ -4395,7 +4395,7 @@
# "cache": { # "cache": {
# "direct": true # "direct": true
# }, # },
# "file": { # "data-file": {
# "driver": "file", # "driver": "file",
# "filename": "/tmp/test.qcow2" # "filename": "/tmp/test.qcow2"
# }, # },
@ -4477,7 +4477,7 @@
# "arguments": { # "arguments": {
# "driver": "qcow2", # "driver": "qcow2",
# "node-name": "node0", # "node-name": "node0",
# "file": { # "data-file": {
# "driver": "file", # "driver": "file",
# "filename": "test.qcow2" # "filename": "test.qcow2"
# } # }
@ -5252,7 +5252,7 @@
# #
# <- { "event": "BLOCK_JOB_READY", # <- { "event": "BLOCK_JOB_READY",
# "data": { "device": "drive0", "type": "mirror", "speed": 0, # "data": { "device": "drive0", "type": "mirror", "speed": 0,
# "len": 2097152, "offset": 2097152 } # "len": 2097152, "offset": 2097152 },
# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } # "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
# #
## ##

2
qapi/dump.json
View File

@ -195,7 +195,7 @@
# #
# -> { "execute": "query-dump-guest-memory-capability" } # -> { "execute": "query-dump-guest-memory-capability" }
# <- { "return": { "formats": # <- { "return": { "formats":
# ["elf", "kdump-zlib", "kdump-lzo", "kdump-snappy"] } # ["elf", "kdump-zlib", "kdump-lzo", "kdump-snappy"] } }
# #
## ##
{ 'command': 'query-dump-guest-memory-capability', { 'command': 'query-dump-guest-memory-capability',

8
qapi/machine.json
View File

@ -958,9 +958,9 @@
# #
# -> { "execute": "query-hotpluggable-cpus" } # -> { "execute": "query-hotpluggable-cpus" }
# <- {"return": [ # <- {"return": [
# { "props": { "core": 8 }, "type": "POWER8-spapr-cpu-core", # { "props": { "core-id": 8 }, "type": "POWER8-spapr-cpu-core",
# "vcpus-count": 1 }, # "vcpus-count": 1 },
# { "props": { "core": 0 }, "type": "POWER8-spapr-cpu-core", # { "props": { "core-id": 0 }, "type": "POWER8-spapr-cpu-core",
# "vcpus-count": 1, "qom-path": "/machine/unattached/device[0]"} # "vcpus-count": 1, "qom-path": "/machine/unattached/device[0]"}
# ]}' # ]}'
# #
@ -1074,7 +1074,7 @@
# #
# -> { "execute": "query-balloon" } # -> { "execute": "query-balloon" }
# <- { "return": { # <- { "return": {
# "actual": 1073741824, # "actual": 1073741824
# } # }
# } # }
# #
@ -1416,7 +1416,7 @@
# #
# Example: # Example:
# #
# <- { "event": "MEM_UNPLUG_ERROR" # <- { "event": "MEM_UNPLUG_ERROR",
# "data": { "device": "dimm1", # "data": { "device": "dimm1",
# "msg": "acpi: device unplug for unsupported device" # "msg": "acpi: device unplug for unsupported device"
# }, # },

27
qapi/migration.json
View File

@ -1995,16 +1995,23 @@
# } # }
# <- { "return": { } } # <- { "return": { } }
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1432121972, "microseconds": 744001},
# "data": {"status": "created", "id": "snapsave0"}} # "data": {"status": "created", "id": "snapsave0"}}
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1432122172, "microseconds": 744001},
# "data": {"status": "running", "id": "snapsave0"}} # "data": {"status": "running", "id": "snapsave0"}}
# <- {"event": "STOP"} # <- {"event": "STOP",
# <- {"event": "RESUME"} # "timestamp": {"seconds": 1432122372, "microseconds": 744001} }
# <- {"event": "RESUME",
# "timestamp": {"seconds": 1432122572, "microseconds": 744001} }
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1432122772, "microseconds": 744001},
# "data": {"status": "waiting", "id": "snapsave0"}} # "data": {"status": "waiting", "id": "snapsave0"}}
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1432122972, "microseconds": 744001},
# "data": {"status": "pending", "id": "snapsave0"}} # "data": {"status": "pending", "id": "snapsave0"}}
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1432123172, "microseconds": 744001},
# "data": {"status": "concluded", "id": "snapsave0"}} # "data": {"status": "concluded", "id": "snapsave0"}}
# -> {"execute": "query-jobs"} # -> {"execute": "query-jobs"}
# <- {"return": [{"current-progress": 1, # <- {"return": [{"current-progress": 1,
@ -2056,16 +2063,23 @@
# } # }
# <- { "return": { } } # <- { "return": { } }
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1472124172, "microseconds": 744001},
# "data": {"status": "created", "id": "snapload0"}} # "data": {"status": "created", "id": "snapload0"}}
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1472125172, "microseconds": 744001},
# "data": {"status": "running", "id": "snapload0"}} # "data": {"status": "running", "id": "snapload0"}}
# <- {"event": "STOP"} # <- {"event": "STOP",
# <- {"event": "RESUME"} # "timestamp": {"seconds": 1472125472, "microseconds": 744001} }
# <- {"event": "RESUME",
# "timestamp": {"seconds": 1472125872, "microseconds": 744001} }
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1472126172, "microseconds": 744001},
# "data": {"status": "waiting", "id": "snapload0"}} # "data": {"status": "waiting", "id": "snapload0"}}
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1472127172, "microseconds": 744001},
# "data": {"status": "pending", "id": "snapload0"}} # "data": {"status": "pending", "id": "snapload0"}}
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1472128172, "microseconds": 744001},
# "data": {"status": "concluded", "id": "snapload0"}} # "data": {"status": "concluded", "id": "snapload0"}}
# -> {"execute": "query-jobs"} # -> {"execute": "query-jobs"}
# <- {"return": [{"current-progress": 1, # <- {"return": [{"current-progress": 1,
@ -2108,14 +2122,19 @@
# } # }
# <- { "return": { } } # <- { "return": { } }
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1442124172, "microseconds": 744001},
# "data": {"status": "created", "id": "snapdelete0"}} # "data": {"status": "created", "id": "snapdelete0"}}
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1442125172, "microseconds": 744001},
# "data": {"status": "running", "id": "snapdelete0"}} # "data": {"status": "running", "id": "snapdelete0"}}
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1442126172, "microseconds": 744001},
# "data": {"status": "waiting", "id": "snapdelete0"}} # "data": {"status": "waiting", "id": "snapdelete0"}}
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1442127172, "microseconds": 744001},
# "data": {"status": "pending", "id": "snapdelete0"}} # "data": {"status": "pending", "id": "snapdelete0"}}
# <- {"event": "JOB_STATUS_CHANGE", # <- {"event": "JOB_STATUS_CHANGE",
# "timestamp": {"seconds": 1442128172, "microseconds": 744001},
# "data": {"status": "concluded", "id": "snapdelete0"}} # "data": {"status": "concluded", "id": "snapdelete0"}}
# -> {"execute": "query-jobs"} # -> {"execute": "query-jobs"}
# <- {"return": [{"current-progress": 1, # <- {"return": [{"current-progress": 1,

1
qapi/net.json
View File

@ -757,7 +757,6 @@
# "data": { "name": "vnet0", # "data": { "name": "vnet0",
# "path": "/machine/peripheral/vnet0/virtio-backend" }, # "path": "/machine/peripheral/vnet0/virtio-backend" },
# "timestamp": { "seconds": 1368697518, "microseconds": 326866 } } # "timestamp": { "seconds": 1368697518, "microseconds": 326866 } }
# }
# #
## ##
{ 'event': 'NIC_RX_FILTER_CHANGED', { 'event': 'NIC_RX_FILTER_CHANGED',

3
qapi/qdev.json
View File

@ -150,10 +150,9 @@
# #
# Example: # Example:
# #
# <- { "event": "DEVICE_UNPLUG_GUEST_ERROR" # <- { "event": "DEVICE_UNPLUG_GUEST_ERROR",
# "data": { "device": "core1", # "data": { "device": "core1",
# "path": "/machine/peripheral/core1" }, # "path": "/machine/peripheral/core1" },
# },
# "timestamp": { "seconds": 1615570772, "microseconds": 202844 } } # "timestamp": { "seconds": 1615570772, "microseconds": 202844 } }
# #
## ##

4
qapi/ui.json
View File

@ -667,8 +667,8 @@
# { # {
# "host":"127.0.0.1", # "host":"127.0.0.1",
# "service":"50401", # "service":"50401",
# "family":"ipv4" # "family":"ipv4",
# "websocket":false, # "websocket":false
# } # }
# ] # ]
# } # }