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

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

[Luiz Capitulino]

Anthony,

The following patches have been sent to the list and look good to me. I've
also tested them.

The changes (since 344eecf6995f4a0ad1d887cec922f6806f91a3f8) are available
in the following repository:

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

Jan Kiszka (1):
      Fix qjson test of solidus encoding

Luiz Capitulino (1):
      configure: Copy test data to build directory

 check-qjson.c |    3 ++-
 configure     |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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

[Anthony Liguori]

On 09/06/2011 11:44 AM, Luiz Capitulino wrote:
> Anthony,
>
> The following patches have been sent to the list and look good to me. I've
> also tested them.


Pulled.  Thanks.

Regards,

Anthony Liguori

>
> The changes (since 344eecf6995f4a0ad1d887cec922f6806f91a3f8) are available
> in the following repository:
>
>      git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>
> Jan Kiszka (1):
>        Fix qjson test of solidus encoding
>
> Luiz Capitulino (1):
>        configure: Copy test data to build directory
>
>   check-qjson.c |    3 ++-
>   configure     |    2 +-
>   2 files changed, 3 insertions(+), 2 deletions(-)
>
>
>

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

[Luiz Capitulino]

The changes (since 7cd5da7eef152a533c5774effd2e7bbfa5976c86) are available
in the following repository:

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

Markus Armbruster (1):
  monitor: assert monitor_puts()'s loop invariant

Wen Congyang (1):
  target-i386: fix bits 39:32 of the final physical address when using
    4M page

 monitor.c                         |  1 +
 target-i386/arch_memory_mapping.c | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

-- 
1.8.0

[Qemu-devel] [PULL 1/2] target-i386: fix bits 39:32 of the final physical address when using 4M page

[Luiz Capitulino]

From: Wen Congyang <wency@cn.fujitsu.com>

((pde & 0x1fe000) << 19) is the bits 39:32 of the final physical address, and
we shouldn't use unit32_t to calculate it. Convert the type to hwaddr to fix
this problem.

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 target-i386/arch_memory_mapping.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c
index c6c7874..844893f 100644
--- a/target-i386/arch_memory_mapping.c
+++ b/target-i386/arch_memory_mapping.c
@@ -115,7 +115,7 @@ static void walk_pde2(MemoryMappingList *list,
                       hwaddr pde_start_addr, int32_t a20_mask,
                       bool pse)
 {
-    hwaddr pde_addr, pte_start_addr, start_paddr;
+    hwaddr pde_addr, pte_start_addr, start_paddr, high_paddr;
     uint32_t pde;
     target_ulong line_addr, start_vaddr;
     int i;
@@ -130,8 +130,13 @@ static void walk_pde2(MemoryMappingList *list,
 
         line_addr = (((unsigned int)i & 0x3ff) << 22);
         if ((pde & PG_PSE_MASK) && pse) {
-            /* 4 MB page */
-            start_paddr = (pde & ~0x3fffff) | ((pde & 0x1fe000) << 19);
+            /*
+             * 4 MB page:
+             * bits 39:32 are bits 20:13 of the PDE
+             * bit3 31:22 are bits 31:22 of the PDE
+             */
+            high_paddr = ((hwaddr)(pde & 0x1fe000) << 19);
+            start_paddr = (pde & ~0x3fffff) | high_paddr;
             if (cpu_physical_memory_is_io(start_paddr)) {
                 /* I/O region */
                 continue;
-- 
1.8.0

[Qemu-devel] [PULL 2/2] monitor: assert monitor_puts()'s loop invariant

[Luiz Capitulino]

From: Markus Armbruster <armbru@redhat.com>

Chiefly to hush up Coverity.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/monitor.c b/monitor.c
index 9cf419b..c6eac60 100644
--- a/monitor.c
+++ b/monitor.c
@@ -270,6 +270,7 @@ static void monitor_puts(Monitor *mon, const char *str)
     char c;
 
     for(;;) {
+        assert(mon->outbuf_index < sizeof(mon->outbuf) - 1);
         c = *str++;
         if (c == '\0')
             break;
-- 
1.8.0

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

[Anthony Liguori]

Pulled, thanks.

N.B.  This note may be extraneous because the pull request was sent by a
version of git older than 1.7.9 making the pull request ambigious.  Please
consider upgrading to a newer version of git.

Regards,

Anthony Liguori

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

[Luiz Capitulino]

Two important fixes.

The changes (since 09dada400328d75daf79e3eca1e48e024fec148d) are available
in the following repository:

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

Amos Kong (1):
  monitor: fix the wrong order of releasing keys

Luiz Capitulino (1):
  virtio-balloon: fix integer overflow in BALLOON_CHANGE QMP event

 hw/virtio/virtio-balloon.c | 2 +-
 ui/input.c                 | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

-- 
1.8.1.4

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

[Luiz Capitulino]

The following changes since commit 6453a3a69488196f26d12654c6b148446abdf3d6:

  Merge remote-tracking branch 'quintela/migration.next' into staging (2013-07-15 14:49:16 -0500)

are available in the git repository at:


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

for you to fetch changes up to f9b1d9b20f5d25b95f67a498e312f625d168fc51:

  qmp: update send-key document (2013-07-17 16:00:26 -0400)

----------------------------------------------------------------
Amos Kong (1):
      qmp: update send-key document

Luiz Capitulino (1):
      qapi: qapi-commands: fix possible leaks on visitor dealloc

 qmp-commands.hx          |  7 +++++--
 scripts/qapi-commands.py | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

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

[Luiz Capitulino]

I've dropped the two series which need to be respun. As the fix I have from
Paolo is pending for a long time, I figure it's better to send what I have
in the queue now.

The following changes since commit f8251db121c3f051b22a7536b97d160c30bcccd4:

  Merge remote-tracking branch 'agraf/tags/signed-ppc-for-upstream' into staging (2013-12-19 17:03:17 -0800)

are available in the git repository at:


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

for you to fetch changes up to 15e509df38e2ae88dd045cdce62edacd033c8386:

  qemu-monitor: HMP cpu-add wrapper (2013-12-20 08:32:26 -0500)

----------------------------------------------------------------
Jason J. Herne (1):
      qemu-monitor: HMP cpu-add wrapper

Paolo Bonzini (1):
      vl: add missing transition debug->finish_migrate

 hmp-commands.hx | 13 +++++++++++++
 hmp.c           | 10 ++++++++++
 hmp.h           |  1 +
 vl.c            |  1 +
 4 files changed, 25 insertions(+)

-- 
1.8.1.4

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

[Luiz Capitulino]

On Fri, 20 Dec 2013 11:38:54 -0500
Luiz Capitulino <lcapitulino@redhat.com> wrote:

> I've dropped the two series which need to be respun. As the fix I have from
> Paolo is pending for a long time, I figure it's better to send what I have
> in the queue now.

Please, don't pull this one. I'm working on a more complete pull request,
will send it in some minutes.

[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(-)

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