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

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

[Luiz Capitulino]

A qapi fix from Markus and a new field to query-block by Benoit.

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

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

Benoît Canet (3):
      block: create bdrv_get_backing_file_depth()
      block: Use bdrv_get_backing_file_depth()
      hmp: show the backing file depth

Luiz Capitulino (1):
      qapi: qapi.py: allow the "'" character to be escaped

 block.c          | 16 ++++++++++++++++
 block.h          |  1 +
 hmp.c            |  2 ++
 qapi-schema.json |  9 ++++++---
 qmp-commands.hx  |  2 ++
 scripts/qapi.py  | 31 +++++++++++++++++++++----------
 6 files changed, 48 insertions(+), 13 deletions(-)

[Qemu-devel] [PATCH 1/4] qapi: qapi.py: allow the "'" character to be escaped

[Luiz Capitulino]

Support escaping the escape character, and make more robust (don't die
for '', handle ' without matching '.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 scripts/qapi.py | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/scripts/qapi.py b/scripts/qapi.py
index 8082af3..d3b8b4d 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -13,18 +13,29 @@ from ordereddict import OrderedDict
 
 def tokenize(data):
     while len(data):
-        if data[0] in ['{', '}', ':', ',', '[', ']']:
-            yield data[0]
-            data = data[1:]
-        elif data[0] in ' \n':
-            data = data[1:]
-        elif data[0] == "'":
-            data = data[1:]
+        ch = data[0]
+        data = data[1:]
+        if ch in ['{', '}', ':', ',', '[', ']']:
+            yield ch
+        elif ch in ' \n':
+            None
+        elif ch == "'":
             string = ''
-            while data[0] != "'":
-                string += data[0]
+            esc = False
+            while True:
+                if (data == ''):
+                    raise Exception("Mismatched quotes")
+                ch = data[0]
                 data = data[1:]
-            data = data[1:]
+                if esc:
+                    string += ch
+                    esc = False
+                elif ch == "\\":
+                    esc = True
+                elif ch == "'":
+                    break
+                else:
+                    string += ch
             yield string
 
 def parse(tokens):
-- 
1.7.11.2.249.g31c7954.dirty

[Qemu-devel] [PATCH 2/4] block: create bdrv_get_backing_file_depth()

[Luiz Capitulino]

From: Benoît Canet <benoit.canet@gmail.com>

Create bdrv_get_backing_file_depth() in order to be able to show
in QMP and HMP how many ancestors backing an image a block device
have.

Signed-off-by: Benoit Canet <benoit@irqsave.net>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 block.c | 13 +++++++++++++
 block.h |  1 +
 2 files changed, 14 insertions(+)

diff --git a/block.c b/block.c
index b38940b..1206bba 100644
--- a/block.c
+++ b/block.c
@@ -2754,6 +2754,19 @@ BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,
     return NULL;
 }
 
+int bdrv_get_backing_file_depth(BlockDriverState *bs)
+{
+    if (!bs->drv) {
+        return 0;
+    }
+
+    if (!bs->backing_hd) {
+        return 0;
+    }
+
+    return 1 + bdrv_get_backing_file_depth(bs->backing_hd);
+}
+
 #define NB_SUFFIXES 4
 
 char *get_human_readable_size(char *buf, int buf_size, int64_t size)
diff --git a/block.h b/block.h
index c89590d..650d872 100644
--- a/block.h
+++ b/block.h
@@ -174,6 +174,7 @@ int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top,
                                             int nb_sectors, int *pnum);
 BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,
     const char *backing_file);
+int bdrv_get_backing_file_depth(BlockDriverState *bs);
 int bdrv_truncate(BlockDriverState *bs, int64_t offset);
 int64_t bdrv_getlength(BlockDriverState *bs);
 int64_t bdrv_get_allocated_file_size(BlockDriverState *bs);
-- 
1.7.11.2.249.g31c7954.dirty

[Qemu-devel] [PATCH 3/4] block: Use bdrv_get_backing_file_depth()

[Luiz Capitulino]

From: Benoît Canet <benoit.canet@gmail.com>

Use the dedicated counting function in qmp_query_block in order to
propagate the backing file depth to HMP and add backing_file_depth
to qmp-commands.hx

Signed-off-by: Benoit Canet <benoit@irqsave.net>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 block.c          | 3 +++
 qapi-schema.json | 9 ++++++---
 qmp-commands.hx  | 2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/block.c b/block.c
index 1206bba..24323c1 100644
--- a/block.c
+++ b/block.c
@@ -2450,6 +2450,9 @@ BlockInfoList *qmp_query_block(Error **errp)
                 info->value->inserted->backing_file = g_strdup(bs->backing_file);
             }
 
+            info->value->inserted->backing_file_depth =
+                bdrv_get_backing_file_depth(bs);
+
             if (bs->io_limits_enabled) {
                 info->value->inserted->bps =
                                bs->io_limits.bps[BLOCK_IO_LIMIT_TOTAL];
diff --git a/qapi-schema.json b/qapi-schema.json
index bc55ed2..b58f5cd 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -398,6 +398,8 @@
 #
 # @backing_file: #optional the name of the backing file (for copy-on-write)
 #
+# @backing_file_depth: number of files in the backing file chain (since: 1.2)
+#
 # @encrypted: true if the backing device is encrypted
 #
 # @bps: total throughput limit in bytes per second is specified
@@ -418,9 +420,10 @@
 ##
 { 'type': 'BlockDeviceInfo',
   'data': { 'file': 'str', 'ro': 'bool', 'drv': 'str',
-            '*backing_file': 'str', 'encrypted': 'bool',
-            'bps': 'int', 'bps_rd': 'int', 'bps_wr': 'int',
-            'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int'} }
+            '*backing_file': 'str', 'backing_file_depth': 'int',
+            'encrypted': 'bool', 'bps': 'int', 'bps_rd': 'int',
+            'bps_wr': 'int', 'iops': 'int', 'iops_rd': 'int',
+            'iops_wr': 'int'} }
 
 ##
 # @BlockDeviceIoStatus:
diff --git a/qmp-commands.hx b/qmp-commands.hx
index e3cf3c5..ac46638 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -1317,6 +1317,7 @@ Each json-object contain the following:
                                 "nbd", "parallels", "qcow", "qcow2", "raw",
                                 "tftp", "vdi", "vmdk", "vpc", "vvfat"
          - "backing_file": backing file name (json-string, optional)
+         - "backing_file_depth": number of files in the backing file chain (json-int)
          - "encrypted": true if encrypted, false otherwise (json-bool)
          - "bps": limit total bytes per second (json-int)
          - "bps_rd": limit read bytes per second (json-int)
@@ -1345,6 +1346,7 @@ Example:
                "drv":"qcow2",
                "encrypted":false,
                "file":"disks/test.img",
+               "backing_file_depth":0,
                "bps":1000000,
                "bps_rd":0,
                "bps_wr":0,
-- 
1.7.11.2.249.g31c7954.dirty

[Qemu-devel] [PATCH 4/4] hmp: show the backing file depth

[Luiz Capitulino]

From: Benoît Canet <benoit.canet@gmail.com>

Signed-off-by: Benoit Canet <benoit@irqsave.net>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 hmp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hmp.c b/hmp.c
index 6b72a64..25688ab 100644
--- a/hmp.c
+++ b/hmp.c
@@ -227,6 +227,8 @@ void hmp_info_block(Monitor *mon)
             if (info->value->inserted->has_backing_file) {
                 monitor_printf(mon, " backing_file=");
                 monitor_print_filename(mon, info->value->inserted->backing_file);
+                monitor_printf(mon, " backing_file_depth=%" PRId64,
+                    info->value->inserted->backing_file_depth);
             }
             monitor_printf(mon, " ro=%d drv=%s encrypted=%d",
                            info->value->inserted->ro,
-- 
1.7.11.2.249.g31c7954.dirty

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

[Anthony Liguori]

Luiz Capitulino <lcapitulino@redhat.com> writes:

> A qapi fix from Markus and a new field to query-block by Benoit.
>
> The changes (since 02d2bd5d57812154cfb978bc2098cf49d551583d) are available
> in the following repository:
>
>     git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>

Pulled. Thanks.

Regards,

Anthony Liguori

> Benoît Canet (3):
>       block: create bdrv_get_backing_file_depth()
>       block: Use bdrv_get_backing_file_depth()
>       hmp: show the backing file depth
>
> Luiz Capitulino (1):
>       qapi: qapi.py: allow the "'" character to be escaped
>
>  block.c          | 16 ++++++++++++++++
>  block.h          |  1 +
>  hmp.c            |  2 ++
>  qapi-schema.json |  9 ++++++---
>  qmp-commands.hx  |  2 ++
>  scripts/qapi.py  | 31 +++++++++++++++++++++----------
>  6 files changed, 48 insertions(+), 13 deletions(-)

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

[Peter Maydell]

On 24 April 2015 at 20:01, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> The following changes since commit e5b3a24181ea0cebf1c5b20f44d016311b7048f0:
>
>   Update version for v2.3.0 release (2015-04-24 15:05:06 +0100)
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/qmp-unstable.git tags/for-upstream
>
> for you to fetch changes up to 2d5a8346a484250934526a15b3a522bdba7e6772:
>
>   qmp: Give saner messages related to qmp_capabilities misuse (2015-04-24 14:18:06 -0400)
>
> ----------------------------------------------------------------
> Four little fixes
>
> ----------------------------------------------------------------


Applied, thanks.

-- PMM

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

[Luiz Capitulino]

The following changes since commit e5b3a24181ea0cebf1c5b20f44d016311b7048f0:

  Update version for v2.3.0 release (2015-04-24 15:05:06 +0100)

are available in the git repository at:

  git://repo.or.cz/qemu/qmp-unstable.git tags/for-upstream

for you to fetch changes up to 2d5a8346a484250934526a15b3a522bdba7e6772:

  qmp: Give saner messages related to qmp_capabilities misuse (2015-04-24 14:18:06 -0400)

----------------------------------------------------------------
Four little fixes

----------------------------------------------------------------
Eric Blake (2):
      qapi: Drop dead genlist parameter
      qmp: Give saner messages related to qmp_capabilities misuse

Luiz Capitulino (1):
      balloon: improve error msg when adding second device

Paolo Bonzini (1):
      qmp-commands: fix incorrect uses of ":O" specifier

 balloon.c                  |  1 -
 hw/virtio/virtio-balloon.c |  2 +-
 monitor.c                  | 23 +++++++++++++++++++----
 qmp-commands.hx            |  4 ++--
 scripts/qapi-visit.py      | 22 +++++++++-------------
 5 files changed, 31 insertions(+), 21 deletions(-)

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

[Peter Maydell]

On 24 February 2015 at 01:55, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> The following changes since commit cd2d5541271f1934345d8ca42f5fafff1744eee7:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150212' into staging (2015-02-13 11:44:50 +0000)
>
> are available in the git repository at:
>
>
>   git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>
> for you to fetch changes up to 912ae9c88669d0a0cbae1f20b8c80dde8e526251:
>
>   qapi-types: add C99 index names to arrays (2015-02-23 11:00:05 -0500)
>
> ----------------------------------------------------------------
> Eric Blake (1):
>       balloon: Fix typo
>
> Gonglei (1):
>       monitor: Fix missing err = NULL in client_migrate_info()
>
> Michael S. Tsirkin (1):
>       qapi-types: add C99 index names to arrays
>
> Stefan Weil (1):
>       hmp: Fix warning from smatch (wrong argument in function call)
>
>  balloon.c             |  6 +++---
>  hmp.c                 |  2 +-
>  monitor.c             |  3 ++-
>  scripts/qapi-types.py | 11 +++++++----
>  4 files changed, 13 insertions(+), 9 deletions(-)

Applied, thanks.

-- PMM

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

[Luiz Capitulino]

The following changes since commit cd2d5541271f1934345d8ca42f5fafff1744eee7:

  Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150212' into staging (2015-02-13 11:44:50 +0000)

are available in the git repository at:


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

for you to fetch changes up to 912ae9c88669d0a0cbae1f20b8c80dde8e526251:

  qapi-types: add C99 index names to arrays (2015-02-23 11:00:05 -0500)

----------------------------------------------------------------
Eric Blake (1):
      balloon: Fix typo

Gonglei (1):
      monitor: Fix missing err = NULL in client_migrate_info()

Michael S. Tsirkin (1):
      qapi-types: add C99 index names to arrays

Stefan Weil (1):
      hmp: Fix warning from smatch (wrong argument in function call)

 balloon.c             |  6 +++---
 hmp.c                 |  2 +-
 monitor.c             |  3 ++-
 scripts/qapi-types.py | 11 +++++++----
 4 files changed, 13 insertions(+), 9 deletions(-)

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

[Luiz Capitulino]

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

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

Luiz Capitulino (4):
  qstring: add qstring_get_length()
  Monitor: Make output buffer dynamic
  hmp: human-monitor-command: stop using the Memory chardev driver
  chardev: drop the Memory chardev driver

 include/qapi/qmp/qstring.h |  1 +
 monitor.c                  | 60 +++++++++++++++++++++++++------------------
 qemu-char.c                | 64 ----------------------------------------------
 qobject/qstring.c          |  8 ++++++
 4 files changed, 44 insertions(+), 89 deletions(-)

-- 
1.8.1.4

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

[Luiz Capitulino]

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

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

Corey Bryant (2):
  QMP: Remove duplicate TPM type from query-tpm
  QMP: TPM QMP and man page documentation updates

Igor Mammedov (1):
  qmp: fix handling of boolean values in qmp-shell

Michal Novotny (1):
  New QMP command query-cpu-max and HMP command cpu_max

 QMP/qmp-shell    |  7 ++++-
 hmp-commands.hx  |  2 ++
 hmp.c            | 16 +++++++++---
 hmp.h            |  1 +
 monitor.c        |  7 +++++
 qapi-schema.json | 23 ++++++++++------
 qemu-options.hx  |  3 ++-
 qmp-commands.hx  | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tpm/tpm.c        |  9 +++----
 vl.c             |  5 ++++
 10 files changed, 134 insertions(+), 19 deletions(-)

-- 
1.8.1.4

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

[Anthony Liguori]

On 03/16/2012 02:26 PM, Luiz Capitulino wrote:
> Contains only the migrate command conversion to the QAPI series. I hoped I'd
> finish the device_add/del conversion yesterday, but I didn't. Let's merge
> this before it breaks...
>
> The changes (since ae7d54d489540b49b7c13a7df7ddc220588a2ced) are available
> in the following repository:
>
>      git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Luiz Capitulino (4):
>        QError: Introduce new errors for the migration command
>        Error: Introduce error_copy()
>        Purge migration of (almost) everything to do with monitors
>        qapi: Convert migrate
>
>   arch_init.c       |    2 +-
>   block-migration.c |   58 ++++++++++++++++++-----------------------
>   error.c           |   13 ++++++++++
>   error.h           |    5 ++++
>   hmp-commands.hx   |    3 +--
>   hmp.c             |   74 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>   hmp.h             |    1 +
>   migration-fd.c    |    2 +-
>   migration.c       |   74 +++++++++++++++--------------------------------------
>   migration.h       |    5 +---
>   qapi-schema.json  |   21 +++++++++++++++
>   qerror.c          |    8 ++++++
>   qerror.h          |    6 +++++
>   qmp-commands.hx   |    9 +------
>   savevm.c          |   42 +++++++++++++++---------------
>   sysemu.h          |   11 ++++----
>   vmstate.h         |    3 +--
>   17 files changed, 205 insertions(+), 132 deletions(-)
>
>
>

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

[Luiz Capitulino]

Contains only the migrate command conversion to the QAPI series. I hoped I'd
finish the device_add/del conversion yesterday, but I didn't. Let's merge
this before it breaks...

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

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

Luiz Capitulino (4):
      QError: Introduce new errors for the migration command
      Error: Introduce error_copy()
      Purge migration of (almost) everything to do with monitors
      qapi: Convert migrate

 arch_init.c       |    2 +-
 block-migration.c |   58 ++++++++++++++++++-----------------------
 error.c           |   13 ++++++++++
 error.h           |    5 ++++
 hmp-commands.hx   |    3 +--
 hmp.c             |   74 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 hmp.h             |    1 +
 migration-fd.c    |    2 +-
 migration.c       |   74 +++++++++++++++--------------------------------------
 migration.h       |    5 +---
 qapi-schema.json  |   21 +++++++++++++++
 qerror.c          |    8 ++++++
 qerror.h          |    6 +++++
 qmp-commands.hx   |    9 +------
 savevm.c          |   42 +++++++++++++++---------------
 sysemu.h          |   11 ++++----
 vmstate.h         |    3 +--
 17 files changed, 205 insertions(+), 132 deletions(-)