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

qmp: Split ShutdownCause host-qmp into quit and system-reset 



It is interesting to know whether the shutdown cause was 'quit' or
'reset', especially when using "--no-reboot". In that case, a management
layer can now determine if the guest wanted a reboot or shutdown, and
can act accordingly.

Changes the output of the reason in the iotests from 'host-qmp' to
'host-qmp-quit'. This does not break compatibility because
the field was introduced in the same version.

Signed-off-by: default avatarDominik Csapak <d.csapak@proxmox.com>
Message-Id: <20181205110131.23049-4-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 ecd7a0d5

qapi/run-state.json

+6 −4
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ 
#

# @host-error: An error prevents further use of guest

#

# @host-qmp: Reaction to a QMP command, like 'quit'

# @host-qmp-quit: Reaction to the QMP command 'quit'

#

# @host-qmp-system-reset: Reaction to the QMP command 'system_reset'

#

# @host-signal: Reaction to a signal, such as SIGINT

#
@@ -89,9 +91,9 @@ 
##

{ 'enum': 'ShutdownCause',

  # Beware, shutdown_caused_by_guest() depends on enumeration order

  'data': [ 'none', 'host-error', 'host-qmp', 'host-signal', 'host-ui',

            'guest-shutdown', 'guest-reset', 'guest-panic',

            'subsystem-reset'] }

  'data': [ 'none', 'host-error', 'host-qmp-quit', 'host-qmp-system-reset',

            'host-signal', 'host-ui', 'guest-shutdown', 'guest-reset',

            'guest-panic', 'subsystem-reset'] }



##

# @StatusInfo:

qmp.c

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ UuidInfo *qmp_query_uuid(Error **errp) 
void qmp_quit(Error **errp)

{

    no_shutdown = 0;

    qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_QMP);

    qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_QMP_QUIT);

}



void qmp_stop(Error **errp)
@@ -109,7 +109,7 @@ void qmp_stop(Error **errp) 


void qmp_system_reset(Error **errp)

{

    qemu_system_reset_request(SHUTDOWN_CAUSE_HOST_QMP);

    qemu_system_reset_request(SHUTDOWN_CAUSE_HOST_QMP_SYSTEM_RESET);

}



void qmp_system_powerdown(Error **erp)

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, "reason": "host-qmp"}}

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



=== 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, "reason": "host-qmp"}}

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



    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, "reason": "host-qmp"}}

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





=== 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, "reason": "host-qmp"}}

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

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, "reason": "host-qmp"}}

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





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

{"return": {}}

{"return": {}}

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

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



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, "reason": "host-qmp"}}

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





== 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, "reason": "host-qmp"}}

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



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, "reason": "host-qmp"}}

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



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, "reason": "host-qmp"}}

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



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, "reason": "host-qmp"}}

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



*** done