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

[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 1/3] New cpu-max field in query-machines QMP command output

[Luiz Capitulino]

From: Michal Novotny <minovotn@redhat.com>

Alter the query-machines QMP command to output information about
maximum number of CPUs for each machine type with default value
set to 1 in case the number of max_cpus is not set.

Signed-off-by: Michal Novotny <minovotn@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 qapi-schema.json | 5 ++++-
 vl.c             | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/qapi-schema.json b/qapi-schema.json
index db542f6..66808c2 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2861,11 +2861,14 @@
 #
 # @default: #optional whether the machine is default
 #
+# @cpu-max: maximum number of CPUs supported by the machine type
+#           (since 1.5.0)
+#
 # Since: 1.2.0
 ##
 { 'type': 'MachineInfo',
   'data': { 'name': 'str', '*alias': 'str',
-            '*is-default': 'bool' } }
+            '*is-default': 'bool', 'cpu-max': 'int' } }
 
 ##
 # @query-machines:
diff --git a/vl.c b/vl.c
index d694a90..6547b5f 100644
--- a/vl.c
+++ b/vl.c
@@ -1617,6 +1617,7 @@ MachineInfoList *qmp_query_machines(Error **errp)
         }
 
         info->name = g_strdup(m->name);
+        info->cpu_max = !m->max_cpus ? 1 : m->max_cpus;
 
         entry = g_malloc0(sizeof(*entry));
         entry->value = info;
-- 
1.8.1.4

[Qemu-devel] [PULL 2/3] Revert "New QMP command query-cpu-max and HMP command cpu_max"

[Luiz Capitulino]

From: Michal Novotny <minovotn@redhat.com>

This reverts commit 4d700430a20b3d53b7b15bc5f6666f7e570e3f2c as asked by
Luiz. The patch has been obsoleted by extending MachineInfo structure
by cpu-max field.

Signed-off-by: Michal Novotny <minovotn@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 hmp-commands.hx  |  2 --
 hmp.c            |  8 --------
 hmp.h            |  1 -
 monitor.c        |  7 -------
 qapi-schema.json | 11 -----------
 qmp-commands.hx  | 22 ----------------------
 vl.c             |  5 -----
 7 files changed, 56 deletions(-)

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 3d98604..df44906 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1643,8 +1643,6 @@ show qdev device model list
 show roms
 @item info tpm
 show the TPM device
-@item info cpu_max
-show the number of CPUs supported by the machine being emulated.
 @end table
 ETEXI
 
diff --git a/hmp.c b/hmp.c
index dbe9b90..2e35b3d 100644
--- a/hmp.c
+++ b/hmp.c
@@ -750,14 +750,6 @@ void hmp_ringbuf_read(Monitor *mon, const QDict *qdict)
     g_free(data);
 }
 
-void hmp_query_cpu_max(Monitor *mon, const QDict *qdict)
-{
-    int cpu_max;
-
-    cpu_max = qmp_query_cpu_max(NULL);
-    monitor_printf(mon, "Maximum number of CPUs is %d\n", cpu_max);
-}
-
 static void hmp_cont_cb(void *opaque, int err)
 {
     if (!err) {
diff --git a/hmp.h b/hmp.h
index 80e8b41..95fe76e 100644
--- a/hmp.h
+++ b/hmp.h
@@ -42,7 +42,6 @@ void hmp_stop(Monitor *mon, const QDict *qdict);
 void hmp_system_reset(Monitor *mon, const QDict *qdict);
 void hmp_system_powerdown(Monitor *mon, const QDict *qdict);
 void hmp_cpu(Monitor *mon, const QDict *qdict);
-void hmp_query_cpu_max(Monitor *mon, const QDict *qdict);
 void hmp_memsave(Monitor *mon, const QDict *qdict);
 void hmp_pmemsave(Monitor *mon, const QDict *qdict);
 void hmp_ringbuf_write(Monitor *mon, const QDict *qdict);
diff --git a/monitor.c b/monitor.c
index c897e80..0f7d52c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2765,13 +2765,6 @@ static mon_cmd_t info_cmds[] = {
         .mhandler.cmd = hmp_info_tpm,
     },
     {
-        .name       = "cpu_max",
-        .args_type  = "",
-        .params     = "",
-        .help       = "Get maximum number of VCPUs supported by machine",
-        .mhandler.cmd = hmp_query_cpu_max,
-    },
-    {
         .name       = NULL,
     },
 };
diff --git a/qapi-schema.json b/qapi-schema.json
index 66808c2..a184ce6 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1834,17 +1834,6 @@
 { 'command': 'query-migrate-cache-size', 'returns': 'int' }
 
 ##
-## @query-cpu-max
-##
-## query maximum number of CPUs supported by machine
-##
-## Returns: number of CPUs
-##
-## Since: 1.5
-###
-{ 'command': 'query-cpu-max', 'returns': 'int' }
-
-##
 # @ObjectPropertyInfo:
 #
 # @name: the name of the property
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 1e0e11e..4d65422 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -385,28 +385,6 @@ Note: CPUs' indexes are obtained with the 'query-cpus' command.
 EQMP
 
     {
-        .name       = "query-cpu-max",
-        .args_type  = "",
-        .mhandler.cmd_new = qmp_marshal_input_query_cpu_max,
-    },
-
-SQMP
-query-cpu-max
--------------
-
-Get the maximum CPUs supported by the machine being currently
-emulated.
-
-Returns json-int.
-
-Example:
-
--> { "execute": "query-cpu-max" }
-<- { "return": 255 }
-
-EQMP
-
-    {
         .name       = "memsave",
         .args_type  = "val:l,size:i,filename:s,cpu:i?",
         .mhandler.cmd_new = qmp_marshal_input_memsave,
diff --git a/vl.c b/vl.c
index 6547b5f..dd94549 100644
--- a/vl.c
+++ b/vl.c
@@ -662,11 +662,6 @@ StatusInfo *qmp_query_status(Error **errp)
     return info;
 }
 
-int64_t qmp_query_cpu_max(Error **errp)
-{
-    return current_machine->max_cpus;
-}
-
 /***********************************************************/
 /* real time host monotonic timer */
 
-- 
1.8.1.4

[Qemu-devel] [PULL 3/3] qapi: use valid JSON in schema

[Luiz Capitulino]

From: Eric Blake <eblake@redhat.com>

* qapi-schema.json: JSON doesn't allow trailing commas.

Signed-off-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 qapi-schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qapi-schema.json b/qapi-schema.json
index a184ce6..751d3c2 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1600,7 +1600,7 @@
 ##
 { 'union': 'BlockdevAction',
   'data': {
-       'blockdev-snapshot-sync': 'BlockdevSnapshot',
+       'blockdev-snapshot-sync': 'BlockdevSnapshot'
    } }
 
 ##
-- 
1.8.1.4

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

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]

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