diff options
| author | Peter Maydell | 2014-09-15 20:44:34 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-09-15 20:44:34 +0200 |
| commit | cc35a44cf7b522b1fd0b786562b7de4b881c41b0 (patch) | |
| tree | ab9751a4ceac9c6ad57e748a8ab5407c5cbf75aa /include | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | exec: file_ram_alloc(): print error when prealloc fails (diff) | |
| download | qemu-cc35a44cf7b522b1fd0b786562b7de4b881c41b0.tar.gz qemu-cc35a44cf7b522b1fd0b786562b7de4b881c41b0.tar.xz qemu-cc35a44cf7b522b1fd0b786562b7de4b881c41b0.zip | |
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp:
exec: file_ram_alloc(): print error when prealloc fails
monitor: fix debug print compiling error
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions