Re: [Qemu-devel] [PULL 00/13] QMP queue

[Anthony Liguori]

On Wed, Dec 18, 2013 at 8:59 AM, Luiz Capitulino <address@hidden> wrote:
> The following changes since commit e157b8fdd412d48eacfbb8c67d3d58780154faa3:
>
>   Merge remote-tracking branch 'bonzini/virtio' into staging (2013-12-13 
> 11:10:33 -0800)
>
> are available in the git repository at:

Sorry, you lost the merge conflict to Peter.  Can you please rebase
and resubmit?

Regards,

Anthony Liguori

>
>
>   git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>
> for you to fetch changes up to 2e89b6d1cd378602f2c8ea982145213aededf0f2:
>
>   qemu-monitor: HMP cpu-add wrapper (2013-12-18 11:12:16 -0500)
>
> ----------------------------------------------------------------
> Jason J. Herne (1):
>       qemu-monitor: HMP cpu-add wrapper
>
> Paolo Bonzini (6):
>       vl: add missing transition debug->finish_migrate
>       rng: initialize file descriptor to -1
>       qom: fix leak for objects created with -object
>       qom: catch errors in object_property_add_child
>       monitor: add object-add (QMP) and object_add (HMP) command
>       monitor: add object-del (QMP) and object_del (HMP) command
>
> Peter Crosthwaite (6):
>       error: Add error_abort
>       hw/core/qdev: Delete dead code
>       hw: Remove assert_no_error usages
>       target-i386: Remove assert_no_error usage
>       qemu-option: Remove qemu_opts_create_nofail
>       qerror: Remove assert_no_error()
>
>  backends/rng-random.c            |  4 +--
>  block/blkdebug.c                 |  2 +-
>  block/blkverify.c                |  2 +-
>  block/curl.c                     |  2 +-
>  block/gluster.c                  |  2 +-
>  block/iscsi.c                    |  2 +-
>  block/nbd.c                      |  3 +-
>  block/qcow2.c                    |  2 +-
>  block/raw-posix.c                |  2 +-
>  block/raw-win32.c                |  5 +--
>  block/rbd.c                      |  2 +-
>  block/sheepdog.c                 |  2 +-
>  block/vvfat.c                    |  2 +-
>  blockdev.c                       |  6 ++--
>  hmp-commands.hx                  | 41 +++++++++++++++++++++
>  hmp.c                            | 77 
> ++++++++++++++++++++++++++++++++++++++++
>  hmp.h                            |  3 ++
>  hw/core/qdev-properties-system.c |  8 ++---
>  hw/core/qdev-properties.c        | 40 ++++++---------------
>  hw/core/qdev.c                   | 28 ++++-----------
>  hw/dma/xilinx_axidma.c           | 13 +++----
>  hw/net/xilinx_axienet.c          | 13 +++----
>  hw/watchdog/watchdog.c           |  3 +-
>  include/hw/xilinx.h              | 14 +++-----
>  include/monitor/monitor.h        |  3 ++
>  include/qapi/error.h             |  6 ++++
>  include/qapi/qmp/qerror.h        |  1 -
>  include/qapi/visitor.h           |  3 +-
>  include/qemu/option.h            |  1 -
>  include/qemu/typedefs.h          |  2 ++
>  qapi-schema.json                 | 34 ++++++++++++++++++
>  qdev-monitor.c                   |  2 +-
>  qemu-img.c                       |  2 +-
>  qmp-commands.hx                  | 51 ++++++++++++++++++++++++++
>  qmp.c                            | 75 ++++++++++++++++++++++++++++++++++++++
>  qobject/qerror.c                 |  8 -----
>  qom/object.c                     |  9 +++--
>  target-i386/cpu.c                |  4 +--
>  util/error.c                     | 22 +++++++++++-
>  util/qemu-config.c               |  2 +-
>  util/qemu-option.c               |  9 -----
>  util/qemu-sockets.c              | 18 +++++-----
>  vl.c                             | 19 ++++++----
>  43 files changed, 400 insertions(+), 149 deletions(-)
>
> --
> 1.8.1.4