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>

diff --cc block/iscsi.c
Simple merge

diff --cc block/sheepdog.c
Simple merge

diff --cc blockdev.c
Simple merge

diff --cc hw/core/qdev.c
Simple merge

diff --cc migration.c
Simple merge

diff --cc qapi-schema.json
Simple merge

diff --cc qdev-monitor.c
Simple merge

diff --cc qom/object.c
Simple merge

diff --cc target-arm/cpu.c
Simple merge

diff --cc target-i386/cpu.c
Simple merge

diff --cc vl.c
Simple merge