Nice! You got mail working!
On Tue, Dec 3, 2019 at 6:33 PM Li, Redhairer <[email protected]> wrote:
>
> Allow daxctl to accept both <region-id>, and region name as region parameter.
> For example:
>
> daxctl list -r region5
> daxctl list -r 5
>
> Link: https://github.com/pmem/ndctl/issues/109
> Signed-off-by: Redhairer Li <[email protected]>
> ---
> daxctl/device.c | 11 ++++-------
> daxctl/list.c | 14 ++++++--------
> util/filter.c | 16 ++++++++++++++++
> util/filter.h | 2 ++
> 4 files changed, 28 insertions(+), 15 deletions(-)
>
> diff --git a/daxctl/device.c b/daxctl/device.c
> index 72e506e..d9db2f9 100644
> --- a/daxctl/device.c
> +++ b/daxctl/device.c
> @@ -19,15 +19,13 @@
> static struct {
> const char *dev;
> const char *mode;
> - int region_id;
> + const char *region;
> bool no_online;
> bool no_movable;
> bool force;
> bool human;
> bool verbose;
> -} param = {
> - .region_id = -1,
> -};
> +} param;
>
> enum dev_mode {
> DAXCTL_DEV_MODE_UNKNOWN,
> @@ -51,7 +49,7 @@ enum device_action {
> };
>
> #define BASE_OPTIONS() \
> -OPT_INTEGER('r', "region", ¶m.region_id, "restrict to the given
> region"), \
> +OPT_STRING('r', "region", ¶m.region, "region-id", "filter by region"), \
> OPT_BOOLEAN('u', "human", ¶m.human, "use human friendly number
> formats"), \
> OPT_BOOLEAN('v', "verbose", ¶m.verbose, "emit more debug messages")
>
> @@ -484,8 +482,7 @@ static int do_xaction_device(const char *device, enum
> device_action action,
> *processed = 0;
>
> daxctl_region_foreach(ctx, region) {
> - if (param.region_id >= 0 && param.region_id
> - != daxctl_region_get_id(region))
> + if (!util_daxctl_region_filter(region, device))
> continue;
There's a bug here, can you spot it?
This causes:
make TESTS=daxctl-devices.sh check
...to fail.
_______________________________________________
Linux-nvdimm mailing list -- [email protected]
To unsubscribe send an email to [email protected]
