diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-02-01 23:32:23 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-01 23:32:31 +0000 |
| commit | 2f61120c10da9128357510debc8e66880cd2bfdc (patch) | |
| tree | 93a4c76654a011b7fcd93f1b35f00db9ae236145 /roms | |
| parent | b4a8c9ae9758efb6873097f415e9972127ccf418 (diff) | |
| parent | 056f49ff2cf645dc484956b00b65a3aa18a1a9a3 (diff) | |
| download | qemu-2f61120c10da9128357510debc8e66880cd2bfdc.tar.gz | |
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>
Diffstat (limited to 'roms')
0 files changed, 0 insertions, 0 deletions