From patchwork Thu Mar 9 08:42:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rong Tao X-Patchwork-Id: 66702 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp176423wrd; Thu, 9 Mar 2023 00:52:52 -0800 (PST) X-Google-Smtp-Source: AK7set9m5Y5ulWd+oOAPK8mLXIiTxV4Cb/TFVxOBjOm79ST+HkphcMBpkR9dKMPXC+ttUo7UJs/9 X-Received: by 2002:a17:902:ec92:b0:19d:397b:f05 with SMTP id x18-20020a170902ec9200b0019d397b0f05mr24114878plg.32.1678351972679; Thu, 09 Mar 2023 00:52:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678351972; cv=none; d=google.com; s=arc-20160816; b=DGGc52CFrzZOspLLLat7TLs3vkr1VfWjdH5bDJ8+uM8XHODV+sch+EtJcLfLoklwCY AdaCKM63GTMUnDA28tRdU0lK5ntyu2vmar00uXMRCLXkyjlWTwWPiqPCkbiXJSavMJpE 8hCHI5BaRStKZhiF6AHnUP/Td50AArA7v7GQT/HvMkvE5Klkrrl9sU8YpG+Pl/o1MAPI ZkxS70P0EYIcQeQgL0S7RW2yXkRyw9R7XOaEDilnl5Ialh6Hrf7CaQbd5gQBPc7Uid5w fWAlJpmqRtZN9QpVQS6I/p8rEMmGVqSx/CvuVhYyY/H8w99noX158NZfcE/uXUaOmTIj SAqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version:date :subject:cc:to:from:message-id:dkim-signature; bh=I8/QTAP2wxPZCgd4AFae/zKk8r+YiOAkySUNLPMR6n8=; b=IdeT2z32l9L6MarqooaQfZFet92mA7eFr8ZwTE12eOXZbbtsuUrzIYDSvj7uPL2DLf NRHRex5txv+tVdBL5W/bCGzgRyfNmiPD2V579ceCUfxEaUKZlhapX7DsqSDjhQRmZtIC N2f9cW0V4Oe8g+f1q9kCrYnO3zLa6qmLrtQetDan+pGrLQMIaRjRdJORkRli9nFnzHUm /HHQnjjfhVSXQS9Oj1r63vnbaHAROILbog2kmrY+jBXot2SoC93TK7GNRJQSC6XRnG/H 6aySXKaqS+6lpezEZCpBNEGMyirTiXZd1udIB1GZ7Zye02ph6Ff68X9d2Uw4pF9oV3QZ YRLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@foxmail.com header.s=s201512 header.b=u7fI149r; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t26-20020a65609a000000b004d09ab32905si16751192pgu.256.2023.03.09.00.52.40; Thu, 09 Mar 2023 00:52:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@foxmail.com header.s=s201512 header.b=u7fI149r; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230013AbjCIItJ (ORCPT + 99 others); Thu, 9 Mar 2023 03:49:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229521AbjCIItH (ORCPT ); Thu, 9 Mar 2023 03:49:07 -0500 Received: from out203-205-221-164.mail.qq.com (out203-205-221-164.mail.qq.com [203.205.221.164]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09EFE74DE4 for ; Thu, 9 Mar 2023 00:49:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1678351742; bh=I8/QTAP2wxPZCgd4AFae/zKk8r+YiOAkySUNLPMR6n8=; h=From:To:Cc:Subject:Date; b=u7fI149rCMpGTd25aXaZepU37QOqGzOYXlcxsPheR8Y2r7twcMXqpiMoZxEECfxAp 8HPGPQzKEoww/vB2K9iviuD9vJRQTnWnoDaLbrJ0LTIW3+DeekP7H3IXnXi2YCHay1 G9BUi5uSEhfmc7RtpEPaCWZ6C/4D7nRXqxOLVvXs= Received: from localhost.localdomain ([39.156.73.13]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id AB8B944F; Thu, 09 Mar 2023 16:42:56 +0800 X-QQ-mid: xmsmtpt1678351376t4h0x8ssq Message-ID: X-QQ-XMAILINFO: MB5+LsFw85No0SEQ81HMmrzk6Gkh+eQwyK1ePoqWDdO6LuGgjeWrXsvV5QeLyf 5sd83VA/b95h4k+61ySA7xOZCoiBArShx5IHx+bmUw69lXnudlu4fQ+qLakkYn3BPVRdRt3ElHbB gNucTHo29QE9muhyIWihyql8SqP+Qv2dhP4mZD2EGWkAvXBZsbZLaZ1geWy5w0hwSOW7jNGw/XHx 4vZ/1fqArrIVpTmivSm2VMU8Bg+mh1uUoHpJjAl8tECAyH0+zyPO4MgJGk9CmFiHq/yQPDk3FYSk E4Zqbo3JCQMdRPa+WygtquQoEIqrta9LJAG9BvqZLh3MWv+DAynpiKUTyhgHMGOTP/JpUU/zuJAO etJCRgupguxmY9ET/kLHDUehq/w/iagR4h++wfTxTHZgkWCjiC4BmD29YBPxVYY6hMe5iSx1RlYJ p8F2+HkH9aI6UwhGxkeGnnWFnL1DygxnI971b5pEpZREnBeS6NkIPNCkPut92AKP+xv8m73dRaeh 5PSD4oB7CztAoQG8etNeiZw8xZxXcrAClgSUJSxu/sSzB/KoXq54sPnhD2I3kf+aRpT1vB/zYTve CTqNB5yFCar+7xEQrkYlDaNy59M9lgGo0ujhNRLIN6ZOAF++CBKbJoASA7uTwLEsuqL51cgoqRup 97dP5DOZ/+vzxJwx6Kv9iwslf7cW81PQBpDyuhlIREEb7BceSphcS4juU7UweFCiU9cC0UyAFuRw lDWk5eCL6VE7re6Q4gr6T0hjhso4/8cmZ4zj9KR0awcKbsWuVimo2L8q3AXkKCABEmAPiZwJ8hsp HNN8VDG8EMc5CcslXCq6yaHAaUloW+dJvhJ7lbI41JSkW9XwnIqAJuCJe2eHCIwaeiGA6sl5lrpW zF0vp3NZxK9mxJP3x0/RdmHVjs9+0oDuEFhtns0kZTuTUdiPOPL0KTjgTE6CEFDkirrAQMWkNb6N ndExMKAXp8b5+yZaGD+sisSaEiEKq2MtXRUCLR1D/2S89E3r5hbA== From: Rong Tao To: sgarzare@redhat.com Cc: Rong Tao , "Michael S. Tsirkin" , Jason Wang , virtualization@lists.linux-foundation.org (open list:VIRTIO CORE AND NET DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2] tools/virtio: virtio_test -h,--help should return directly Date: Thu, 9 Mar 2023 16:42:50 +0800 X-OQ-MSGID: <20230309084251.119197-1-rtoax@foxmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, HELO_DYNAMIC_IPADDR,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,RDNS_DYNAMIC, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759879598219961760?= X-GMAIL-MSGID: =?utf-8?q?1759879598219961760?= From: Rong Tao 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 Acked-by: Stefano Garzarella --- v2: help(): exit with a value different from 0 (e.g. 2). v1: https://lore.kernel.org/lkml/tencent_4B5122C4158323A1D1ACA04B3295F1579207@qq.com/ --- tools/virtio/virtio_test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c index 120062f94590..33e17307441f 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;