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

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

[Luiz Capitulino]

The following changes since commit c5fa6c86d0765f837515d1c10654c621724a77e0:

  Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-05-19 14:10:01 +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 fc13d937269c1cd01a4b7720c1dcce01722727a2:

  qapi: zero-initialize all QMP command parameters (2014-05-21 09:25:31 -0400)

----------------------------------------------------------------
Luiz Capitulino (1):
      scripts/qapi.py: Avoid syntax not supported by Python 2.4

Michael Roth (1):
      qapi: zero-initialize all QMP command parameters

Peter Feiner (1):
      doc: add "setup" to list of migration states

 qapi-schema.json         | 2 +-
 qmp-commands.hx          | 2 +-
 scripts/qapi-commands.py | 2 +-
 scripts/qapi.py          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

[Qemu-devel] [PULL 1/3] doc: add "setup" to list of migration states

[Luiz Capitulino]

From: Peter Feiner <peter@gridcentric.ca>

On a slow VM (e.g., nested), you see the "setup" state when you query the
migration status.

Signed-off-by: Peter Feiner <peter@gridcentric.ca>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 qapi-schema.json | 2 +-
 qmp-commands.hx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qapi-schema.json b/qapi-schema.json
index 36cb964..f4ffede 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -691,7 +691,7 @@
 # Information about current migration process.
 #
 # @status: #optional string describing the current migration status.
-#          As of 0.14.0 this can be 'active', 'completed', 'failed' or
+#          As of 0.14.0 this can be 'setup', 'active', 'completed', 'failed' or
 #          'cancelled'. If this field is not returned, no migration process
 #          has been initiated
 #
diff --git a/qmp-commands.hx b/qmp-commands.hx
index cae890e..408ae9c 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2937,7 +2937,7 @@ block migration status.
 The main json-object contains the following:
 
 - "status": migration status (json-string)
-     - Possible values: "active", "completed", "failed", "cancelled"
+     - Possible values: "setup", "active", "completed", "failed", "cancelled"
 - "total-time": total amount of ms since migration started.  If
                 migration has ended, it returns the total migration
                 time (json-int)
-- 
1.9.0

[Qemu-devel] [PULL 2/3] scripts/qapi.py: Avoid syntax not supported by Python 2.4

[Luiz Capitulino]

The Python "except Foo as x" syntax was only introduced in
Python 2.6, but we aim to support Python 2.4 and later.
Use the old-style "except Foo, x" syntax instead, thus
fixing configure/compile on systems with older Python.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 scripts/qapi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/qapi.py b/scripts/qapi.py
index 0265b40..86e9608 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -116,7 +116,7 @@ class QAPISchema:
                     continue
                 try:
                     fobj = open(include_path, 'r')
-                except IOError as e:
+                except IOError, e:
                     raise QAPIExprError(expr_info,
                                         '%s: %s' % (e.strerror, include))
                 exprs_include = QAPISchema(fobj, include, self.include_hist,
-- 
1.9.0

[Qemu-devel] [PULL 3/3] qapi: zero-initialize all QMP command parameters

[Luiz Capitulino]

From: Michael Roth <mdroth@linux.vnet.ibm.com>

In general QMP command parameter values are specified by consumers of the
QMP/HMP interface, but in the case of optional parameters these values may
be left uninitialized.

It is considered a bug for code to make use of optional parameters that have
not been flagged as being present by the marshalling code (via corresponding
has_<parameter> parameter), however our marshalling code will still pass
these uninitialized values on to the corresponding QMP function (to then
be ignored). Some compilers (clang in particular) consider this unsafe
however, and generate warnings as a result. As reported by Peter Maydell:

  This is something clang's -fsanitize=undefined spotted. The
  code generated by qapi-commands.py in qmp-marshal.c for
  qmp_marshal_* functions where there are some optional
  arguments looks like this:

      bool has_force = false;
      bool force;

      mi = qmp_input_visitor_new_strict(QOBJECT(args));
      v = qmp_input_get_visitor(mi);
      visit_type_str(v, &device, "device", errp);
      visit_start_optional(v, &has_force, "force", errp);
      if (has_force) {
          visit_type_bool(v, &force, "force", errp);
      }
      visit_end_optional(v, errp);
      qmp_input_visitor_cleanup(mi);

      if (error_is_set(errp)) {
          goto out;
      }
      qmp_eject(device, has_force, force, errp);

  In the case where has_force is false, we never initialize
  force, but then we use it by passing it to qmp_eject.
  I imagine we don't then actually use the value, but clang
  complains in particular for 'bool' variables because the value
  that ends up being loaded from memory for 'force' is not either
  0 or 1 (being uninitialized stack contents).

Fix this by initializing all QMP command parameters to {0} in the
marshalling code prior to passing them on to the QMP functions.

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 scripts/qapi-commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 386f17e..7d93d01 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -111,7 +111,7 @@ bool has_%(argname)s = false;
                          argname=c_var(argname), argtype=c_type(argtype))
         else:
             ret += mcgen('''
-%(argtype)s %(argname)s;
+%(argtype)s %(argname)s = {0};
 ''',
                          argname=c_var(argname), argtype=c_type(argtype))
 
-- 
1.9.0

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

[Peter Maydell]

On 22 May 2014 14:53, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> The following changes since commit c5fa6c86d0765f837515d1c10654c621724a77e0:
>
>   Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-05-19 14:10:01 +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 fc13d937269c1cd01a4b7720c1dcce01722727a2:
>
>   qapi: zero-initialize all QMP command parameters (2014-05-21 09:25:31 -0400)

Applied, thanks.

-- PMM

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

[Luiz Capitulino]

Three little birds.

The following changes since commit 08ab59770da57648bfb8fc9be37f0ef7fb50b0f9:

  Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging (2014-08-18 12:55:02 +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 b3dd1b8c295636e64ceb14cdc4db6420d7319e38:

  monitor: fix use after free (2014-08-18 14:39:10 -0400)

----------------------------------------------------------------
Chen Gang (1):
      dump.c: Fix memory leak issue in cleanup processing for dump_init()

Hani Benhabiles (1):
      monitor: Remove hardcoded watchdog event names

Michael S. Tsirkin (1):
      monitor: fix use after free

 dump.c                    | 18 +++++-------------
 include/monitor/monitor.h |  2 +-
 monitor.c                 | 19 ++++++++++---------
 stubs/fdset-remove-fd.c   |  3 +--
 4 files changed, 17 insertions(+), 25 deletions(-)

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

[Peter Maydell]

On 18 August 2014 20:26, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> Three little birds.
>
> The following changes since commit 08ab59770da57648bfb8fc9be37f0ef7fb50b0f9:
>
>   Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging (2014-08-18 12:55:02 +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 b3dd1b8c295636e64ceb14cdc4db6420d7319e38:
>
>   monitor: fix use after free (2014-08-18 14:39:10 -0400)
>
> ----------------------------------------------------------------
> Chen Gang (1):
>       dump.c: Fix memory leak issue in cleanup processing for dump_init()
>
> Hani Benhabiles (1):
>       monitor: Remove hardcoded watchdog event names
>
> Michael S. Tsirkin (1):
>       monitor: fix use after free
>
>  dump.c                    | 18 +++++-------------
>  include/monitor/monitor.h |  2 +-
>  monitor.c                 | 19 ++++++++++---------
>  stubs/fdset-remove-fd.c   |  3 +--
>  4 files changed, 17 insertions(+), 25 deletions(-)
>

Applied, thanks.

-- PMM

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

[Luiz Capitulino]

The changes (since 7387de16d0e4d2988df350926537cd12a8e34206) are available
in the following repository:

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

Luiz Capitulino (2):
  MAINTAINERS: new maintainers for qapi-schema.json
  MAINTAINERS: split Monitor (QMP/HMP) entry

Marcelo Tosatti (1):
  correct RTC_CHANGE_EVENT description

 MAINTAINERS        | 26 ++++++++++++++++++++++++--
 QMP/qmp-events.txt |  3 ++-
 2 files changed, 26 insertions(+), 3 deletions(-)

-- 
1.8.1.4

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

[Luiz Capitulino]

On Fri,  7 Jun 2013 15:54:12 -0400
Luiz Capitulino <lcapitulino@redhat.com> wrote:

> The changes (since 7387de16d0e4d2988df350926537cd12a8e34206) are available
> in the following repository:
> 
>     git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
> 
> Luiz Capitulino (2):
>   MAINTAINERS: new maintainers for qapi-schema.json
>   MAINTAINERS: split Monitor (QMP/HMP) entry
> 
> Marcelo Tosatti (1):
>   correct RTC_CHANGE_EVENT description

Anthony, I've replaced Marcelo's patch. Hope this won't disturb
your work flow.

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

[Luiz Capitulino]

One qapi fix and two fixes that affect the dump-guest-memory QMP command.

The changes (since 87d23f78aa79b72da022afda358bbc8a8509ca70) are available
in the following repository:

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

Luiz Capitulino (1):
  target-i386: fix abort on bad PML4E/PDPTE/PDE/PTE addresses

Michael Roth (1):
  qapi: pad GenericList value fields to 64 bits

Qiao Nuohan (1):
  target-i386: Fix mask of pte index in memory mapping

 include/qapi/visitor.h            |  5 ++++-
 scripts/qapi-types.py             | 10 ++++++++--
 target-i386/arch_memory_mapping.c | 12 +++++++-----
 tests/test-qmp-output-visitor.c   |  5 ++++-
 4 files changed, 23 insertions(+), 9 deletions(-)

-- 
1.8.1.4

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

[Anthony Liguori]

Pulled.  Thanks.

Regards,

Anthony Liguori

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

[Luiz Capitulino]

The changes (since 93b48c201eb6c0404d15550a0eaa3c0f7937e35e) are available
in the following repository:

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

Eric Blake (1):
  qapi: use valid JSON in schema

Michal Novotny (2):
  New cpu-max field in query-machines QMP command output
  Revert "New QMP command query-cpu-max and HMP command cpu_max"

 hmp-commands.hx  |  2 --
 hmp.c            |  8 --------
 hmp.h            |  1 -
 monitor.c        |  7 -------
 qapi-schema.json | 18 +++++-------------
 qmp-commands.hx  | 22 ----------------------
 vl.c             |  6 +-----
 7 files changed, 6 insertions(+), 58 deletions(-)

-- 
1.8.1.4

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

[Luiz Capitulino]

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

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

Aurelien Jarno (1):
  hmp: fix info cpus for sparc targets

Paolo Bonzini (2):
  qmp: handle stop/cont in INMIGRATE state
  migration: go to paused state after finishing incoming migration with
    -S

 hmp.c            | 11 +++++------
 migration.c      |  2 +-
 qapi-schema.json | 23 ++++++++++++++---------
 qerror.h         |  3 ---
 qmp.c            | 17 +++++++++++------
 vl.c             |  2 +-
 6 files changed, 32 insertions(+), 26 deletions(-)

-- 
1.7.12.315.g682ce8b

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

[Aurelien Jarno]

On Wed, Oct 24, 2012 at 11:34:37AM -0200, Luiz Capitulino wrote:
> The changes (since a8170e5e97ad17ca169c64ba87ae2f53850dab4c) are available
> in the following repository:
> 
>     git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
> 
> Aurelien Jarno (1):
>   hmp: fix info cpus for sparc targets
> 
> Paolo Bonzini (2):
>   qmp: handle stop/cont in INMIGRATE state
>   migration: go to paused state after finishing incoming migration with
>     -S
> 
>  hmp.c            | 11 +++++------
>  migration.c      |  2 +-
>  qapi-schema.json | 23 ++++++++++++++---------
>  qerror.h         |  3 ---
>  qmp.c            | 17 +++++++++++------
>  vl.c             |  2 +-
>  6 files changed, 32 insertions(+), 26 deletions(-)
> 

Thanks, pulled.


-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net

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

[Luiz Capitulino]

Three little patches. Two fixes from me and a qapi conversion form Corey.

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

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

Corey Bryant (1):
      qapi: Convert getfd and closefd

Luiz Capitulino (2):
      qmp: dump-guest-memory: improve schema doc
      qapi: input_type_enum(): fix error message

 hmp-commands.hx        |  6 ++---
 hmp.c                  | 18 ++++++++++++++
 hmp.h                  |  2 ++
 monitor.c              | 32 +++++++++++-------------
 qapi-schema.json       | 67 +++++++++++++++++++++++++++++++++++++++-----------
 qapi/qapi-visit-core.c |  2 +-
 qmp-commands.hx        | 14 ++++++++---
 7 files changed, 99 insertions(+), 42 deletions(-)

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

[Luiz Capitulino]

A few small fixes from Alon.

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

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

Alon Levy (3):
      qjson.h: include compiler.h for GCC_FMT_ATTR
      qapi-schema: fix typos and explain 'spice' auth
      qapi-schema.json: fix comment for type ObjectPropretyInfo

 qapi-schema.json |   16 +++++++++-------
 qjson.h          |    1 +
 2 files changed, 10 insertions(+), 7 deletions(-)

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

[Anthony Liguori]

On 03/09/2012 02:55 PM, Luiz Capitulino wrote:
> A few small fixes from Alon.
>
> The changes (since dac6b1b22cbad29ca34735a1e56c9feb9586e3c0) are available
> in the following repository:
>
>      git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>
> Alon Levy (3):
>        qjson.h: include compiler.h for GCC_FMT_ATTR
>        qapi-schema: fix typos and explain 'spice' auth
>        qapi-schema.json: fix comment for type ObjectPropretyInfo

Pulled.  Thanks.

Regards,

Anthony Liguori


>
>   qapi-schema.json |   16 +++++++++-------
>   qjson.h          |    1 +
>   2 files changed, 10 insertions(+), 7 deletions(-)
>
>
>