summary refs log tree commit diff
path: root/arch/src/fdt.rs
diff options
context:
space:
mode:
authorGreg Hartman <ghartman@google.com>2019-04-24 02:03:29 +0000
committerchrome-bot <chrome-bot@chromium.org>2019-05-02 21:02:36 -0700
commit5dd8694d77f001f581a3f839621df55f357ca1eb (patch)
tree5355230d7cd13634c3a412e104939073d0cb5a6c /arch/src/fdt.rs
parente23231ccffb149108bb9f80d0b467b24153fcbfa (diff)
downloadcrosvm-5dd8694d77f001f581a3f839621df55f357ca1eb.tar
crosvm-5dd8694d77f001f581a3f839621df55f357ca1eb.tar.gz
crosvm-5dd8694d77f001f581a3f839621df55f357ca1eb.tar.bz2
crosvm-5dd8694d77f001f581a3f839621df55f357ca1eb.tar.lz
crosvm-5dd8694d77f001f581a3f839621df55f357ca1eb.tar.xz
crosvm-5dd8694d77f001f581a3f839621df55f357ca1eb.tar.zst
crosvm-5dd8694d77f001f581a3f839621df55f357ca1eb.zip
Add Android fstab support to aarch64, based on x86_64 version
Test: cargo test on x86_64 and aarch64, boot on aarch64
Change-Id: I29fb269abedaaca4168581aa7f92d413d51e9232
Reviewed-on: https://chromium-review.googlesource.com/1585279
Commit-Ready: Dylan Reid <dgreid@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Greg Hartman <ghartman@google.com>
Diffstat (limited to 'arch/src/fdt.rs')
-rw-r--r--arch/src/fdt.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/src/fdt.rs b/arch/src/fdt.rs
index 0f77754..71c791d 100644
--- a/arch/src/fdt.rs
+++ b/arch/src/fdt.rs
@@ -6,6 +6,7 @@ use byteorder::{BigEndian, ByteOrder};
 use libc::{c_char, c_int, c_void};
 use std::ffi::{CStr, CString};
 use std::fmt::{self, Display};
+use std::io;
 use std::ptr::null;
 
 // This links to libfdt which handles the creation of the binary blob
@@ -35,6 +36,8 @@ pub enum Error {
     FdtFinishError(c_int),
     FdtPackError(c_int),
     FdtGuestMemoryWriteError,
+    FdtFileParseError,
+    FdtIoError(io::Error),
 }
 
 impl Display for Error {
@@ -53,6 +56,8 @@ impl Display for Error {
             FdtFinishError(ret) => write!(f, "error performing FDT finish, code={}", ret),
             FdtPackError(ret) => write!(f, "error packing FDT, code={}", ret),
             FdtGuestMemoryWriteError => write!(f, "error writing FDT to guest memory"),
+            FdtFileParseError => write!(f, "parse error reading FDT parameters"),
+            FdtIoError(ret) => write!(f, "I/O error reading FDT parameters code={}", ret),
         }
     }
 }