aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap2
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-06-10 08:25:55 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-06-10 08:25:55 +0100
commita7d246473451b6c6949af961ab0971bf45c66d62 (patch)
tree145de03e18af2bd9da363b03909f3d26e7451b97 /tools/blktap2
parent483ed98e11e97cf7f54867dbc992a81105cccf87 (diff)
downloadxen-a7d246473451b6c6949af961ab0971bf45c66d62.tar.gz
xen-a7d246473451b6c6949af961ab0971bf45c66d62.tar.bz2
xen-a7d246473451b6c6949af961ab0971bf45c66d62.zip
blktap2: Fix broken tap-ctl-list type/path filter logic
Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>
Diffstat (limited to 'tools/blktap2')
-rw-r--r--tools/blktap2/control/tap-ctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/blktap2/control/tap-ctl.c b/tools/blktap2/control/tap-ctl.c
index 80fc933a89..e254f0724f 100644
--- a/tools/blktap2/control/tap-ctl.c
+++ b/tools/blktap2/control/tap-ctl.c
@@ -147,10 +147,10 @@ tap_cli_list(int argc, char **argv)
if (pid >= 0 && entry->pid != pid)
continue;
- if (type && entry->type && strcmp(entry->type, type))
+ if (type && (!entry->type || strcmp(entry->type, type)))
continue;
- if (file && entry->path && strcmp(entry->path, file))
+ if (file && (!entry->path || strcmp(entry->path, file)))
continue;
if (tty)