Commit ecd7a0d5 authored by Dominik Csapak's avatar Dominik Csapak Committed by Markus Armbruster
Browse files

qmp: Add reason to SHUTDOWN and RESET events 



This makes it possible to determine what the exact reason was for
a RESET or a SHUTDOWN. A management layer might need the specific reason
of those events to determine which cleanups or other actions it needs to do.

This patch also updates the iotests to the new expected output that includes
the reason.

Signed-off-by: default avatarDominik Csapak <d.csapak@proxmox.com>
Message-Id: <20181205110131.23049-3-d.csapak@proxmox.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
[Commit message tweaked]
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent d43013e2

qapi/run-state.json

+6 −2
Original line number Diff line number Diff line
@@ -141,6 +141,8 @@ 
# a guest-initiated ACPI shutdown request or other hardware-specific action)

# rather than a host request (such as sending qemu a SIGINT). (since 2.10)

#

# @reason: The @ShutdownCause which resulted in the SHUTDOWN. (since 4.0)

#

# Note: If the command-line option "-no-shutdown" has been specified, qemu will

# not exit, and a STOP event will eventually follow the SHUTDOWN event

#
@@ -152,7 +154,7 @@ 
#      "timestamp": { "seconds": 1267040730, "microseconds": 682951 } }

#

##

{ 'event': 'SHUTDOWN', 'data': { 'guest': 'bool' } }

{ 'event': 'SHUTDOWN', 'data': { 'guest': 'bool', 'reason': 'ShutdownCause' } }



##

# @POWERDOWN:
@@ -180,6 +182,8 @@ 
# rather than a host request (such as the QMP command system_reset).

# (since 2.10)

#

# @reason: The @ShutdownCause of the RESET. (since 4.0)

#

# Since: 0.12.0

#

# Example:
@@ -188,7 +192,7 @@ 
#      "timestamp": { "seconds": 1267041653, "microseconds": 9518 } }

#

##

{ 'event': 'RESET', 'data': { 'guest': 'bool' } }

{ 'event': 'RESET', 'data': { 'guest': 'bool', 'reason': 'ShutdownCause' } }



##

# @STOP:

tests/qemu-iotests/060.out

+2 −2
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ QMP_VERSION 
write failed: Input/output error

{"return": ""}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}



=== Testing incoming inactive corrupted image ===
@@ -430,7 +430,7 @@ qcow2: Image is corrupt: L2 table offset 0x2a2a2a00 unaligned (L1 index: 0); fur 
{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_IMAGE_CORRUPTED", "data": {"device": "", "msg": "L2 table offset 0x2a2a2a00 unaligned (L1 index: 0)", "node-name": "drive", "fatal": false}}

{"return": ""}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}



    corrupt: false

*** done

tests/qemu-iotests/071.out

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ QMP_VERSION 
read failed: Input/output error

{"return": ""}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}





=== Testing blkverify on existing block device ===
@@ -85,7 +85,7 @@ wrote 512/512 bytes at offset 0 
read failed: Input/output error

{"return": ""}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}

QEMU_PROG: Failed to flush the L2 table cache: Input/output error

QEMU_PROG: Failed to flush the refcount block cache: Input/output error

tests/qemu-iotests/081.out

+7 −7
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ read 10485760/10485760 bytes at offset 0 
10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

{"return": ""}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}





== using quorum rewrite corrupted mode ==
@@ -80,7 +80,7 @@ QMP_VERSION 
{"return": {}}

{"return": {}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}



Testing:

QMP_VERSION
@@ -89,7 +89,7 @@ QMP_VERSION 
{"return": {}}

{"error": {"class": "GenericError", "desc": "Cannot add a child to a quorum in blkverify mode"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}





== dynamically removing a child from a quorum ==
@@ -99,7 +99,7 @@ QMP_VERSION 
{"return": {}}

{"return": {}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}



Testing:

QMP_VERSION
@@ -107,7 +107,7 @@ QMP_VERSION 
{"return": {}}

{"error": {"class": "GenericError", "desc": "The number of children cannot be lower than the vote threshold 2"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}



Testing:

QMP_VERSION
@@ -115,7 +115,7 @@ QMP_VERSION 
{"error": {"class": "GenericError", "desc": "blkverify=on can only be set if there are exactly two files and vote-threshold is 2"}}

{"error": {"class": "GenericError", "desc": "Cannot find device=drive0-quorum nor node_name=drive0-quorum"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}



Testing:

QMP_VERSION
@@ -123,6 +123,6 @@ QMP_VERSION 
{"return": {}}

{"error": {"class": "GenericError", "desc": "The number of children cannot be lower than the vote threshold 2"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}



*** done

tests/qemu-iotests/087.out

+6 −6
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ QMP_VERSION 
{"return": {}}

{"error": {"class": "GenericError", "desc": "'node-name' must be specified for the root node"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}





=== Duplicate ID ===
@@ -19,7 +19,7 @@ QMP_VERSION 
{"error": {"class": "GenericError", "desc": "node-name=disk is conflicting with a device id"}}

{"error": {"class": "GenericError", "desc": "Duplicate node name"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}





=== aio=native without O_DIRECT ===
@@ -29,7 +29,7 @@ QMP_VERSION 
{"return": {}}

{"error": {"class": "GenericError", "desc": "aio=native was specified, but it requires cache.direct=on, which was not specified."}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}





=== Encrypted image QCow ===
@@ -41,7 +41,7 @@ QMP_VERSION 
{"return": {}}

{"error": {"class": "GenericError", "desc": "Use of AES-CBC encrypted IMGFMT images is no longer supported in system emulators"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}





=== Encrypted image LUKS ===
@@ -53,7 +53,7 @@ QMP_VERSION 
{"return": {}}

{"return": {}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}





=== Missing driver ===
@@ -64,6 +64,6 @@ QMP_VERSION 
{"return": {}}

{"error": {"class": "GenericError", "desc": "Parameter 'driver' is missing"}}

{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp"}}



*** done