crosvm: change GuestAddress to always be a u64

We want to be able to run 64-bit ARM kernels using a 32-bit version of
crosvm, to make it more consistent use a u64 to represent
GuestAddress.

BUG=chromium:797868
TEST=./build_test passes on all architectures
TEST=crosvm runs on caroline

Change-Id: I43bf993592caf46891e3e5e05258ab70b6bf3045
Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/896398
Reviewed-by: Dylan Reid <dgreid@chromium.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/vm_control/src/lib.rs b/vm_control/src/lib.rs
index bf363e1..6688077 100644
--- a/vm_control/src/lib.rs
+++ b/vm_control/src/lib.rs
@@ -205,7 +205,7 @@ impl VmRequest {
                 };
                 let pfn = *next_mem_pfn;
                 let slot =
-                    match vm.add_device_memory(GuestAddress((pfn << 12) as usize), mmap, false) {
+                    match vm.add_device_memory(GuestAddress(pfn << 12), mmap, false) {
                         Ok(slot) => slot,
                         Err(e) => return VmResponse::Err(e),
                     };