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

[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 1/4] qstring: add qstring_get_length()

[Luiz Capitulino]

Long overdue.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
 include/qapi/qmp/qstring.h | 1 +
 qobject/qstring.c          | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/include/qapi/qmp/qstring.h b/include/qapi/qmp/qstring.h
index 0e690f4..1bc3666 100644
--- a/include/qapi/qmp/qstring.h
+++ b/include/qapi/qmp/qstring.h
@@ -26,6 +26,7 @@ typedef struct QString {
 QString *qstring_new(void);
 QString *qstring_from_str(const char *str);
 QString *qstring_from_substr(const char *str, int start, int end);
+size_t qstring_get_length(const QString *qstring);
 const char *qstring_get_str(const QString *qstring);
 void qstring_append_int(QString *qstring, int64_t value);
 void qstring_append(QString *qstring, const char *str);
diff --git a/qobject/qstring.c b/qobject/qstring.c
index 5f7376c..607b7a1 100644
--- a/qobject/qstring.c
+++ b/qobject/qstring.c
@@ -32,6 +32,14 @@ QString *qstring_new(void)
 }
 
 /**
+ * qstring_get_length(): Get the length of a QString
+ */
+size_t qstring_get_length(const QString *qstring)
+{
+    return qstring->length;
+}
+
+/**
  * qstring_from_substr(): Create a new QString from a C string substring
  *
  * Return string reference
-- 
1.8.1.4

[Qemu-devel] [PULL 2/4] Monitor: Make output buffer dynamic

[Luiz Capitulino]

Commit f628926bb423fa8a7e0b114511400ea9df38b76a changed monitor_flush()
to retry on qemu_chr_fe_write() errors. However, the Monitor's output
buffer can keep growing while the retry is not issued and this can
cause the buffer to overflow.

To reproduce this issue, just start qemu and type on the Monitor:

(qemu) ?

This will cause an assertion to trig.

To fix this problem this commit makes the Monitor buffer dynamic,
which means that it can grow as much as needed.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
 monitor.c | 45 ++++++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/monitor.c b/monitor.c
index 4ec1db9..8712c53 100644
--- a/monitor.c
+++ b/monitor.c
@@ -188,8 +188,7 @@ struct Monitor {
     int reset_seen;
     int flags;
     int suspend_cnt;
-    uint8_t outbuf[1024];
-    int outbuf_index;
+    QString *outbuf;
     ReadLineState *rs;
     MonitorControl *mc;
     CPUArchState *mon_cpu;
@@ -271,45 +270,52 @@ static gboolean monitor_unblocked(GIOChannel *chan, GIOCondition cond,
 void monitor_flush(Monitor *mon)
 {
     int rc;
+    size_t len;
+    const char *buf;
+
+    buf = qstring_get_str(mon->outbuf);
+    len = qstring_get_length(mon->outbuf);
 
-    if (mon && mon->outbuf_index != 0 && !mon->mux_out) {
-        rc = qemu_chr_fe_write(mon->chr, mon->outbuf, mon->outbuf_index);
-        if (rc == mon->outbuf_index) {
+    if (mon && len && !mon->mux_out) {
+        rc = qemu_chr_fe_write(mon->chr, (const uint8_t *) buf, len);
+        if (rc == len) {
             /* all flushed */
-            mon->outbuf_index = 0;
+            QDECREF(mon->outbuf);
+            mon->outbuf = qstring_new();
             return;
         }
         if (rc > 0) {
             /* partinal write */
-            memmove(mon->outbuf, mon->outbuf + rc, mon->outbuf_index - rc);
-            mon->outbuf_index -= rc;
+            QString *tmp = qstring_from_str(buf + rc);
+            QDECREF(mon->outbuf);
+            mon->outbuf = tmp;
         }
         qemu_chr_fe_add_watch(mon->chr, G_IO_OUT, monitor_unblocked, mon);
     }
 }
 
-/* flush at every end of line or if the buffer is full */
+/* flush at every end of line */
 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;
-        if (c == '\n')
-            mon->outbuf[mon->outbuf_index++] = '\r';
-        mon->outbuf[mon->outbuf_index++] = c;
-        if (mon->outbuf_index >= (sizeof(mon->outbuf) - 1)
-            || c == '\n')
+        if (c == '\n') {
+            qstring_append_chr(mon->outbuf, '\r');
+        }
+        qstring_append_chr(mon->outbuf, c);
+        if (c == '\n') {
             monitor_flush(mon);
+        }
     }
 }
 
 void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
 {
-    char buf[4096];
+    char *buf;
 
     if (!mon)
         return;
@@ -318,8 +324,9 @@ void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
         return;
     }
 
-    vsnprintf(buf, sizeof(buf), fmt, ap);
+    buf = g_strdup_vprintf(fmt, ap);
     monitor_puts(mon, buf);
+    g_free(buf);
 }
 
 void monitor_printf(Monitor *mon, const char *fmt, ...)
@@ -671,6 +678,8 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
     CharDriverState mchar;
 
     memset(&hmp, 0, sizeof(hmp));
+    hmp.outbuf = qstring_new();
+
     qemu_chr_init_mem(&mchar);
     hmp.chr = &mchar;
 
@@ -699,6 +708,7 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
     }
 
 out:
+    QDECREF(hmp.outbuf);
     qemu_chr_close_mem(hmp.chr);
     return output;
 }
@@ -4749,6 +4759,7 @@ void monitor_init(CharDriverState *chr, int flags)
     }
 
     mon = g_malloc0(sizeof(*mon));
+    mon->outbuf = qstring_new();
 
     mon->chr = chr;
     mon->flags = flags;
-- 
1.8.1.4

[Qemu-devel] [PULL 3/4] hmp: human-monitor-command: stop using the Memory chardev driver

[Luiz Capitulino]

The Memory chardev driver was added because, as the Monitor's output
buffer was static, we needed a way to accumulate the output of an
HMP commmand when ran by human-monitor-command.

However, the Monitor's output buffer is now dynamic, so it's possible
for the human-monitor-command to use it instead of the Memory chardev
driver.

This commit does that change, but there are two important
observations about it:

 1. We need a way to signal to the Monitor that it shouldn't call
    chardev functions when flushing its output. This is done
    by adding a new flag to the Monitor object called skip_flush
	(which is set to true by qmp_human_monitor_command())

 2. The current code has buffered semantics: QMP clients will
    only see a command's output if it flushes its output with
	a new-line character. This commit changes this to unbuffered,
	which means that QMP clients will see a command's output
	whenever the command prints anything.

	I don't think this will matter in practice though, as I believe
	all HMP commands print the new-line character anyway.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
 monitor.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/monitor.c b/monitor.c
index 8712c53..b4bda77 100644
--- a/monitor.c
+++ b/monitor.c
@@ -188,6 +188,7 @@ struct Monitor {
     int reset_seen;
     int flags;
     int suspend_cnt;
+    bool skip_flush;
     QString *outbuf;
     ReadLineState *rs;
     MonitorControl *mc;
@@ -273,6 +274,10 @@ void monitor_flush(Monitor *mon)
     size_t len;
     const char *buf;
 
+    if (mon->skip_flush) {
+        return;
+    }
+
     buf = qstring_get_str(mon->outbuf);
     len = qstring_get_length(mon->outbuf);
 
@@ -675,13 +680,10 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
 {
     char *output = NULL;
     Monitor *old_mon, hmp;
-    CharDriverState mchar;
 
     memset(&hmp, 0, sizeof(hmp));
     hmp.outbuf = qstring_new();
-
-    qemu_chr_init_mem(&mchar);
-    hmp.chr = &mchar;
+    hmp.skip_flush = true;
 
     old_mon = cur_mon;
     cur_mon = &hmp;
@@ -699,17 +701,14 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
     handle_user_command(&hmp, command_line);
     cur_mon = old_mon;
 
-    if (qemu_chr_mem_osize(hmp.chr) > 0) {
-        QString *str = qemu_chr_mem_to_qs(hmp.chr);
-        output = g_strdup(qstring_get_str(str));
-        QDECREF(str);
+    if (qstring_get_length(hmp.outbuf) > 0) {
+        output = g_strdup(qstring_get_str(hmp.outbuf));
     } else {
         output = g_strdup("");
     }
 
 out:
     QDECREF(hmp.outbuf);
-    qemu_chr_close_mem(hmp.chr);
     return output;
 }
 
-- 
1.8.1.4

[Qemu-devel] [PULL 4/4] chardev: drop the Memory chardev driver

[Luiz Capitulino]

It's not used anymore since the last commit.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
 qemu-char.c | 64 -------------------------------------------------------------
 1 file changed, 64 deletions(-)

diff --git a/qemu-char.c b/qemu-char.c
index e5eb8dd..0f7f32d 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2796,70 +2796,6 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts *opts)
     return NULL;
 }
 
-/***********************************************************/
-/* Memory chardev */
-typedef struct {
-    size_t outbuf_size;
-    size_t outbuf_capacity;
-    uint8_t *outbuf;
-} MemoryDriver;
-
-static int mem_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
-{
-    MemoryDriver *d = chr->opaque;
-
-    /* TODO: the QString implementation has the same code, we should
-     * introduce a generic way to do this in cutils.c */
-    if (d->outbuf_capacity < d->outbuf_size + len) {
-        /* grow outbuf */
-        d->outbuf_capacity += len;
-        d->outbuf_capacity *= 2;
-        d->outbuf = g_realloc(d->outbuf, d->outbuf_capacity);
-    }
-
-    memcpy(d->outbuf + d->outbuf_size, buf, len);
-    d->outbuf_size += len;
-
-    return len;
-}
-
-void qemu_chr_init_mem(CharDriverState *chr)
-{
-    MemoryDriver *d;
-
-    d = g_malloc(sizeof(*d));
-    d->outbuf_size = 0;
-    d->outbuf_capacity = 4096;
-    d->outbuf = g_malloc0(d->outbuf_capacity);
-
-    memset(chr, 0, sizeof(*chr));
-    chr->opaque = d;
-    chr->chr_write = mem_chr_write;
-}
-
-QString *qemu_chr_mem_to_qs(CharDriverState *chr)
-{
-    MemoryDriver *d = chr->opaque;
-    return qstring_from_substr((char *) d->outbuf, 0, d->outbuf_size - 1);
-}
-
-/* NOTE: this driver can not be closed with qemu_chr_delete()! */
-void qemu_chr_close_mem(CharDriverState *chr)
-{
-    MemoryDriver *d = chr->opaque;
-
-    g_free(d->outbuf);
-    g_free(chr->opaque);
-    chr->opaque = NULL;
-    chr->chr_write = NULL;
-}
-
-size_t qemu_chr_mem_osize(const CharDriverState *chr)
-{
-    const MemoryDriver *d = chr->opaque;
-    return d->outbuf_size;
-}
-
 /*********************************************************/
 /* Ring buffer chardev */
 
-- 
1.8.1.4

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

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

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

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

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

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