[Qemu-commits] [qemu/qemu] 5fb9b5: monitor: fix debug print compiling error

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5fb9b5b9cba9bcf6743a4f884e23152bc9bf4e5a
      
https://github.com/qemu/qemu/commit/5fb9b5b9cba9bcf6743a4f884e23152bc9bf4e5a
  Author: Gonglei <address@hidden>
  Date:   2014-09-12 (Fri, 12 Sep 2014)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: fix debug print compiling error

error: 'i' undeclared (first use in this function)

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: e4d9df4fb16861f413374b69fcdb12c8c7a4a17e
      
https://github.com/qemu/qemu/commit/e4d9df4fb16861f413374b69fcdb12c8c7a4a17e
  Author: Luiz Capitulino <address@hidden>
  Date:   2014-09-12 (Fri, 12 Sep 2014)

  Changed paths:
    M exec.c

  Log Message:
  -----------
  exec: file_ram_alloc(): print error when prealloc fails

If memory allocation fails when using the -mem-prealloc command-line
option, QEMU exits without printing any error information to
the user:

 # qemu [...] -m 1G -mem-prealloc -mem-path /dev/hugepages
 # echo $?
 1

This commit adds an error message, so that we print instead:

 # qemu [...] -m 1G -mem-prealloc -mem-path /dev/hugepages
 qemu: unable to map backing store for hugepages: Cannot allocate memory

Signed-off-by: Luiz Capitulino <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: cc35a44cf7b522b1fd0b786562b7de4b881c41b0
      
https://github.com/qemu/qemu/commit/cc35a44cf7b522b1fd0b786562b7de4b881c41b0
  Author: Peter Maydell <address@hidden>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M exec.c
    M monitor.c

  Log Message:
  -----------
  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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/f2bcdc8de018...cc35a44cf7b5