qapi-schema: Fold event.json back into qapi-schema.json
Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1503602048-12268-14-git-send-email-armbru@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
parent
fd87a6bd3b
commit
c09656f1d3
2
Makefile
2
Makefile
|
@ -412,7 +412,7 @@ qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \
|
||||||
$(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \
|
$(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \
|
||||||
$(SRC_PATH)/qapi/char.json \
|
$(SRC_PATH)/qapi/char.json \
|
||||||
$(SRC_PATH)/qapi/crypto.json \
|
$(SRC_PATH)/qapi/crypto.json \
|
||||||
$(SRC_PATH)/qapi/event.json $(SRC_PATH)/qapi/introspect.json \
|
$(SRC_PATH)/qapi/introspect.json \
|
||||||
$(SRC_PATH)/qapi/migration.json \
|
$(SRC_PATH)/qapi/migration.json \
|
||||||
$(SRC_PATH)/qapi/net.json \
|
$(SRC_PATH)/qapi/net.json \
|
||||||
$(SRC_PATH)/qapi/rocker.json \
|
$(SRC_PATH)/qapi/rocker.json \
|
||||||
|
|
134
qapi-schema.json
134
qapi-schema.json
|
@ -90,7 +90,6 @@
|
||||||
{ 'include': 'qapi/ui.json' }
|
{ 'include': 'qapi/ui.json' }
|
||||||
{ 'include': 'qapi/migration.json' }
|
{ 'include': 'qapi/migration.json' }
|
||||||
{ 'include': 'qapi/transaction.json' }
|
{ 'include': 'qapi/transaction.json' }
|
||||||
{ 'include': 'qapi/event.json' }
|
|
||||||
{ 'include': 'qapi/trace.json' }
|
{ 'include': 'qapi/trace.json' }
|
||||||
{ 'include': 'qapi/introspect.json' }
|
{ 'include': 'qapi/introspect.json' }
|
||||||
|
|
||||||
|
@ -551,6 +550,28 @@
|
||||||
##
|
##
|
||||||
{ 'command': 'query-balloon', 'returns': 'BalloonInfo' }
|
{ 'command': 'query-balloon', 'returns': 'BalloonInfo' }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @BALLOON_CHANGE:
|
||||||
|
#
|
||||||
|
# Emitted when the guest changes the actual BALLOON level. This value is
|
||||||
|
# equivalent to the @actual field return by the 'query-balloon' command
|
||||||
|
#
|
||||||
|
# @actual: actual level of the guest memory balloon in bytes
|
||||||
|
#
|
||||||
|
# Note: this event is rate-limited.
|
||||||
|
#
|
||||||
|
# Since: 1.2
|
||||||
|
#
|
||||||
|
# Example:
|
||||||
|
#
|
||||||
|
# <- { "event": "BALLOON_CHANGE",
|
||||||
|
# "data": { "actual": 944766976 },
|
||||||
|
# "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }
|
||||||
|
#
|
||||||
|
##
|
||||||
|
{ 'event': 'BALLOON_CHANGE',
|
||||||
|
'data': { 'actual': 'int' } }
|
||||||
|
|
||||||
##
|
##
|
||||||
# @PciMemoryRange:
|
# @PciMemoryRange:
|
||||||
#
|
#
|
||||||
|
@ -1433,6 +1454,30 @@
|
||||||
##
|
##
|
||||||
{ 'command': 'device_del', 'data': {'id': 'str'} }
|
{ 'command': 'device_del', 'data': {'id': 'str'} }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @DEVICE_DELETED:
|
||||||
|
#
|
||||||
|
# Emitted whenever the device removal completion is acknowledged by the guest.
|
||||||
|
# At this point, it's safe to reuse the specified device ID. Device removal can
|
||||||
|
# be initiated by the guest or by HMP/QMP commands.
|
||||||
|
#
|
||||||
|
# @device: device name
|
||||||
|
#
|
||||||
|
# @path: device path
|
||||||
|
#
|
||||||
|
# Since: 1.5
|
||||||
|
#
|
||||||
|
# Example:
|
||||||
|
#
|
||||||
|
# <- { "event": "DEVICE_DELETED",
|
||||||
|
# "data": { "device": "virtio-net-pci-0",
|
||||||
|
# "path": "/machine/peripheral/virtio-net-pci-0" },
|
||||||
|
# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
|
||||||
|
#
|
||||||
|
##
|
||||||
|
{ 'event': 'DEVICE_DELETED',
|
||||||
|
'data': { '*device': 'str', 'path': 'str' } }
|
||||||
|
|
||||||
##
|
##
|
||||||
# @DumpGuestMemoryFormat:
|
# @DumpGuestMemoryFormat:
|
||||||
#
|
#
|
||||||
|
@ -1568,6 +1613,29 @@
|
||||||
##
|
##
|
||||||
{ 'command': 'query-dump', 'returns': 'DumpQueryResult' }
|
{ 'command': 'query-dump', 'returns': 'DumpQueryResult' }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @DUMP_COMPLETED:
|
||||||
|
#
|
||||||
|
# Emitted when background dump has completed
|
||||||
|
#
|
||||||
|
# @result: DumpQueryResult type described in qapi-schema.json.
|
||||||
|
#
|
||||||
|
# @error: human-readable error string that provides
|
||||||
|
# hint on why dump failed. Only presents on failure. The
|
||||||
|
# user should not try to interpret the error string.
|
||||||
|
#
|
||||||
|
# Since: 2.6
|
||||||
|
#
|
||||||
|
# Example:
|
||||||
|
#
|
||||||
|
# { "event": "DUMP_COMPLETED",
|
||||||
|
# "data": {"result": {"total": 1090650112, "status": "completed",
|
||||||
|
# "completed": 1090650112} } }
|
||||||
|
#
|
||||||
|
##
|
||||||
|
{ 'event': 'DUMP_COMPLETED' ,
|
||||||
|
'data': { 'result': 'DumpQueryResult', '*error': 'str' } }
|
||||||
|
|
||||||
##
|
##
|
||||||
# @DumpGuestMemoryCapability:
|
# @DumpGuestMemoryCapability:
|
||||||
#
|
#
|
||||||
|
@ -2651,6 +2719,29 @@
|
||||||
##
|
##
|
||||||
{ 'command': 'query-memory-devices', 'returns': ['MemoryDeviceInfo'] }
|
{ 'command': 'query-memory-devices', 'returns': ['MemoryDeviceInfo'] }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @MEM_UNPLUG_ERROR:
|
||||||
|
#
|
||||||
|
# Emitted when memory hot unplug error occurs.
|
||||||
|
#
|
||||||
|
# @device: device name
|
||||||
|
#
|
||||||
|
# @msg: Informative message
|
||||||
|
#
|
||||||
|
# Since: 2.4
|
||||||
|
#
|
||||||
|
# Example:
|
||||||
|
#
|
||||||
|
# <- { "event": "MEM_UNPLUG_ERROR"
|
||||||
|
# "data": { "device": "dimm1",
|
||||||
|
# "msg": "acpi: device unplug for unsupported device"
|
||||||
|
# },
|
||||||
|
# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
|
||||||
|
#
|
||||||
|
##
|
||||||
|
{ 'event': 'MEM_UNPLUG_ERROR',
|
||||||
|
'data': { 'device': 'str', 'msg': 'str' } }
|
||||||
|
|
||||||
##
|
##
|
||||||
# @ACPISlotType:
|
# @ACPISlotType:
|
||||||
#
|
#
|
||||||
|
@ -2705,6 +2796,25 @@
|
||||||
##
|
##
|
||||||
{ 'command': 'query-acpi-ospm-status', 'returns': ['ACPIOSTInfo'] }
|
{ 'command': 'query-acpi-ospm-status', 'returns': ['ACPIOSTInfo'] }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @ACPI_DEVICE_OST:
|
||||||
|
#
|
||||||
|
# Emitted when guest executes ACPI _OST method.
|
||||||
|
#
|
||||||
|
# @info: ACPIOSTInfo type as described in qapi-schema.json
|
||||||
|
#
|
||||||
|
# Since: 2.1
|
||||||
|
#
|
||||||
|
# Example:
|
||||||
|
#
|
||||||
|
# <- { "event": "ACPI_DEVICE_OST",
|
||||||
|
# "data": { "device": "d1", "slot": "0",
|
||||||
|
# "slot-type": "DIMM", "source": 1, "status": 0 } }
|
||||||
|
#
|
||||||
|
##
|
||||||
|
{ 'event': 'ACPI_DEVICE_OST',
|
||||||
|
'data': { 'info': 'ACPIOSTInfo' } }
|
||||||
|
|
||||||
##
|
##
|
||||||
# @IoOperationType:
|
# @IoOperationType:
|
||||||
#
|
#
|
||||||
|
@ -2737,6 +2847,28 @@
|
||||||
##
|
##
|
||||||
{ 'command': 'rtc-reset-reinjection' }
|
{ 'command': 'rtc-reset-reinjection' }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @RTC_CHANGE:
|
||||||
|
#
|
||||||
|
# Emitted when the guest changes the RTC time.
|
||||||
|
#
|
||||||
|
# @offset: offset between base RTC clock (as specified by -rtc base), and
|
||||||
|
# new RTC clock value
|
||||||
|
#
|
||||||
|
# Note: This event is rate-limited.
|
||||||
|
#
|
||||||
|
# Since: 0.13.0
|
||||||
|
#
|
||||||
|
# Example:
|
||||||
|
#
|
||||||
|
# <- { "event": "RTC_CHANGE",
|
||||||
|
# "data": { "offset": 78 },
|
||||||
|
# "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }
|
||||||
|
#
|
||||||
|
##
|
||||||
|
{ 'event': 'RTC_CHANGE',
|
||||||
|
'data': { 'offset': 'int' } }
|
||||||
|
|
||||||
##
|
##
|
||||||
# @ReplayMode:
|
# @ReplayMode:
|
||||||
#
|
#
|
||||||
|
|
138
qapi/event.json
138
qapi/event.json
|
@ -1,138 +0,0 @@
|
||||||
# -*- Mode: Python -*-
|
|
||||||
|
|
||||||
##
|
|
||||||
# = Other events
|
|
||||||
##
|
|
||||||
|
|
||||||
##
|
|
||||||
# @RTC_CHANGE:
|
|
||||||
#
|
|
||||||
# Emitted when the guest changes the RTC time.
|
|
||||||
#
|
|
||||||
# @offset: offset between base RTC clock (as specified by -rtc base), and
|
|
||||||
# new RTC clock value
|
|
||||||
#
|
|
||||||
# Note: This event is rate-limited.
|
|
||||||
#
|
|
||||||
# Since: 0.13.0
|
|
||||||
#
|
|
||||||
# Example:
|
|
||||||
#
|
|
||||||
# <- { "event": "RTC_CHANGE",
|
|
||||||
# "data": { "offset": 78 },
|
|
||||||
# "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }
|
|
||||||
#
|
|
||||||
##
|
|
||||||
{ 'event': 'RTC_CHANGE',
|
|
||||||
'data': { 'offset': 'int' } }
|
|
||||||
|
|
||||||
##
|
|
||||||
# @DEVICE_DELETED:
|
|
||||||
#
|
|
||||||
# Emitted whenever the device removal completion is acknowledged by the guest.
|
|
||||||
# At this point, it's safe to reuse the specified device ID. Device removal can
|
|
||||||
# be initiated by the guest or by HMP/QMP commands.
|
|
||||||
#
|
|
||||||
# @device: device name
|
|
||||||
#
|
|
||||||
# @path: device path
|
|
||||||
#
|
|
||||||
# Since: 1.5
|
|
||||||
#
|
|
||||||
# Example:
|
|
||||||
#
|
|
||||||
# <- { "event": "DEVICE_DELETED",
|
|
||||||
# "data": { "device": "virtio-net-pci-0",
|
|
||||||
# "path": "/machine/peripheral/virtio-net-pci-0" },
|
|
||||||
# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
|
|
||||||
#
|
|
||||||
##
|
|
||||||
{ 'event': 'DEVICE_DELETED',
|
|
||||||
'data': { '*device': 'str', 'path': 'str' } }
|
|
||||||
|
|
||||||
##
|
|
||||||
# @ACPI_DEVICE_OST:
|
|
||||||
#
|
|
||||||
# Emitted when guest executes ACPI _OST method.
|
|
||||||
#
|
|
||||||
# @info: ACPIOSTInfo type as described in qapi-schema.json
|
|
||||||
#
|
|
||||||
# Since: 2.1
|
|
||||||
#
|
|
||||||
# Example:
|
|
||||||
#
|
|
||||||
# <- { "event": "ACPI_DEVICE_OST",
|
|
||||||
# "data": { "device": "d1", "slot": "0",
|
|
||||||
# "slot-type": "DIMM", "source": 1, "status": 0 } }
|
|
||||||
#
|
|
||||||
##
|
|
||||||
{ 'event': 'ACPI_DEVICE_OST',
|
|
||||||
'data': { 'info': 'ACPIOSTInfo' } }
|
|
||||||
|
|
||||||
##
|
|
||||||
# @BALLOON_CHANGE:
|
|
||||||
#
|
|
||||||
# Emitted when the guest changes the actual BALLOON level. This value is
|
|
||||||
# equivalent to the @actual field return by the 'query-balloon' command
|
|
||||||
#
|
|
||||||
# @actual: actual level of the guest memory balloon in bytes
|
|
||||||
#
|
|
||||||
# Note: this event is rate-limited.
|
|
||||||
#
|
|
||||||
# Since: 1.2
|
|
||||||
#
|
|
||||||
# Example:
|
|
||||||
#
|
|
||||||
# <- { "event": "BALLOON_CHANGE",
|
|
||||||
# "data": { "actual": 944766976 },
|
|
||||||
# "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }
|
|
||||||
#
|
|
||||||
##
|
|
||||||
{ 'event': 'BALLOON_CHANGE',
|
|
||||||
'data': { 'actual': 'int' } }
|
|
||||||
|
|
||||||
##
|
|
||||||
# @MEM_UNPLUG_ERROR:
|
|
||||||
#
|
|
||||||
# Emitted when memory hot unplug error occurs.
|
|
||||||
#
|
|
||||||
# @device: device name
|
|
||||||
#
|
|
||||||
# @msg: Informative message
|
|
||||||
#
|
|
||||||
# Since: 2.4
|
|
||||||
#
|
|
||||||
# Example:
|
|
||||||
#
|
|
||||||
# <- { "event": "MEM_UNPLUG_ERROR"
|
|
||||||
# "data": { "device": "dimm1",
|
|
||||||
# "msg": "acpi: device unplug for unsupported device"
|
|
||||||
# },
|
|
||||||
# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
|
|
||||||
#
|
|
||||||
##
|
|
||||||
{ 'event': 'MEM_UNPLUG_ERROR',
|
|
||||||
'data': { 'device': 'str', 'msg': 'str' } }
|
|
||||||
|
|
||||||
##
|
|
||||||
# @DUMP_COMPLETED:
|
|
||||||
#
|
|
||||||
# Emitted when background dump has completed
|
|
||||||
#
|
|
||||||
# @result: DumpQueryResult type described in qapi-schema.json.
|
|
||||||
#
|
|
||||||
# @error: human-readable error string that provides
|
|
||||||
# hint on why dump failed. Only presents on failure. The
|
|
||||||
# user should not try to interpret the error string.
|
|
||||||
#
|
|
||||||
# Since: 2.6
|
|
||||||
#
|
|
||||||
# Example:
|
|
||||||
#
|
|
||||||
# { "event": "DUMP_COMPLETED",
|
|
||||||
# "data": {"result": {"total": 1090650112, "status": "completed",
|
|
||||||
# "completed": 1090650112} } }
|
|
||||||
#
|
|
||||||
##
|
|
||||||
{ 'event': 'DUMP_COMPLETED' ,
|
|
||||||
'data': { 'result': 'DumpQueryResult', '*error': 'str' } }
|
|
Loading…
Reference in New Issue