Skip to content

Commit 6337a08

Browse files
committed
loader: mark all aarch64 specific error
Signed-off-by: Qiu Wenbo <qiuwenbo@phytium.com.cn>
1 parent ab5cf74 commit 6337a08

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

src/loader/mod.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ pub enum Error {
6262
/// Command line overflowed guest memory.
6363
CommandLineOverflow,
6464
/// Device tree binary too big.
65+
#[cfg(target_arch = "aarch64")]
6566
DtbTooBig,
6667
/// Invalid ELF magic number
6768
InvalidElfMagicNumber,
@@ -76,8 +77,10 @@ pub enum Error {
7677
/// Invalid bzImage binary.
7778
InvalidBzImage,
7879
/// Invalid Image binary.
80+
#[cfg(target_arch = "aarch64")]
7981
InvalidImage,
8082
/// Invalid Image magic number.
83+
#[cfg(target_arch = "aarch64")]
8184
InvalidImageMagicNumber,
8285
/// Invalid kernel start address.
8386
InvalidKernelStartAddress,
@@ -94,8 +97,10 @@ pub enum Error {
9497
/// Unable to read bzImage compressed image.
9598
ReadBzImageCompressedKernel,
9699
/// Unable to read Image header
100+
#[cfg(target_arch = "aarch64")]
97101
ReadImageHeader,
98102
/// Unable to read DTB image
103+
#[cfg(target_arch = "aarch64")]
99104
ReadDtbImage,
100105
/// Unable to seek to kernel start.
101106
SeekKernelStart,
@@ -110,12 +115,16 @@ pub enum Error {
110115
/// Unable to seek to bzImage compressed kernel.
111116
SeekBzImageCompressedKernel,
112117
/// Unable to seek to Image end.
118+
#[cfg(target_arch = "aarch64")]
113119
SeekImageEnd,
114120
/// Unable to seek to Image header.
121+
#[cfg(target_arch = "aarch64")]
115122
SeekImageHeader,
116123
/// Unable to seek to DTB start.
124+
#[cfg(target_arch = "aarch64")]
117125
SeekDtbStart,
118126
/// Unable to seek to DTB end.
127+
#[cfg(target_arch = "aarch64")]
119128
SeekDtbEnd,
120129
/// Unable to seek to note header.
121130
SeekNoteHeader,
@@ -136,6 +145,7 @@ impl error::Error for Error {
136145
}
137146
Error::CommandLineCopy => "Failed writing command line to guest memory",
138147
Error::CommandLineOverflow => "Command line overflowed guest memory",
148+
#[cfg(target_arch = "aarch64")]
139149
Error::DtbTooBig => "Device tree image too big",
140150
Error::InvalidElfMagicNumber => "Invalid Elf magic number",
141151
Error::InvalidProgramHeaderSize => "Invalid program header size",
@@ -144,14 +154,18 @@ impl error::Error for Error {
144154
Error::InvalidEntryAddress => "Invalid entry address",
145155
Error::InvalidBzImage => "Invalid bzImage",
146156
Error::InvalidKernelStartAddress => "Invalid kernel start address",
157+
#[cfg(target_arch = "aarch64")]
147158
Error::InvalidImage => "Invalid Image",
159+
#[cfg(target_arch = "aarch64")]
148160
Error::InvalidImageMagicNumber => "Invalid Image magic number",
149161
Error::MemoryOverflow => "Memory to load kernel image is not enough",
150162
Error::ReadElfHeader => "Unable to read elf header",
151163
Error::ReadKernelImage => "Unable to read kernel image",
152164
Error::ReadProgramHeader => "Unable to read program header",
153165
Error::ReadBzImageHeader => "Unable to read bzImage header",
166+
#[cfg(target_arch = "aarch64")]
154167
Error::ReadImageHeader => "Unable to read Image header",
168+
#[cfg(target_arch = "aarch64")]
155169
Error::ReadDtbImage => "Unable to read DTB image",
156170
Error::ReadBzImageCompressedKernel => "Unable to read bzImage compressed kernel",
157171
Error::SeekKernelStart => "Unable to seek to kernel start",
@@ -163,9 +177,13 @@ impl error::Error for Error {
163177
Error::SeekNoteHeader => "Unable to seek to note header",
164178
Error::ReadNoteHeader => "Unable to read note header",
165179
Error::InvalidPvhNote => "Invalid PVH note header",
180+
#[cfg(target_arch = "aarch64")]
166181
Error::SeekImageEnd => "Unable to seek Image end",
182+
#[cfg(target_arch = "aarch64")]
167183
Error::SeekImageHeader => "Unable to seek image header",
184+
#[cfg(target_arch = "aarch64")]
168185
Error::SeekDtbStart => "Unable to seek DTB start",
186+
#[cfg(target_arch = "aarch64")]
169187
Error::SeekDtbEnd => "Unable to seek DTB end",
170188
}
171189
}

0 commit comments

Comments
 (0)