summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2015-11-23 13:40:29 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2015-11-23 13:40:29 +0000
commit66362be759f0eb1835360779b79493f5b0b2fcf3 (patch)
tree215987805db976ec52e8f9b3863657e9533ca530 /usr.sbin
parentf17df4ee4d7db456c91c1d1a23ce3081edb486dd (diff)
Clarify the size argument, you can specify it as bytes or kilobytes,
but it is rounded to megabytes. Pointed out by deraadt@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/vmmctl/vmm.conf.56
-rw-r--r--usr.sbin/vmmctl/vmmctl.86
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/vmmctl/vmm.conf.5 b/usr.sbin/vmmctl/vmm.conf.5
index ccc48702415..ae187008cb0 100644
--- a/usr.sbin/vmmctl/vmm.conf.5
+++ b/usr.sbin/vmmctl/vmm.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vmm.conf.5,v 1.3 2015/11/22 23:37:46 jmc Exp $
+.\" $OpenBSD: vmm.conf.5,v 1.4 2015/11/23 13:40:28 reyk Exp $
.\"
.\" Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
.\" Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: November 22 2015 $
+.Dd $Mdocdate: November 23 2015 $
.Dt VMM.CONF 5
.Os
.Sh NAME
@@ -128,7 +128,7 @@ Disk image file (may be specified multiple times to add multiple disk images).
.It Cm kernel Ar path
Kernel to load when booting the VM.
.It Cm memory Ar size
-Memory size of the VM, in bytes.
+Memory size of the VM, in bytes, rounded to megabytes.
Optionally, the units 'K', 'M', or 'G', for kilo-, mega-, and gigabytes
can be used.
.It Cm interfaces Ar count
diff --git a/usr.sbin/vmmctl/vmmctl.8 b/usr.sbin/vmmctl/vmmctl.8
index 3194274ae9f..3d27685c4ef 100644
--- a/usr.sbin/vmmctl/vmmctl.8
+++ b/usr.sbin/vmmctl/vmmctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vmmctl.8,v 1.4 2015/11/22 23:41:27 jmc Exp $
+.\" $OpenBSD: vmmctl.8,v 1.5 2015/11/23 13:40:28 reyk Exp $
.\"
.\" Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: November 22 2015 $
+.Dd $Mdocdate: November 23 2015 $
.Dt VMMCTL 8
.Os
.Sh NAME
@@ -74,7 +74,7 @@ Disk image file (may be specified multiple times to add multiple disk images).
.It Cm kernel Ar path
Kernel to load when booting the VM.
.It Cm memory Ar size
-Memory size of the VM, in bytes.
+Memory size of the VM, in bytes, rounded to megabytes.
Optionally, the units 'K', 'M', or 'G', for kilo-, mega-, and gigabytes
can be used.
.It Cm interfaces Ar count