diff options
| author | Jakub Staron <jstaron@google.com> | 2019-04-26 11:22:51 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-29 20:57:13 -0700 |
| commit | f55f75d6894fe997a619df3fc4ca6e5c9d7b79a6 (patch) | |
| tree | fbf47be142bf4d51ff80043e54acb2083a1c854e /aarch64 | |
| parent | aff94ca6da90b92503558b6ba7aa68e1180afd87 (diff) | |
| download | crosvm-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 'aarch64')
| -rw-r--r-- | aarch64/src/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/aarch64/src/lib.rs b/aarch64/src/lib.rs index ac70e0d..53e2084 100644 --- a/aarch64/src/lib.rs +++ b/aarch64/src/lib.rs @@ -197,8 +197,8 @@ impl arch::LinuxArch for AArch64 { E: StdError + 'static, { let mut resources = - Self::get_resource_allocator(components.memory_mb, components.wayland_dmabuf); - let mem = Self::setup_memory(components.memory_mb)?; + Self::get_resource_allocator(components.memory_size, components.wayland_dmabuf); + let mem = Self::setup_memory(components.memory_size)?; let kvm = Kvm::new().map_err(Error::CreateKvm)?; let mut vm = Vm::new(&kvm, mem.clone()).map_err(Error::CreateVm)?; @@ -263,7 +263,7 @@ impl arch::LinuxArch for AArch64 { let kernel_end = get_kernel_addr().offset() + kernel_size as u64; Self::setup_system_memory( &mem, - components.memory_mb, + components.memory_size, vcpu_count, &CString::new(cmdline).unwrap(), components.initrd_image, |