Hello,
On Mon, Sep 16, 2019 at 07:26:41AM -0600, shuah wrote:
On 9/7/19 2:58 AM, Eugeniu Rosca wrote:
diff --git a/tools/testing/selftests/watchdog/watchdog-test.c b/tools/testing/selftests/watchdog/watchdog-test.c index 6ed822dc2222..f45e510500c0 100644 --- a/tools/testing/selftests/watchdog/watchdog-test.c +++ b/tools/testing/selftests/watchdog/watchdog-test.c @@ -19,7 +19,7 @@ int fd; const char v = 'V'; -static const char sopts[] = "bdehp:t:Tn:NLf:"; +static const char sopts[] = "bdehp:t:Tn:NLf:i"; static const struct option lopts[] = { {"bootstatus", no_argument, NULL, 'b'}, {"disable", no_argument, NULL, 'd'}, @@ -32,6 +32,7 @@ static const struct option lopts[] = { {"getpretimeout", no_argument, NULL, 'N'}, {"gettimeleft", no_argument, NULL, 'L'}, {"file", required_argument, NULL, 'f'},
- {"info", no_argument, NULL, 'i'}, {NULL, no_argument, NULL, 0x0}
}; @@ -72,6 +73,7 @@ static void usage(char *progname) printf("Usage: %s [options]\n", progname); printf(" -f, --file\t\tOpen watchdog device file\n"); printf("\t\t\tDefault is /dev/watchdog\n");
- printf(" -i, --info\t\tShow watchdog_info\n"); printf(" -b, --bootstatus\tGet last boot status (Watchdog/POR)\n"); printf(" -d, --disable\t\tTurn off the watchdog timer\n"); printf(" -e, --enable\t\tTurn on the watchdog timer\n");
@@ -216,6 +218,18 @@ int main(int argc, char *argv[]) case 'f': /* Handled above */ break;
case 'i':/** watchdog_info was obtained as part of file open* validation. So we just show it here.*/oneshot = 1;printf("watchdog_info:\n");printf(" identity:\t\t%s\n", info.identity);printf(" firmware_version:\t%u\n",info.firmware_version);printf(" options:\t\t%08x\n", info.options);break;I would like to see these combined.
Ok.
Please don't add another argument.
I'm not clear on your request here. Do you want to drop the addition of optional --info|-i command line option and always display the watchdog_info?
If yes, perhaps Eugeniu may mention what he has already mentioned to me earlier that "it's very useful to see the watchdog identity" but "some users might perceive the console output a bit busy if the Watchdog identity: <WDT name> message is always on" so perhaps it is "more user-friendly to still call the WDIOC_GETSUPPORT ioctl to sanitize the device file, but to only print the Watchdog identity: message when the user passes e.g. a new -i, --identity parameter".
Combine patch and 1&2.
I'll do that but I'm not entirely clear on your "Please don't add another argument" request.
thanks, -- Shuah