[03/20] libqtest: Clean up how we read device_del messages

Message ID 20180712111221.20326-4-armbru@redhat.com
State New
Headers show
Series
  • tests: Compile-time format string checking for libqtest.h
Related show

Commit Message

Markus Armbruster July 12, 2018, 11:12 a.m.
qtest_qmp_device_del() still uses the qmp("") hack to receive a
message, even though we have qmp_receive() since commit 66e0c7b187e.
Put it to use.

Bonus: gets rid of empty format strings.  A step towards compile-time
format string checking without triggering -Wformat-zero-length.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 tests/libqtest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Philippe Mathieu-Daudé July 12, 2018, 2:22 p.m. | #1
On 07/12/2018 08:12 AM, Markus Armbruster wrote:
> qtest_qmp_device_del() still uses the qmp("") hack to receive a
> message, even though we have qmp_receive() since commit 66e0c7b187e.
> Put it to use.
> 
> Bonus: gets rid of empty format strings.  A step towards compile-time
> format string checking without triggering -Wformat-zero-length.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  tests/libqtest.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/libqtest.c b/tests/libqtest.c
> index 9cb4096639..071d7eb7b1 100644
> --- a/tests/libqtest.c
> +++ b/tests/libqtest.c
> @@ -1090,7 +1090,7 @@ void qtest_qmp_device_del(const char *id)
>      g_assert(response1);
>      g_assert(!qdict_haskey(response1, "error"));
>  
> -    response2 = qmp("");
> +    response2 = qmp_receive();
>      g_assert(response2);
>      g_assert(!qdict_haskey(response2, "error"));
>  
>
Thomas Huth July 12, 2018, 4:24 p.m. | #2
On 12.07.2018 13:12, Markus Armbruster wrote:
> qtest_qmp_device_del() still uses the qmp("") hack to receive a
> message, even though we have qmp_receive() since commit 66e0c7b187e.
> Put it to use.
> 
> Bonus: gets rid of empty format strings.  A step towards compile-time
> format string checking without triggering -Wformat-zero-length.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  tests/libqtest.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/libqtest.c b/tests/libqtest.c
> index 9cb4096639..071d7eb7b1 100644
> --- a/tests/libqtest.c
> +++ b/tests/libqtest.c
> @@ -1090,7 +1090,7 @@ void qtest_qmp_device_del(const char *id)
>      g_assert(response1);
>      g_assert(!qdict_haskey(response1, "error"));
>  
> -    response2 = qmp("");
> +    response2 = qmp_receive();
>      g_assert(response2);
>      g_assert(!qdict_haskey(response2, "error"));

Reviewed-by: Thomas Huth <thuth@redhat.com>

Patch

diff --git a/tests/libqtest.c b/tests/libqtest.c
index 9cb4096639..071d7eb7b1 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -1090,7 +1090,7 @@  void qtest_qmp_device_del(const char *id)
     g_assert(response1);
     g_assert(!qdict_haskey(response1, "error"));
 
-    response2 = qmp("");
+    response2 = qmp_receive();
     g_assert(response2);
     g_assert(!qdict_haskey(response2, "error"));