From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 10 Jun 2010 07:25:55 +0000 (+0100)
Subject: blktap2: Fix broken tap-ctl-list type/path filter logic
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11960
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a7d246473451b6c6949af961ab0971bf45c66d62;p=xen.git

blktap2: Fix broken tap-ctl-list type/path filter logic

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>
---

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)