2023-03-09 06:13:26

by Rong Tao

Subject: [PATCH] tools/virtio: virtio_test -h,--help should return directly

From: Rong Tao <[email protected]>

When we get help information, we should return directly, and we should not
execute test cases. Move the exit() directly into the help() function and
remove it from case '?'.

Signed-off-by: Rong Tao <[email protected]>
---
tools/virtio/virtio_test.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c
index 120062f94590..6e348fbdc5d8 100644
--- a/tools/virtio/virtio_test.c
+++ b/tools/virtio/virtio_test.c
@@ -337,6 +337,8 @@ static void help(void)
" [--batch=random/N]"
" [--reset=N]"
"\n");
+
+ exit(0);
}

int main(int argc, char **argv)
@@ -354,14 +356,12 @@ int main(int argc, char **argv)
case -1:
goto done;
case '?':
- help();
exit(2);
case 'e':
features &= ~(1ULL << VIRTIO_RING_F_EVENT_IDX);
break;
case 'h':
help();
- goto done;
case 'i':
features &= ~(1ULL << VIRTIO_RING_F_INDIRECT_DESC);
break;
--
2.39.1

2023-03-09 08:33:41

by Stefano Garzarella

Subject: Re: [PATCH] tools/virtio: virtio_test -h,--help should return directly

On Thu, Mar 09, 2023 at 02:13:13PM +0800, Rong Tao wrote:
>From: Rong Tao <[email protected]>
>
>When we get help information, we should return directly, and we should not
>execute test cases. Move the exit() directly into the help() function and
>remove it from case '?'.
>
>Signed-off-by: Rong Tao <[email protected]>
>---
> tools/virtio/virtio_test.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c
>index 120062f94590..6e348fbdc5d8 100644
>--- a/tools/virtio/virtio_test.c
>+++ b/tools/virtio/virtio_test.c
>@@ -337,6 +337,8 @@ static void help(void)
> " [--batch=random/N]"
> " [--reset=N]"
> "\n");
>+
>+ exit(0);

Please exit with a value different from 0 (e.g. 2).

> }
>
> int main(int argc, char **argv)
>@@ -354,14 +356,12 @@ int main(int argc, char **argv)
> case -1:
> goto done;
> case '?':
>- help();
> exit(2);

Sorry, I meant the opposite, remove exit(2) and leave help().

Thanks,
Stefano

> case 'e':
> features &= ~(1ULL << VIRTIO_RING_F_EVENT_IDX);
> break;
> case 'h':
> help();
>- goto done;
> case 'i':
> features &= ~(1ULL << VIRTIO_RING_F_INDIRECT_DESC);
> break;
>--
>2.39.1
>