summary refs log tree commit diff
path: root/src/linux.rs
diff options
context:
space:
mode:
authorJakub Staron <jstaron@google.com>2019-04-26 11:22:51 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-29 20:57:13 -0700
commitf55f75d6894fe997a619df3fc4ca6e5c9d7b79a6 (patch)
treefbf47be142bf4d51ff80043e54acb2083a1c854e /src/linux.rs
parentaff94ca6da90b92503558b6ba7aa68e1180afd87 (diff)
downloadcrosvm-f55f75d6894fe997a619df3fc4ca6e5c9d7b79a6.tar
crosvm-f55f75d6894fe997a619df3fc4ca6e5c9d7b79a6.tar.gz
crosvm-f55f75d6894fe997a619df3fc4ca6e5c9d7b79a6.tar.bz2
crosvm-f55f75d6894fe997a619df3fc4ca6e5c9d7b79a6.tar.lz
crosvm-f55f75d6894fe997a619df3fc4ca6e5c9d7b79a6.tar.xz
crosvm-f55f75d6894fe997a619df3fc4ca6e5c9d7b79a6.tar.zst
crosvm-f55f75d6894fe997a619df3fc4ca6e5c9d7b79a6.zip
crosvm: Fix misleading field name in VmComponents struct.
Renames field memory_mb to memory_size. All usages of this
field treat it as a memory size in bytes, not megabytes.

BUG=None
TEST=cargo check
TEST=cargo check --package aarch64 --target aarch64-unknown-linux-gnu

Change-Id: I7b1aefe4f0b612d5eeb2987dc2a0fce6db0dd228
Reviewed-on: https://chromium-review.googlesource.com/1585617
Commit-Ready: Jakub StaroĊ„ <jstaron@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'src/linux.rs')
-rw-r--r--src/linux.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/linux.rs b/src/linux.rs
index 7733672..223b3a3 100644
--- a/src/linux.rs
+++ b/src/linux.rs
@@ -1123,7 +1123,7 @@ pub fn run_config(cfg: Config) -> Result<()> {
     };
 
     let components = VmComponents {
-        memory_mb: (cfg.memory.unwrap_or(256) << 20) as u64,
+        memory_size: (cfg.memory.unwrap_or(256) << 20) as u64,
         vcpu_count: cfg.vcpu_count.unwrap_or(1),
         vcpu_affinity: cfg.vcpu_affinity.clone(),
         kernel_image: File::open(&cfg.kernel_path)