From b264dbd27739600955a365725f66ceae47e8a456 Mon Sep 17 00:00:00 2001 From: Joan Lledó Date: Sat, 15 Feb 2020 09:56:26 +0100 Subject: pci-arbiter: Rename command line options Rename some CLI options in order to add the new -D --device arg. Replace -s by -c for subclasses. Replace -D by -d for domains. Domains are optional from now on, default to 0. Replace -d by -s for devices. The formerly called "devices" are now called "slots", and "device" will refer to a combination of Domain + Bus + Slot + Function Only -G and -U options create new permission scopes. * pci-arbiter/options.c: parse_opts(): Rename options * pci-arbiter/options.h: struct argp_option options[]: Likewise --- pci-arbiter/options.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'pci-arbiter/options.h') diff --git a/pci-arbiter/options.h b/pci-arbiter/options.h index 814f81ad..9a25c603 100644 --- a/pci-arbiter/options.h +++ b/pci-arbiter/options.h @@ -51,12 +51,12 @@ struct parse_hook static const struct argp_option options[] = { {0, 0, 0, 0, "Permission scope:", 1}, {"class", 'C', "CLASS", 0, "Device class in hexadecimal"}, - {"subclass", 's', "SUBCLASS", 0, - "Device subclass in hexadecimal, only valid with -c"}, - {"domain", 'D', "DOMAIN", 0, "Device domain in hexadecimal"}, - {"bus", 'b', "BUS", 0, "Device bus in hexadecimal, only valid with -D"}, - {"dev", 'd', "DEV", 0, "Device dev in hexadecimal, only valid with -b"}, - {"func", 'f', "FUNC", 0, "Device func in hexadecimal, only valid with -d"}, + {"subclass", 'c', "SUBCLASS", 0, + "Device subclass in hexadecimal, requires -C"}, + {"domain", 'd', "DOMAIN", 0, "Device domain in hexadecimal"}, + {"bus", 'b', "BUS", 0, "Device bus in hexadecimal"}, + {"slot", 's', "SLOT", 0, "Device slot in hexadecimal, requires -b"}, + {"func", 'f', "FUNC", 0, "Device func in hexadecimal, requires -s"}, {0, 0, 0, 0, "These apply to a given permission scope:", 2}, {"uid", 'U', "UID", 0, "User ID to give permissions to"}, {"gid", 'G', "GID", 0, "Group ID to give permissions to"}, @@ -67,8 +67,8 @@ static const struct argp_option options[] = { }; static const char doc[] = "More than one permission scope may be specified. \ -Uppercase options create a new permission scope if the current one already \ -has a value for that option. If one node is covered by more than one \ -permission scope, only the first permission is applied to that node."; +-G and -U options create a new permission scope if the current one already \ +has a value for that option. If one device is covered by more than one \ +permission scope, only the first permission is applied."; #endif // OPTIONS_H -- cgit v1.2.3