svn commit: r285218 - in head: lib/libvmmapi sys/amd64/vmm

[Neel Natu]

Author: neel
Date: Mon Jul  6 19:41:43 2015
New Revision: 285218
URL: https://svnweb.freebsd.org/changeset/base/285218

Log:
  Move the 'devmem' device nodes from /dev/vmm to /dev/vmm.io
  
  Some external tools just do a 'ls /dev/vmm' to figure out the bhyve virtual
  machines on the host. These tools break if the devmem device nodes also
  appear in /dev/vmm.
  
  Requested by:	grehan

Modified:
  head/lib/libvmmapi/vmmapi.c
  head/sys/amd64/vmm/vmm_dev.c

Modified: head/lib/libvmmapi/vmmapi.c
==============================================================================
--- head/lib/libvmmapi/vmmapi.c	Mon Jul  6 19:33:29 2015	(r285217)
+++ head/lib/libvmmapi/vmmapi.c	Mon Jul  6 19:41:43 2015	(r285218)
@@ -472,7 +472,7 @@ vm_create_devmem(struct vmctx *ctx, int 
 	if (error)
 		goto done;
 
-	strlcpy(pathname, "/dev/vmm/", sizeof(pathname));
+	strlcpy(pathname, "/dev/vmm.io/", sizeof(pathname));
 	strlcat(pathname, ctx->name, sizeof(pathname));
 	strlcat(pathname, ".", sizeof(pathname));
 	strlcat(pathname, name, sizeof(pathname));

Modified: head/sys/amd64/vmm/vmm_dev.c
==============================================================================
--- head/sys/amd64/vmm/vmm_dev.c	Mon Jul  6 19:33:29 2015	(r285217)
+++ head/sys/amd64/vmm/vmm_dev.c	Mon Jul  6 19:41:43 2015	(r285218)
@@ -943,7 +943,7 @@ devmem_create_cdev(const char *vmname, i
 	int error;
 
 	error = make_dev_p(MAKEDEV_CHECKNAME, &cdev, &devmemsw, NULL,
-	    UID_ROOT, GID_WHEEL, 0600, "vmm/%s.%s", vmname, devname);
+	    UID_ROOT, GID_WHEEL, 0600, "vmm.io/%s.%s", vmname, devname);
 	if (error)
 		return (error);