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

[Qemu-devel] [PULL 0/4]: Monitor 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 d03703c81a202cea156811e5dbc8e88627c19986) are available
in the following repository:

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

Hidetoshi Seto (1):
      Trivial fix for QMP/qmp-events.txt

Jan Kiszka (2):
      Silence compiler warning in json test case
      Fix test suite build with tracing enabled

Kusanagi Kouichi (1):
      monitor: Ignore "." and ".." when completing file name.

 Makefile           |   12 ++++++------
 QMP/qmp-events.txt |    2 +-
 check-qjson.c      |    4 +++-
 monitor.c          |    5 +++++
 4 files changed, 15 insertions(+), 8 deletions(-)

[Qemu-devel] [PATCH 1/4] Trivial fix for QMP/qmp-events.txt

[Luiz Capitulino]

From: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>

Fix example of STOP event that was just copy-and-pasted.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 QMP/qmp-events.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt
index 01ec85f..aa20210 100644
--- a/QMP/qmp-events.txt
+++ b/QMP/qmp-events.txt
@@ -89,7 +89,7 @@ Data: None.
 
 Example:
 
-{ "event": "SHUTDOWN",
+{ "event": "STOP",
     "timestamp": { "seconds": 1267041730, "microseconds": 281295 } }
 
 VNC_CONNECTED
-- 
1.7.3.1.127.g1bb28

[Qemu-devel] [PATCH 2/4] Silence compiler warning in json test case

[Luiz Capitulino]

From: Jan Kiszka <jan.kiszka@web.de>

This avoids

    error: zero-length gnu_printf format string

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 check-qjson.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/check-qjson.c b/check-qjson.c
index 0b60e45..64fcdcb 100644
--- a/check-qjson.c
+++ b/check-qjson.c
@@ -639,7 +639,9 @@ END_TEST
 
 START_TEST(empty_input)
 {
-    QObject *obj = qobject_from_json("");
+    const char *empty = "";
+
+    QObject *obj = qobject_from_json(empty);
     fail_unless(obj == NULL);
 }
 END_TEST
-- 
1.7.3.1.127.g1bb28

Re: [Qemu-devel] [PATCH 2/4] Silence compiler warning in json test case

[Markus Armbruster]

Luiz Capitulino <lcapitulino@redhat.com> writes:

> From: Jan Kiszka <jan.kiszka@web.de>
>
> This avoids
>
>     error: zero-length gnu_printf format string
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
> ---
>  check-qjson.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/check-qjson.c b/check-qjson.c
> index 0b60e45..64fcdcb 100644
> --- a/check-qjson.c
> +++ b/check-qjson.c
> @@ -639,7 +639,9 @@ END_TEST
>  
>  START_TEST(empty_input)
>  {
> -    QObject *obj = qobject_from_json("");
> +    const char *empty = "";
> +
> +    QObject *obj = qobject_from_json(empty);
>      fail_unless(obj == NULL);
>  }
>  END_TEST

The warning is silly.  Printing nothing is unlikely to happen
unintentionally, and is perfectly well-defined and portable.

Why make the code ugly to avoid a useless warning, when we can disable
the warning?

Re: [Qemu-devel] [PATCH 2/4] Silence compiler warning in json test case

[Luiz Capitulino]

On Fri, 22 Oct 2010 19:15:07 +0200
Markus Armbruster <armbru@redhat.com> wrote:

> Luiz Capitulino <lcapitulino@redhat.com> writes:
> 
> > From: Jan Kiszka <jan.kiszka@web.de>
> >
> > This avoids
> >
> >     error: zero-length gnu_printf format string
> >
> > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> > Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
> > ---
> >  check-qjson.c |    4 +++-
> >  1 files changed, 3 insertions(+), 1 deletions(-)
> >
> > diff --git a/check-qjson.c b/check-qjson.c
> > index 0b60e45..64fcdcb 100644
> > --- a/check-qjson.c
> > +++ b/check-qjson.c
> > @@ -639,7 +639,9 @@ END_TEST
> >  
> >  START_TEST(empty_input)
> >  {
> > -    QObject *obj = qobject_from_json("");
> > +    const char *empty = "";
> > +
> > +    QObject *obj = qobject_from_json(empty);
> >      fail_unless(obj == NULL);
> >  }
> >  END_TEST
> 
> The warning is silly.  Printing nothing is unlikely to happen
> unintentionally, and is perfectly well-defined and portable.
> 
> Why make the code ugly to avoid a useless warning, when we can disable
> the warning?

You mean, disable it only for this specific case or QEMU wide?

If it's the former, please, submit a patch. Otherwise, this has been
discussed already and the conclusion was that the warning is
useful:

 http://www.mail-archive.com/qemu-devel@nongnu.org/msg44072.html

Honestly speaking, no matter what the conclusion is, what can not
happen is having code that doesn't compile in the tree. Either: we apply
this patch or revert the patch that broke the build.

Re: [Qemu-devel] [PATCH 2/4] Silence compiler warning in json test case

[Stefan Weil]

Am 22.10.2010 19:33, schrieb Luiz Capitulino:
> On Fri, 22 Oct 2010 19:15:07 +0200
> Markus Armbruster<armbru@redhat.com>  wrote:
>
>    
>> Luiz Capitulino<lcapitulino@redhat.com>  writes:
>>
>>      
>>> From: Jan Kiszka<jan.kiszka@web.de>
>>>
>>> This avoids
>>>
>>>      error: zero-length gnu_printf format string
>>>
>>> Signed-off-by: Jan Kiszka<jan.kiszka@siemens.com>
>>> Signed-off-by: Luiz Capitulino<lcapitulino@redhat.com>
>>> ---
>>>   check-qjson.c |    4 +++-
>>>   1 files changed, 3 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/check-qjson.c b/check-qjson.c
>>> index 0b60e45..64fcdcb 100644
>>> --- a/check-qjson.c
>>> +++ b/check-qjson.c
>>> @@ -639,7 +639,9 @@ END_TEST
>>>
>>>   START_TEST(empty_input)
>>>   {
>>> -    QObject *obj = qobject_from_json("");
>>> +    const char *empty = "";
>>> +
>>> +    QObject *obj = qobject_from_json(empty);
>>>       fail_unless(obj == NULL);
>>>   }
>>>   END_TEST
>>>        
>> The warning is silly.  Printing nothing is unlikely to happen
>> unintentionally, and is perfectly well-defined and portable.
>>
>> Why make the code ugly to avoid a useless warning, when we can disable
>> the warning?
>>      
> You mean, disable it only for this specific case or QEMU wide?
>
> If it's the former, please, submit a patch. Otherwise, this has been
> discussed already and the conclusion was that the warning is
> useful:
>
>   http://www.mail-archive.com/qemu-devel@nongnu.org/msg44072.html
>
> Honestly speaking, no matter what the conclusion is, what can not
> happen is having code that doesn't compile in the tree. Either: we apply
> this patch or revert the patch that broke the build.
>    


If needed, commit 8b7968f7c4ac8c07cad6a1a0891d38cf239a2839
can be reverted partially (only for qjson.h).

Tell me if you would prefer that solution, then I can send a patch.

Re: [Qemu-devel] [PATCH 2/4] Silence compiler warning in json test case

[Luiz Capitulino]

On Fri, 22 Oct 2010 22:49:10 +0200
Stefan Weil <weil@mail.berlios.de> wrote:

> Am 22.10.2010 19:33, schrieb Luiz Capitulino:
> > On Fri, 22 Oct 2010 19:15:07 +0200
> > Markus Armbruster<armbru@redhat.com>  wrote:
> >
> >    
> >> Luiz Capitulino<lcapitulino@redhat.com>  writes:
> >>
> >>      
> >>> From: Jan Kiszka<jan.kiszka@web.de>
> >>>
> >>> This avoids
> >>>
> >>>      error: zero-length gnu_printf format string
> >>>
> >>> Signed-off-by: Jan Kiszka<jan.kiszka@siemens.com>
> >>> Signed-off-by: Luiz Capitulino<lcapitulino@redhat.com>
> >>> ---
> >>>   check-qjson.c |    4 +++-
> >>>   1 files changed, 3 insertions(+), 1 deletions(-)
> >>>
> >>> diff --git a/check-qjson.c b/check-qjson.c
> >>> index 0b60e45..64fcdcb 100644
> >>> --- a/check-qjson.c
> >>> +++ b/check-qjson.c
> >>> @@ -639,7 +639,9 @@ END_TEST
> >>>
> >>>   START_TEST(empty_input)
> >>>   {
> >>> -    QObject *obj = qobject_from_json("");
> >>> +    const char *empty = "";
> >>> +
> >>> +    QObject *obj = qobject_from_json(empty);
> >>>       fail_unless(obj == NULL);
> >>>   }
> >>>   END_TEST
> >>>        
> >> The warning is silly.  Printing nothing is unlikely to happen
> >> unintentionally, and is perfectly well-defined and portable.
> >>
> >> Why make the code ugly to avoid a useless warning, when we can disable
> >> the warning?
> >>      
> > You mean, disable it only for this specific case or QEMU wide?
> >
> > If it's the former, please, submit a patch. Otherwise, this has been
> > discussed already and the conclusion was that the warning is
> > useful:
> >
> >   http://www.mail-archive.com/qemu-devel@nongnu.org/msg44072.html
> >
> > Honestly speaking, no matter what the conclusion is, what can not
> > happen is having code that doesn't compile in the tree. Either: we apply
> > this patch or revert the patch that broke the build.
> >    
> 
> 
> If needed, commit 8b7968f7c4ac8c07cad6a1a0891d38cf239a2839
> can be reverted partially (only for qjson.h).
> 
> Tell me if you would prefer that solution, then I can send a patch.

Well, the warning seems useful to me. It's the error checking test suite
that's triggering it.

Jan's fix looks file to me.

[Qemu-devel] [PATCH 3/4] Fix test suite build with tracing enabled

[Luiz Capitulino]

From: Jan Kiszka <jan.kiszka@siemens.com>

qemu_malloc instrumentations require linking against the trace objects.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Acked-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 Makefile |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 252c817..106a401 100644
--- a/Makefile
+++ b/Makefile
@@ -140,12 +140,12 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
 
 check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o: $(GENERATED_HEADERS)
 
-check-qint: check-qint.o qint.o qemu-malloc.o
-check-qstring: check-qstring.o qstring.o qemu-malloc.o
-check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o
-check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o
-check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o
-check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o qemu-malloc.o
+check-qint: check-qint.o qint.o qemu-malloc.o $(trace-obj-y)
+check-qstring: check-qstring.o qstring.o qemu-malloc.o $(trace-obj-y)
+check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o $(trace-obj-y)
+check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o $(trace-obj-y)
+check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o $(trace-obj-y)
+check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o qemu-malloc.o $(trace-obj-y)
 
 clean:
 # avoid old build problems by removing potentially incorrect old files
-- 
1.7.3.1.127.g1bb28

[Qemu-devel] [PATCH 4/4] monitor: Ignore "." and ".." when completing file name.

[Luiz Capitulino]

From: Kusanagi Kouichi <slash@ac.auone-net.jp>

Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/monitor.c b/monitor.c
index 260cc02..61607c5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3976,6 +3976,11 @@ static void file_completion(const char *input)
         d = readdir(ffs);
         if (!d)
             break;
+
+        if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) {
+            continue;
+        }
+
         if (strstart(d->d_name, file_prefix, NULL)) {
             memcpy(file, input, input_path_len);
             if (input_path_len < sizeof(file))
-- 
1.7.3.1.127.g1bb28