From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 15 Sep 2014 18:44:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
X-Git-Tag: pull-nvme-20200902~4552
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cc35a44cf7b522b1fd0b786562b7de4b881c41b0;p=qemu-nvme.git

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>
---

cc35a44cf7b522b1fd0b786562b7de4b881c41b0