From: Peter Maydell Date: Thu, 31 Mar 2022 10:56:52 +0000 (+0100) Subject: Merge tag 'pull-qapi-2022-03-31' of git://repo.or.cz/qemu/armbru into staging X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cace6c6f3aca7b88afc42995f90bbefb37a0ed57;p=qmiga%2Fqemu.git Merge tag 'pull-qapi-2022-03-31' of git://repo.or.cz/qemu/armbru into staging QAPI patches patches for 2022-03-31 # gpg: Signature made Thu 31 Mar 2022 11:51:34 BST # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "armbru@redhat.com" # gpg: Good signature from "Markus Armbruster " [full] # gpg: aka "Markus Armbruster " [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * tag 'pull-qapi-2022-03-31' of git://repo.or.cz/qemu/armbru: qapi: fix example of dump-guest-memory qapi: fix example of ACPI_DEVICE_OST event qapi: ui examples: add missing @websocket member qapi: fix example of MEMORY_FAILURE qapi: run-state examples: add missing @timestamp qapi: fix examples: SHUTDOWN and RESET events qapi: fix example of FAILOVER_NEGOTIATED event qapi: fix example of UNPLUG_PRIMARY event qapi: fix example of MEMORY_DEVICE_SIZE_CHANGE event qapi: fix example of DUMP_COMPLETED event qapi: fix example of BLOCK_JOB_PENDING event qapi: fix example of BLOCK_IO_ERROR event qapi: fix example of BLOCK_IMAGE_CORRUPTED event qapi: BlockExportRemoveMode: move comments to TODO schemas: add missing vim modeline Signed-off-by: Peter Maydell --- cace6c6f3aca7b88afc42995f90bbefb37a0ed57