projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4a8c9a 056f49f)
Merge remote-tracking branch 'qmp-unstable/queue/qmp' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Sat, 1 Feb 2014 23:32:23 +0000 (23:32 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Sat, 1 Feb 2014 23:32:31 +0000 (23:32 +0000)
* 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>
1  2 
vl.c patch | diff1 | diff2 | blob | history

diff --cc vl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.