Commit 633decd7 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'qmp/queue/qmp' into staging 

* qmp/queue/qmp: (48 commits)
  target-ppc: add implementation of query-cpu-definitions (v2)
  target-i386: add implementation of query-cpu-definitions (v2)
  qapi: add query-cpu-definitions command (v2)
  compiler: add macro for GCC weak symbols
  qapi: add query-machines command
  qapi: mark QOM commands stable
  qmp: introduce device-list-properties command
  qmp: add SUSPEND_DISK event
  qmp: qmp-events.txt: add missing doc for the SUSPEND event
  qmp: qmp-events.txt: put events in alphabetical order
  qmp: emit the WAKEUP event when the guest is put to run
  qmp: don't emit the RESET event on wakeup from S3
  scripts: qapi-commands.py: qmp-commands.h: include qdict.h
  docs: writing-qmp-commands.txt: update error section
  error, qerror: drop QDict member
  qerror: drop qerror_table and qerror_format()
  error, qerror: pass desc string to error calls
  error: drop error_get_qobject()/error_set_qobject()
  qemu-ga: switch to the new error format on the wire
  qmp: switch to the new error format on the wire
  ...
parents ac839ccd 70b7660a

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y) 
# qapi



qapi-obj-y = qapi/

qapi-obj-y += qapi-types.o qapi-visit.o



common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o

common-obj-y += qmp.o hmp.o

QMP/qmp-events.txt

+162 −129
Original line number Diff line number Diff line 
                   QEMU Monitor Protocol Events

                   ============================



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



Data:



- "actual": actual level of the guest memory balloon in bytes (json-number)



Example:



{ "event": "BALLOON_CHANGE",

    "data": { "actual": 944766976 },

    "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }



BLOCK_IO_ERROR

--------------
@@ -26,6 +43,57 @@ Example: 
Note: If action is "stop", a STOP event will eventually follow the

BLOCK_IO_ERROR event.



BLOCK_JOB_CANCELLED

-------------------



Emitted when a block job has been cancelled.



Data:



- "type":     Job type ("stream" for image streaming, json-string)

- "device":   Device name (json-string)

- "len":      Maximum progress value (json-int)

- "offset":   Current progress value (json-int)

              On success this is equal to len.

              On failure this is less than len.

- "speed":    Rate limit, bytes per second (json-int)



Example:



{ "event": "BLOCK_JOB_CANCELLED",

     "data": { "type": "stream", "device": "virtio-disk0",

               "len": 10737418240, "offset": 134217728,

               "speed": 0 },

     "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }



BLOCK_JOB_COMPLETED

-------------------



Emitted when a block job has completed.



Data:



- "type":     Job type ("stream" for image streaming, json-string)

- "device":   Device name (json-string)

- "len":      Maximum progress value (json-int)

- "offset":   Current progress value (json-int)

              On success this is equal to len.

              On failure this is less than len.

- "speed":    Rate limit, bytes per second (json-int)

- "error":    Error message (json-string, optional)

              Only present on failure.  This field contains a human-readable

              error message.  There are no semantics other than that streaming

              has failed and clients should not try to interpret the error

              string.



Example:



{ "event": "BLOCK_JOB_COMPLETED",

     "data": { "type": "stream", "device": "virtio-disk0",

               "len": 10737418240, "offset": 10737418240,

               "speed": 0 },

     "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }



DEVICE_TRAY_MOVED

-----------------
@@ -98,6 +166,68 @@ Example: 
Note: If the command-line option "-no-shutdown" has been specified, a STOP

event will eventually follow the SHUTDOWN event.



SPICE_CONNECTED, SPICE_DISCONNECTED

-----------------------------------



Emitted when a SPICE client connects or disconnects.



Data:



- "server": Server information (json-object)

  - "host": IP address (json-string)

  - "port": port number (json-string)

  - "family": address family (json-string, "ipv4" or "ipv6")

- "client": Client information (json-object)

  - "host": IP address (json-string)

  - "port": port number (json-string)

  - "family": address family (json-string, "ipv4" or "ipv6")



Example:



{ "timestamp": {"seconds": 1290688046, "microseconds": 388707},

  "event": "SPICE_CONNECTED",

  "data": {

    "server": { "port": "5920", "family": "ipv4", "host": "127.0.0.1"},

    "client": {"port": "52873", "family": "ipv4", "host": "127.0.0.1"}

}}



SPICE_INITIALIZED

-----------------



Emitted after initial handshake and authentication takes place (if any)

and the SPICE channel is up'n'running



Data:



- "server": Server information (json-object)

  - "host": IP address (json-string)

  - "port": port number (json-string)

  - "family": address family (json-string, "ipv4" or "ipv6")

  - "auth": authentication method (json-string, optional)

- "client": Client information (json-object)

  - "host": IP address (json-string)

  - "port": port number (json-string)

  - "family": address family (json-string, "ipv4" or "ipv6")

  - "connection-id": spice connection id.  All channels with the same id

                     belong to the same spice session (json-int)

  - "channel-type": channel type.  "1" is the main control channel, filter for

                    this one if you want track spice sessions only (json-int)

  - "channel-id": channel id.  Usually "0", might be different needed when

                  multiple channels of the same type exist, such as multiple

                  display channels in a multihead setup (json-int)

  - "tls": whevener the channel is encrypted (json-bool)



Example:



{ "timestamp": {"seconds": 1290688046, "microseconds": 417172},

  "event": "SPICE_INITIALIZED",

  "data": {"server": {"auth": "spice", "port": "5921",

                      "family": "ipv4", "host": "127.0.0.1"},

           "client": {"port": "49004", "family": "ipv4", "channel-type": 3,

                      "connection-id": 1804289383, "host": "127.0.0.1",

                      "channel-id": 0, "tls": true}

}}



STOP

----
@@ -110,6 +240,32 @@ Example: 
{ "event": "STOP",

    "timestamp": { "seconds": 1267041730, "microseconds": 281295 } }



SUSPEND

-------



Emitted when guest enters S3 state.



Data: None.



Example:



{ "event": "SUSPEND",

     "timestamp": { "seconds": 1344456160, "microseconds": 309119 } }



SUSPEND_DISK

------------



Emitted when the guest makes a request to enter S4 state.



Data: None.



Example:



{ "event": "SUSPEND_DISK",

     "timestamp": { "seconds": 1344456160, "microseconds": 309119 } }



Note: QEMU shuts down when entering S4 state.



VNC_CONNECTED

-------------
@@ -200,69 +356,17 @@ Example: 
                    "host": "127.0.0.1", "sasl_username": "luiz" } },

        "timestamp": { "seconds": 1263475302, "microseconds": 150772 } }



SPICE_CONNECTED, SPICE_DISCONNECTED

-----------------------------------



Emitted when a SPICE client connects or disconnects.



Data:



- "server": Server information (json-object)

  - "host": IP address (json-string)

  - "port": port number (json-string)

  - "family": address family (json-string, "ipv4" or "ipv6")

- "client": Client information (json-object)

  - "host": IP address (json-string)

  - "port": port number (json-string)

  - "family": address family (json-string, "ipv4" or "ipv6")



Example:



{ "timestamp": {"seconds": 1290688046, "microseconds": 388707},

  "event": "SPICE_CONNECTED",

  "data": {

    "server": { "port": "5920", "family": "ipv4", "host": "127.0.0.1"},

    "client": {"port": "52873", "family": "ipv4", "host": "127.0.0.1"}

}}





SPICE_INITIALIZED

-----------------



Emitted after initial handshake and authentication takes place (if any)

and the SPICE channel is up'n'running

WAKEUP

------



Data:

Emitted when the guest has woken up from S3 and is running.



- "server": Server information (json-object)

  - "host": IP address (json-string)

  - "port": port number (json-string)

  - "family": address family (json-string, "ipv4" or "ipv6")

  - "auth": authentication method (json-string, optional)

- "client": Client information (json-object)

  - "host": IP address (json-string)

  - "port": port number (json-string)

  - "family": address family (json-string, "ipv4" or "ipv6")

  - "connection-id": spice connection id.  All channels with the same id

                     belong to the same spice session (json-int)

  - "channel-type": channel type.  "1" is the main control channel, filter for

                    this one if you want track spice sessions only (json-int)

  - "channel-id": channel id.  Usually "0", might be different needed when

                  multiple channels of the same type exist, such as multiple

                  display channels in a multihead setup (json-int)

  - "tls": whevener the channel is encrypted (json-bool)

Data: None.



Example:



{ "timestamp": {"seconds": 1290688046, "microseconds": 417172},

  "event": "SPICE_INITIALIZED",

  "data": {"server": {"auth": "spice", "port": "5921",

                      "family": "ipv4", "host": "127.0.0.1"},

           "client": {"port": "49004", "family": "ipv4", "channel-type": 3,

                      "connection-id": 1804289383, "host": "127.0.0.1",

                      "channel-id": 0, "tls": true}

}}



{ "event": "WATCHDOG",

     "timestamp": { "seconds": 1344522075, "microseconds": 745528 } }



WATCHDOG

--------
@@ -282,74 +386,3 @@ Example: 


Note: If action is "reset", "shutdown", or "pause" the WATCHDOG event is

followed respectively by the RESET, SHUTDOWN, or STOP events.
 




BLOCK_JOB_COMPLETED

-------------------



Emitted when a block job has completed.



Data:



- "type":     Job type ("stream" for image streaming, json-string)

- "device":   Device name (json-string)

- "len":      Maximum progress value (json-int)

- "offset":   Current progress value (json-int)

              On success this is equal to len.

              On failure this is less than len.

- "speed":    Rate limit, bytes per second (json-int)

- "error":    Error message (json-string, optional)

              Only present on failure.  This field contains a human-readable

              error message.  There are no semantics other than that streaming

              has failed and clients should not try to interpret the error

              string.



Example:



{ "event": "BLOCK_JOB_COMPLETED",

     "data": { "type": "stream", "device": "virtio-disk0",

               "len": 10737418240, "offset": 10737418240,

               "speed": 0 },

     "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }





BLOCK_JOB_CANCELLED

-------------------



Emitted when a block job has been cancelled.



Data:



- "type":     Job type ("stream" for image streaming, json-string)

- "device":   Device name (json-string)

- "len":      Maximum progress value (json-int)

- "offset":   Current progress value (json-int)

              On success this is equal to len.

              On failure this is less than len.

- "speed":    Rate limit, bytes per second (json-int)



Example:



{ "event": "BLOCK_JOB_CANCELLED",

     "data": { "type": "stream", "device": "virtio-disk0",

               "len": 10737418240, "offset": 134217728,

               "speed": 0 },

     "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }





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



Data:



- "actual": actual level of the guest memory balloon in bytes (json-number)



Example:



{ "event": "BALLOON_CHANGE",

    "data": { "actual": 944766976 },

    "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }

QMP/qmp-spec.txt

+3 −7
Original line number Diff line number Diff line
@@ -106,14 +106,11 @@ completed because of an error condition. 


The format is:



{ "error": { "class": json-string, "data": json-object, "desc": json-string },

  "id": json-value }

{ "error": { "class": json-string, "desc": json-string }, "id": json-value }



 Where,



- The "class" member contains the error class name (eg. "ServiceUnavailable")

- The "data" member contains specific error data and is defined in a

  per-command basis, it will be an empty json-object if the error has no data

- The "class" member contains the error class name (eg. "GenericError")

- The "desc" member is a human-readable error message. Clients should

  not attempt to parse this message.

- The "id" member contains the transaction identification associated with
@@ -173,8 +170,7 @@ S: {"return": {"enabled": true, "present": true}, "id": "example"} 
------------------



C: { "execute": }

S: {"error": {"class": "JSONParsing", "desc": "Invalid JSON syntax", "data":

{}}}

S: {"error": {"class": "GenericError", "desc": "Invalid JSON syntax" } }



3.5 Powerdown event

-------------------

block.c

+1 −0
Original line number Diff line number Diff line
@@ -2445,6 +2445,7 @@ BlockInfoList *qmp_query_block(Error **errp) 
            info->value->inserted->ro = bs->read_only;

            info->value->inserted->drv = g_strdup(bs->drv->format_name);

            info->value->inserted->encrypted = bs->encrypted;

            info->value->inserted->encryption_key_missing = bdrv_key_required(bs);

            if (bs->backing_file[0]) {

                info->value->inserted->has_backing_file = true;

                info->value->inserted->backing_file = g_strdup(bs->backing_file);

block_int.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "qemu-coroutine.h"

#include "qemu-timer.h"

#include "qapi-types.h"

#include "qerror.h"



#define BLOCK_FLAG_ENCRYPT          1

#define BLOCK_FLAG_COMPAT6          4