aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Elisei <alexandru.elisei@arm.com>2022-06-16 14:48:17 +0100
committerWill Deacon <will@kernel.org>2022-07-01 16:08:06 +0100
commit024c331b8483664853d9346d7884bf382c6745ca (patch)
treeb382ca65867c00e1b0e6db8e1dd4e98adb35c970
parentd9fdaad02dfdb0ea079245218058d60270264660 (diff)
downloadkvmtool-024c331b8483664853d9346d7884bf382c6745ca.tar.gz
Use MB for megabytes consistently
The help text for the -m/--mem argument states that the guest memory size is in MiB (mebibyte). MiB is the same thing as MB (megabyte), and indeed this is how MB is used throughout kvmtool. Replace MiB with MB, so people don't get the wrong idea and start believing that for kvmtool a MB is 10^6 bytes instead of 2^20. Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com> Reviewed-and-Tested-by: Suzuki K Poulose <suzuki.poulose@arm.com> Link: https://lore.kernel.org/r/20220616134828.129006-2-alexandru.elisei@arm.com Signed-off-by: Will Deacon <will@kernel.org>
-rw-r--r--Documentation/kvmtool.14
-rw-r--r--builtin-run.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/kvmtool.1 b/Documentation/kvmtool.1
index 2b8c274d..25d46f8f 100644
--- a/Documentation/kvmtool.1
+++ b/Documentation/kvmtool.1
@@ -10,7 +10,7 @@ kvmtool is a userland tool for creating and controlling KVM guests.
.SH "KVMTOOL COMMANDS"
.sp
.PP
-.B run -k <kernel\-image> [\-c <cores>] [\-m <MiB>] [\-p <command line>]
+.B run -k <kernel\-image> [\-c <cores>] [\-m <MB>] [\-p <command line>]
.br
.B [\-i <initrd>] [\-d <image file>] [\-\-console serial|virtio|hv]
.br
@@ -30,7 +30,7 @@ The number of virtual CPUs to run.
.sp
.B \-m, \-\-mem <n>
.RS 4
-Virtual machine memory size in MiB.
+Virtual machine memory size in MB.
.RE
.sp
.B \-p, \-\-params <parameters>
diff --git a/builtin-run.c b/builtin-run.c
index 9a1a0c1f..0126c9fb 100644
--- a/builtin-run.c
+++ b/builtin-run.c
@@ -97,7 +97,7 @@ void kvm_run_set_wrapper_sandbox(void)
"A name for the guest"), \
OPT_INTEGER('c', "cpus", &(cfg)->nrcpus, "Number of CPUs"), \
OPT_U64('m', "mem", &(cfg)->ram_size, "Virtual machine memory" \
- " size in MiB."), \
+ " size in MB."), \
OPT_CALLBACK('d', "disk", kvm, "image or rootfs_dir", "Disk " \
" image or rootfs directory", img_name_parser, \
kvm), \