[Qemu-commits] [qemu/qemu] 1454ac: docs: grammar fixes to qmp-events

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1454ac68af227145d2c336a3b55161cb785e32c4
      
https://github.com/qemu/qemu/commit/1454ac68af227145d2c336a3b55161cb785e32c4
  Author: Eric Blake <address@hidden>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M docs/qmp/qmp-events.txt

  Log Message:
  -----------
  docs: grammar fixes to qmp-events

When converting to qmp events, commits 7cfadb6b and a6330785
fixed some grammar as part of moving text between files.  But
since dfab4892 later restored this file to the state prior to
qmp events, we have to do it again.

* docs/qmp/qmp-events.txt (RESET, SPICE_INITIALIZED): Tweak.

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Wenchao Xia <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: f8ecd94501e43d82de2e6102f5fe4de042cbe3ca
      
https://github.com/qemu/qemu/commit/f8ecd94501e43d82de2e6102f5fe4de042cbe3ca
  Author: Eric Blake <address@hidden>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M docs/qmp/qmp-events.txt

  Log Message:
  -----------
  docs: split SPICE_* event docs

For consistency with the rest of this file, every event should be
listed in isolation.  Compare how commit 7cfadb6b split
SPICE_CONNECTED and SPICE_DISCONNECTED into separate qmp events.

* docs/qmp/qmp-events.txt (SPICE_CONNECTED, SPICE_DISCONNECTED):
Split.

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Wenchao Xia <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 5e255004f57294cddb7adc9f862747713589949e
      
https://github.com/qemu/qemu/commit/5e255004f57294cddb7adc9f862747713589949e
  Author: Eric Blake <address@hidden>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M docs/qmp/qmp-events.txt

  Log Message:
  -----------
  docs: document missing SPICE_MIGRATE_COMPLETED event

The SPICE_MIGRATE_COMPLETED event was first documented in
7cfadb6b.  But since dfab4892 later restored this file to the
state prior to qmp events, and we never documented it in the
past, anyone using this file instead of qapi will miss out on
this event.

* docs/qmp/qmp-events.txt (SPICE_MIGRATE_COMPLETED): Add.

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Wenchao Xia <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: db52658b38fea4e54c23c9cfbced9478d368aa84
      
https://github.com/qemu/qemu/commit/db52658b38fea4e54c23c9cfbced9478d368aa84
  Author: Eric Blake <address@hidden>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M docs/qmp/qmp-events.txt

  Log Message:
  -----------
  docs: document missing POWERDOWN event

The POWERDOWN event was first documented in 0aab9ec3.  But since
dfab4892 later restored this file to the state prior to qmp events,
and we never documented it in the past, anyone using this file
instead of qapi will miss out on this event.  Tweak the existing
wording of SHUTDOWN to match 84321831, and make the difference
between the two events apparent.

* docs/qmp/qmp-events.txt (POWERDOWN): Add.
(SHUTDOWN): Tweak.

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Wenchao Xia <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 032baddea36330384b3654fcbfafa74cc815471c
      
https://github.com/qemu/qemu/commit/032baddea36330384b3654fcbfafa74cc815471c
  Author: Eric Blake <address@hidden>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M docs/qmp/qmp-events.txt

  Log Message:
  -----------
  docs: document missing VSERPORT_CHANGE event

The VSERPORT_CHANGE event was added in e2ae6159.  The patch for
this event was prepared at a time when this file was gone, even
though it got applied immediately after dfab4892 restored this
file.  Duplicate the documentation into this file, so that
anyone using this file instead of qapi will not miss out on this
new event.

* docs/qmp/qmp-events.txt (VSERPORT_CHANGE): Add.

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Wenchao Xia <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 3b257486639cf6c25e1f3a744d1f19e6b4efdc7a
      
https://github.com/qemu/qemu/commit/3b257486639cf6c25e1f3a744d1f19e6b4efdc7a
  Author: Peter Maydell <address@hidden>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M docs/qmp/qmp-events.txt

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging

* remotes/qmp-unstable/queue/qmp:
  docs: document missing VSERPORT_CHANGE event
  docs: document missing POWERDOWN event
  docs: document missing SPICE_MIGRATE_COMPLETED event
  docs: split SPICE_* event docs
  docs: grammar fixes to qmp-events

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/a537d373b9f3...3b257486639c