From: Peter Maydell <peter.maydell@linaro.org>
Date: Sat, 1 Feb 2014 23:32:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'qmp-unstable/queue/qmp' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2f61120c10da9128357510debc8e66880cd2bfdc;p=qemu.git

Merge remote-tracking branch 'qmp-unstable/queue/qmp' into staging

* qmp-unstable/queue/qmp:
  monitor: Cleanup mon->outbuf on write error
  virtio_rng: replace custom backend API with UserCreatable.complete() callback
  add optional 2nd stage initialization to -object/object-add commands
  vl.c: -object: don't ignore duplicate 'id'
  object_add: consolidate error handling

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

2f61120c10da9128357510debc8e66880cd2bfdc