[Qemu-devel] [PULL 0/2] QMP queue

[Qemu-devel] [PULL 0/2] QMP queue

[Luiz Capitulino]

Two trivial fixes.

The following changes since commit 6cd14054b67774cc58a51fca6660cfa1d3c08059:

  libqos virtio: Increase ISR timeout (2014-09-12 13:58:07 +0100)

are available in the git repository at:

  git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

for you to fetch changes up to e4d9df4fb16861f413374b69fcdb12c8c7a4a17e:

  exec: file_ram_alloc(): print error when prealloc fails (2014-09-12 11:22:21 -0400)

----------------------------------------------------------------
Gonglei (1):
      monitor: fix debug print compiling error

Luiz Capitulino (1):
      exec: file_ram_alloc(): print error when prealloc fails

 exec.c    | 1 +
 monitor.c | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

[Qemu-devel] [PULL 1/2] monitor: fix debug print compiling error

[Luiz Capitulino]

From: Gonglei <arei.gonglei@huawei.com>

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

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/monitor.c b/monitor.c
index 34cee74..667efb7 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4747,8 +4747,11 @@ static void monitor_find_completion(void *opaque,
         return;
     }
 #ifdef DEBUG_COMPLETION
-    for (i = 0; i < nb_args; i++) {
-        monitor_printf(mon, "arg%d = '%s'\n", i, args[i]);
+    {
+        int i;
+        for (i = 0; i < nb_args; i++) {
+            monitor_printf(mon, "arg%d = '%s'\n", i, args[i]);
+        }
     }
 #endif
 
-- 
1.9.3

[Qemu-devel] [PULL 2/2] exec: file_ram_alloc(): print error when prealloc fails

[Luiz Capitulino]

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 <lcapitulino@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 exec.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/exec.c b/exec.c
index 7dddcc8..cb73d16 100644
--- a/exec.c
+++ b/exec.c
@@ -1130,6 +1130,7 @@ static void *file_ram_alloc(RAMBlock *block,
 
 error:
     if (mem_prealloc) {
+        error_report("%s\n", error_get_pretty(*errp));
         exit(1);
     }
     return NULL;
-- 
1.9.3

Re: [Qemu-devel] [PULL 0/2] QMP queue

[Peter Maydell]

On 12 September 2014 13:26, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> Two trivial fixes.
>
> The following changes since commit 6cd14054b67774cc58a51fca6660cfa1d3c08059:
>
>   libqos virtio: Increase ISR timeout (2014-09-12 13:58:07 +0100)
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>
> for you to fetch changes up to e4d9df4fb16861f413374b69fcdb12c8c7a4a17e:
>
>   exec: file_ram_alloc(): print error when prealloc fails (2014-09-12 11:22:21 -0400)
>
> ----------------------------------------------------------------
> Gonglei (1):
>       monitor: fix debug print compiling error
>
> Luiz Capitulino (1):
>       exec: file_ram_alloc(): print error when prealloc fails
>
>  exec.c    | 1 +
>  monitor.c | 7 +++++--
>  2 files changed, 6 insertions(+), 2 deletions(-)

Applied, thanks.

-- PMM