[Qemu-commits] [qemu/qemu] dde3a2: hmp: migrate command (without -d) now blocks corre...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: dde3a2184074f5c4279fd7fbfc597b5dc5859fb8
      
https://github.com/qemu/qemu/commit/dde3a2184074f5c4279fd7fbfc597b5dc5859fb8
  Author: Soramichi AKIYAMA <address@hidden>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M hmp.c

  Log Message:
  -----------
  hmp: migrate command (without -d) now blocks correctly

This patch fixes a timing issue that migrate command (without -d) does not
block in some cases.

The original version of hmp.c:hmp_migrate_status_cb checks if the
migration status is 'active' or not to detect the completion of a migration.

However, if this function is executed when the migration status is stil
'setup' (the status before 'active'), migration command returns
immediately even if the user does not specify -d option.

Signed-off-by: Soramichi Akiyama <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: ff9ec34de8f6a37bd29ac72c0c4c94bd5d43d7b0
      
https://github.com/qemu/qemu/commit/ff9ec34de8f6a37bd29ac72c0c4c94bd5d43d7b0
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M scripts/qmp/qmp-shell

  Log Message:
  -----------
  QMP: allow JSON dict arguments in qmp-shell

qmp-shell hides the QMP wire protocol JSON encoding from the user.  Most
of the time this is helpful and makes the command-line human-friendly.

Some QMP commands take a dict as an argument.  In order to express this
we need to revert back to JSON notation.

This patch allows JSON dict arguments in qmp-shell so commands like
blockdev-add and nbd-server-start can be invoked:

  (QEMU) blockdev-add options={"driver":"file","id":"drive1",...}

Note that spaces are not allowed since str.split() is used to break up
the command-line arguments first.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 84d18f065fb041a1c0d78d20320d740ae0673c8a
      
https://github.com/qemu/qemu/commit/84d18f065fb041a1c0d78d20320d740ae0673c8a
  Author: Markus Armbruster <address@hidden>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M block.c
    M block/blkdebug.c
    M block/blkverify.c
    M block/curl.c
    M block/gluster.c
    M block/iscsi.c
    M block/nbd.c
    M block/qapi.c
    M block/qcow2.c
    M block/raw-posix.c
    M block/raw-win32.c
    M block/raw_bsd.c
    M block/rbd.c
    M block/sheepdog.c
    M block/snapshot.c
    M block/vvfat.c
    M blockdev.c
    M blockjob.c
    M hmp.c
    M hw/pci/pci-hotplug-old.c
    M hw/usb/dev-network.c
    M net/net.c
    M qdev-monitor.c
    M qemu-char.c
    M qemu-img.c
    M qga/commands-posix.c
    M qga/commands-win32.c
    M savevm.c
    M tests/test-qmp-input-strict.c
    M tests/test-qmp-input-visitor.c
    M tests/test-qmp-output-visitor.c
    M tests/test-string-input-visitor.c
    M tests/test-string-output-visitor.c
    M tpm.c
    M util/qemu-config.c
    M util/qemu-option.c
    M vl.c

  Log Message:
  -----------
  Use error_is_set() only when necessary

error_is_set(&var) is the same as var != NULL, but it takes
whole-program analysis to figure that out.  Unnecessarily hard for
optimizers, static checkers, and human readers.  Dumb it down to
obvious.

Gets rid of several dozen Coverity false positives.

Note that the obvious form is already used in many places.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 77d1c3c63fb18c3675d8c80262bbd172f646556a
      
https://github.com/qemu/qemu/commit/77d1c3c63fb18c3675d8c80262bbd172f646556a
  Author: Martin Kletzander <address@hidden>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M qapi-schema.json
    M qemu-char.c
    M qmp-commands.hx

  Log Message:
  -----------
  qmp: expose list of supported character device backends

Introduce 'query-chardev-backends' QMP command which lists all
supported character device backends.

Signed-off-by: Martin Kletzander <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: fca72d9b4994343dd1e48d9bb9f45914f4429cfb
      
https://github.com/qemu/qemu/commit/fca72d9b4994343dd1e48d9bb9f45914f4429cfb
  Author: Hani Benhabiles <address@hidden>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: Add device_del id argument completion.

Signed-off-by: Hani Benhabiles <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 992d3e64c89bd2af1ae005080636e8da43c1b500
      
https://github.com/qemu/qemu/commit/992d3e64c89bd2af1ae005080636e8da43c1b500
  Author: Hani Benhabiles <address@hidden>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: Add device_add device argument completion.

Signed-off-by: Hani Benhabiles <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: b48fa074b565131bd0782d122d54c001acfed86f
      
https://github.com/qemu/qemu/commit/b48fa074b565131bd0782d122d54c001acfed86f
  Author: Hani Benhabiles <address@hidden>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: Add object_del id argument completion.

Signed-off-by: Hani Benhabiles <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 1094fd3a6219923c8d1abfc7dee5af996a181e7a
      
https://github.com/qemu/qemu/commit/1094fd3a6219923c8d1abfc7dee5af996a181e7a
  Author: Hani Benhabiles <address@hidden>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: Add object_add class argument completion.

Signed-off-by: Hani Benhabiles <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 4c0c9bbe78901a706497a8fa1a27935bafc20cf7
      
https://github.com/qemu/qemu/commit/4c0c9bbe78901a706497a8fa1a27935bafc20cf7
  Author: Peter Maydell <address@hidden>
  Date:   2014-02-20 (Thu, 20 Feb 2014)

  Changed paths:
    M block.c
    M block/blkdebug.c
    M block/blkverify.c
    M block/curl.c
    M block/gluster.c
    M block/iscsi.c
    M block/nbd.c
    M block/qapi.c
    M block/qcow2.c
    M block/raw-posix.c
    M block/raw-win32.c
    M block/raw_bsd.c
    M block/rbd.c
    M block/sheepdog.c
    M block/snapshot.c
    M block/vvfat.c
    M blockdev.c
    M blockjob.c
    M hmp.c
    M hw/pci/pci-hotplug-old.c
    M hw/usb/dev-network.c
    M monitor.c
    M net/net.c
    M qapi-schema.json
    M qdev-monitor.c
    M qemu-char.c
    M qemu-img.c
    M qga/commands-posix.c
    M qga/commands-win32.c
    M qmp-commands.hx
    M savevm.c
    M scripts/qmp/qmp-shell
    M tests/test-qmp-input-strict.c
    M tests/test-qmp-input-visitor.c
    M tests/test-qmp-output-visitor.c
    M tests/test-string-input-visitor.c
    M tests/test-string-output-visitor.c
    M tpm.c
    M util/qemu-config.c
    M util/qemu-option.c
    M vl.c

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

* remotes/qmp-unstable/queue/qmp:
  monitor: Add object_add class argument completion.
  monitor: Add object_del id argument completion.
  monitor: Add device_add device argument completion.
  monitor: Add device_del id argument completion.
  qmp: expose list of supported character device backends
  Use error_is_set() only when necessary
  QMP: allow JSON dict arguments in qmp-shell
  hmp: migrate command (without -d) now blocks correctly

Conflicts:
        blockdev.c

[PMM: resolved trivial conflict in blockdev.c]
Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/46eef33b89e9...4c0c9bbe7890