projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit2f61120c10da9128357510debc8e66880cd2bfdc
tree93a4c76654a011b7fcd93f1b35f00db9ae236145tree | snapshot
parentb4a8c9ae9758efb6873097f415e9972127ccf418commit | diff
parent056f49ff2cf645dc484956b00b65a3aa18a1a9a3commit | diff
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>
vl.c diff1 | diff2 | blob | history
Domain: SDK / Emulator;