From owner-svn-src-projects@FreeBSD.ORG  Fri Oct 12 18:14:54 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id DD841FA0;
 Fri, 12 Oct 2012 18:14:54 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id C6E678FC0A;
 Fri, 12 Oct 2012 18:14:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9CIEsrK052251;
 Fri, 12 Oct 2012 18:14:54 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9CIEsIc052249;
 Fri, 12 Oct 2012 18:14:54 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201210121814.q9CIEsIc052249@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Fri, 12 Oct 2012 18:14:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r241487 - projects/bhyve/usr.sbin/vmmctl
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Oct 2012 18:14:54 -0000

Author: neel
Date: Fri Oct 12 18:14:54 2012
New Revision: 241487
URL: http://svn.freebsd.org/changeset/base/241487

Log:
  Output the value of all capabilities when the "--getcap" option is used without
  a "--capname=<capname>". Do the same for the "--get-all" option.

Modified:
  projects/bhyve/usr.sbin/vmmctl/vmmctl.c

Modified: projects/bhyve/usr.sbin/vmmctl/vmmctl.c
==============================================================================
--- projects/bhyve/usr.sbin/vmmctl/vmmctl.c	Fri Oct 12 17:39:28 2012	(r241486)
+++ projects/bhyve/usr.sbin/vmmctl/vmmctl.c	Fri Oct 12 18:14:54 2012	(r241487)
@@ -1479,14 +1479,27 @@ main(int argc, char *argv[])
 	}
 
 	if (!error && (getcap || get_all)) {
-		int captype, val;
-		captype = vm_capability_name2type(capname);
-		error = vm_get_capability(ctx, vcpu, captype, &val);
-		if (error == 0) {
-			printf("Capability \"%s\" is %s on vcpu %d\n", capname,
-				val ? "set" : "not set", vcpu);
-		} else if (errno == ENOENT) {
-			printf("Capability \"%s\" is not available\n", capname);
+		int captype, val, getcaptype;
+
+		if (getcap && capname)
+			getcaptype = vm_capability_name2type(capname);
+		else
+			getcaptype = -1;
+
+		for (captype = 0; captype < VM_CAP_MAX; captype++) {
+			if (getcaptype >= 0 && captype != getcaptype)
+				continue;
+			error = vm_get_capability(ctx, vcpu, captype, &val);
+			if (error == 0) {
+				printf("Capability \"%s\" is %s on vcpu %d\n",
+					vm_capability_type2name(captype),
+					val ? "set" : "not set", vcpu);
+			} else if (errno == ENOENT) {
+				printf("Capability \"%s\" is not available\n",
+					vm_capability_type2name(captype));
+			} else {
+				break;
+			}
 		}
 	}