Merge remote branch 'luiz/queue/qmp' into qmpq
authorEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Tue, 14 Jan 2014 02:09:59 +0000 (12:09 +1000)
committerEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Tue, 14 Jan 2014 02:10:08 +0000 (12:10 +1000)
commit133fe77437d3a23bf1fd70a231b4f29d5fa0571c
tree89450efd322bd414e941e30dfc991652892e4a3e
parent73c694565c6144e0c4e15041b5250a04a25107c3
parentc950114286ea358a93ce632db0421945e1008395
Merge remote branch 'luiz/queue/qmp' into qmpq

* luiz/queue/qmp:
  migration: qmp_migrate(): keep working after syntax error
  qerror: Remove assert_no_error()
  qemu-option: Remove qemu_opts_create_nofail
  target-i386: Remove assert_no_error usage
  hw: Remove assert_no_error usages
  qdev: Delete dead code
  error: Add error_abort
  monitor: add object-add (QMP) and object_add (HMP) command
  monitor: add object-del (QMP) and object_del (HMP) command
  qom: catch errors in object_property_add_child
  qom: fix leak for objects created with -object
  rng: initialize file descriptor to -1
  qemu-monitor: HMP cpu-add wrapper
  vl: add missing transition debug->finish_migrate

Message-Id: 1389045795-18706-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
block/iscsi.c
block/sheepdog.c
blockdev.c
hw/core/qdev.c
migration.c
qapi-schema.json
qdev-monitor.c
qom/object.c
target-arm/cpu.c
target-i386/cpu.c
vl.c