summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRong Tao <rongtao@cestc.cn>2023-03-09 16:42:50 +0800
committerMichael S. Tsirkin <mst@redhat.com>2023-04-21 03:02:30 -0400
commit6b27cd84a7917b995f66c052fd3453fdbd6e3d70 (patch)
tree8e9b4ace806701f893ba8bdcd025ff690cf54191
parent9b2b3de63c07123c0ec9b912d7b8e77b150e520b (diff)
downloadlinux-6b27cd84a7917b995f66c052fd3453fdbd6e3d70.tar.gz
linux-6b27cd84a7917b995f66c052fd3453fdbd6e3d70.tar.bz2
linux-6b27cd84a7917b995f66c052fd3453fdbd6e3d70.zip
tools/virtio: virtio_test -h,--help should return directly
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 <rongtao@cestc.cn> Message-Id: <tencent_822CEBEB925205EA1573541CD1C2604F4805@qq.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--tools/virtio/virtio_test.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c
index 280c6f8ee297..028f54e6854a 100644
--- a/tools/virtio/virtio_test.c
+++ b/tools/virtio/virtio_test.c
@@ -327,7 +327,7 @@ const struct option longopts[] = {
}
};
-static void help(void)
+static void help(int status)
{
fprintf(stderr, "Usage: virtio_test [--help]"
" [--no-indirect]"
@@ -337,6 +337,8 @@ static void help(void)
" [--batch=random/N]"
" [--reset=N]"
"\n");
+
+ exit(status);
}
int main(int argc, char **argv)
@@ -354,14 +356,12 @@ int main(int argc, char **argv)
case -1:
goto done;
case '?':
- help();
- exit(2);
+ help(2);
case 'e':
features &= ~(1ULL << VIRTIO_RING_F_EVENT_IDX);
break;
case 'h':
- help();
- goto done;
+ help(0);
case 'i':
features &= ~(1ULL << VIRTIO_RING_F_INDIRECT_DESC);
break;