1. Patchew
  2. QEMU
  3. View series

[PATCH] tests/unit: simpler variable sequence for test-io-channel

Alex Bennée posted 1 patch 3 years, 3 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20221103102329.2581508-1-alex.bennee@linaro.org
Maintainers: "Daniel P. Berrangé" <berrange@redhat.com>
tests/unit/test-io-channel-command.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
[PATCH] tests/unit: simpler variable sequence for test-io-channel
Posted by Alex Bennée 3 years, 3 months ago 
This avoids some compilers complaining about a potentially
un-initialised [src|dst]argv. In retrospect using GString was overkill
for what we are constructing.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/unit/test-io-channel-command.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-command.c
index 43e29c8cfb..19f72eab96 100644
--- a/tests/unit/test-io-channel-command.c
+++ b/tests/unit/test-io-channel-command.c
@@ -33,19 +33,13 @@ static void test_io_channel_command_fifo(bool async)
 {
     g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL);
     g_autofree gchar *fifo = g_strdup_printf("%s/%s", tmpdir, TEST_FIFO);
-    g_autoptr(GString) srcargs = g_string_new(socat);
-    g_autoptr(GString) dstargs = g_string_new(socat);
-    g_auto(GStrv) srcargv;
-    g_auto(GStrv) dstargv;
+    g_autofree gchar *srcargs = g_strdup_printf("%s - PIPE:%s,wronly", socat, fifo);
+    g_autofree gchar *dstargs = g_strdup_printf("%s PIPE:%s,rdonly -", socat, fifo);
+    g_auto(GStrv) srcargv = g_strsplit(srcargs, " ", -1);
+    g_auto(GStrv) dstargv = g_strsplit(dstargs, " ", -1);
     QIOChannel *src, *dst;
     QIOChannelTest *test;
 
-    g_string_append_printf(srcargs, " - PIPE:%s,wronly", fifo);
-    g_string_append_printf(dstargs, " PIPE:%s,rdonly -", fifo);
-
-    srcargv = g_strsplit(srcargs->str, " ", -1);
-    dstargv = g_strsplit(dstargs->str, " ", -1);
-
     src = QIO_CHANNEL(qio_channel_command_new_spawn((const char **) srcargv,
                                                     O_WRONLY,
                                                     &error_abort));
-- 
2.34.1
Re: [PATCH] tests/unit: simpler variable sequence for test-io-channel
Posted by Laurent Vivier 3 years, 3 months ago 
Le 03/11/2022 à 11:23, Alex Bennée a écrit :
> This avoids some compilers complaining about a potentially
> un-initialised [src|dst]argv. In retrospect using GString was overkill
> for what we are constructing.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   tests/unit/test-io-channel-command.c | 14 ++++----------
>   1 file changed, 4 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-command.c
> index 43e29c8cfb..19f72eab96 100644
> --- a/tests/unit/test-io-channel-command.c
> +++ b/tests/unit/test-io-channel-command.c
> @@ -33,19 +33,13 @@ static void test_io_channel_command_fifo(bool async)
>   {
>       g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL);
>       g_autofree gchar *fifo = g_strdup_printf("%s/%s", tmpdir, TEST_FIFO);
> -    g_autoptr(GString) srcargs = g_string_new(socat);
> -    g_autoptr(GString) dstargs = g_string_new(socat);
> -    g_auto(GStrv) srcargv;
> -    g_auto(GStrv) dstargv;
> +    g_autofree gchar *srcargs = g_strdup_printf("%s - PIPE:%s,wronly", socat, fifo);
> +    g_autofree gchar *dstargs = g_strdup_printf("%s PIPE:%s,rdonly -", socat, fifo);
> +    g_auto(GStrv) srcargv = g_strsplit(srcargs, " ", -1);
> +    g_auto(GStrv) dstargv = g_strsplit(dstargs, " ", -1);
>       QIOChannel *src, *dst;
>       QIOChannelTest *test;
>   
> -    g_string_append_printf(srcargs, " - PIPE:%s,wronly", fifo);
> -    g_string_append_printf(dstargs, " PIPE:%s,rdonly -", fifo);
> -
> -    srcargv = g_strsplit(srcargs->str, " ", -1);
> -    dstargv = g_strsplit(dstargs->str, " ", -1);
> -
>       src = QIO_CHANNEL(qio_channel_command_new_spawn((const char **) srcargv,
>                                                       O_WRONLY,
>                                                       &error_abort));

Reviewed-by: Laurent Vivier <laurent@vivier.eu>

Do you want this be merged via trivial branch?

Thanks,
Laurent
Re: [PATCH] tests/unit: simpler variable sequence for test-io-channel
Posted by Alex Bennée 3 years, 3 months ago 
Laurent Vivier <laurent@vivier.eu> writes:

> Le 03/11/2022 à 11:23, Alex Bennée a écrit :
>> This avoids some compilers complaining about a potentially
>> un-initialised [src|dst]argv. In retrospect using GString was overkill
>> for what we are constructing.
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>>   tests/unit/test-io-channel-command.c | 14 ++++----------
>>   1 file changed, 4 insertions(+), 10 deletions(-)
>> diff --git a/tests/unit/test-io-channel-command.c
>> b/tests/unit/test-io-channel-command.c
>> index 43e29c8cfb..19f72eab96 100644
>> --- a/tests/unit/test-io-channel-command.c
>> +++ b/tests/unit/test-io-channel-command.c
>> @@ -33,19 +33,13 @@ static void test_io_channel_command_fifo(bool async)
>>   {
>>       g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL);
>>       g_autofree gchar *fifo = g_strdup_printf("%s/%s", tmpdir, TEST_FIFO);
>> -    g_autoptr(GString) srcargs = g_string_new(socat);
>> -    g_autoptr(GString) dstargs = g_string_new(socat);
>> -    g_auto(GStrv) srcargv;
>> -    g_auto(GStrv) dstargv;
>> +    g_autofree gchar *srcargs = g_strdup_printf("%s - PIPE:%s,wronly", socat, fifo);
>> +    g_autofree gchar *dstargs = g_strdup_printf("%s PIPE:%s,rdonly -", socat, fifo);
>> +    g_auto(GStrv) srcargv = g_strsplit(srcargs, " ", -1);
>> +    g_auto(GStrv) dstargv = g_strsplit(dstargs, " ", -1);
>>       QIOChannel *src, *dst;
>>       QIOChannelTest *test;
>>   -    g_string_append_printf(srcargs, " - PIPE:%s,wronly", fifo);
>> -    g_string_append_printf(dstargs, " PIPE:%s,rdonly -", fifo);
>> -
>> -    srcargv = g_strsplit(srcargs->str, " ", -1);
>> -    dstargv = g_strsplit(dstargs->str, " ", -1);
>> -
>>       src = QIO_CHANNEL(qio_channel_command_new_spawn((const char **) srcargv,
>>                                                       O_WRONLY,
>>                                                       &error_abort));
>
> Reviewed-by: Laurent Vivier <laurent@vivier.eu>
>
> Do you want this be merged via trivial branch?

I'm easy either way. I've got a for-7.2/misc-fixes branch which I'll
send once I can figure out whats going on with the avocado console
interaction code.

>
> Thanks,
> Laurent


-- 
Alex Bennée
Re: [PATCH] tests/unit: simpler variable sequence for test-io-channel
Posted by Laurent Vivier 3 years, 3 months ago 
Le 03/11/2022 à 12:32, Alex Bennée a écrit :
> 
> Laurent Vivier <laurent@vivier.eu> writes:
> 
>> Le 03/11/2022 à 11:23, Alex Bennée a écrit :
>>> This avoids some compilers complaining about a potentially
>>> un-initialised [src|dst]argv. In retrospect using GString was overkill
>>> for what we are constructing.
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>> ---
>>>    tests/unit/test-io-channel-command.c | 14 ++++----------
>>>    1 file changed, 4 insertions(+), 10 deletions(-)
>>> diff --git a/tests/unit/test-io-channel-command.c
>>> b/tests/unit/test-io-channel-command.c
>>> index 43e29c8cfb..19f72eab96 100644
>>> --- a/tests/unit/test-io-channel-command.c
>>> +++ b/tests/unit/test-io-channel-command.c
>>> @@ -33,19 +33,13 @@ static void test_io_channel_command_fifo(bool async)
>>>    {
>>>        g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL);
>>>        g_autofree gchar *fifo = g_strdup_printf("%s/%s", tmpdir, TEST_FIFO);
>>> -    g_autoptr(GString) srcargs = g_string_new(socat);
>>> -    g_autoptr(GString) dstargs = g_string_new(socat);
>>> -    g_auto(GStrv) srcargv;
>>> -    g_auto(GStrv) dstargv;
>>> +    g_autofree gchar *srcargs = g_strdup_printf("%s - PIPE:%s,wronly", socat, fifo);
>>> +    g_autofree gchar *dstargs = g_strdup_printf("%s PIPE:%s,rdonly -", socat, fifo);
>>> +    g_auto(GStrv) srcargv = g_strsplit(srcargs, " ", -1);
>>> +    g_auto(GStrv) dstargv = g_strsplit(dstargs, " ", -1);
>>>        QIOChannel *src, *dst;
>>>        QIOChannelTest *test;
>>>    -    g_string_append_printf(srcargs, " - PIPE:%s,wronly", fifo);
>>> -    g_string_append_printf(dstargs, " PIPE:%s,rdonly -", fifo);
>>> -
>>> -    srcargv = g_strsplit(srcargs->str, " ", -1);
>>> -    dstargv = g_strsplit(dstargs->str, " ", -1);
>>> -
>>>        src = QIO_CHANNEL(qio_channel_command_new_spawn((const char **) srcargv,
>>>                                                        O_WRONLY,
>>>                                                        &error_abort));
>>
>> Reviewed-by: Laurent Vivier <laurent@vivier.eu>
>>
>> Do you want this be merged via trivial branch?
> 
> I'm easy either way. I've got a for-7.2/misc-fixes branch which I'll
> send once I can figure out whats going on with the avocado console
> interaction code.

Applied to my trivial-patches branch.

Thanks,
Laurent
Re: [PATCH] tests/unit: simpler variable sequence for test-io-channel
Posted by Philippe Mathieu-Daudé 3 years, 3 months ago 
On 3/11/22 11:23, Alex Bennée wrote:
> This avoids some compilers complaining about a potentially
> un-initialised [src|dst]argv. In retrospect using GString was overkill
> for what we are constructing.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   tests/unit/test-io-channel-command.c | 14 ++++----------
>   1 file changed, 4 insertions(+), 10 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.