Skip to content

Commit 73b8eb5

Browse files
committed
loader: mark all aarch64 specific error
Signed-off-by: Qiu Wenbo <qiuwenbo@phytium.com.cn>
1 parent 14c3349 commit 73b8eb5

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
@@ -53,6 +53,7 @@ pub enum Error {
5353
/// Command line overflowed guest memory.
5454
CommandLineOverflow,
5555
/// Device tree binary too big.
56+
#[cfg(target_arch = "aarch64")]
5657
DtbTooBig,
5758
/// Invalid ELF magic number
5859
InvalidElfMagicNumber,
@@ -67,8 +68,10 @@ pub enum Error {
6768
/// Invalid bzImage binary.
6869
InvalidBzImage,
6970
/// Invalid Image binary.
71+
#[cfg(target_arch = "aarch64")]
7072
InvalidImage,
7173
/// Invalid Image magic number.
74+
#[cfg(target_arch = "aarch64")]
7275
InvalidImageMagicNumber,
7376
/// Invalid kernel start address.
7477
InvalidKernelStartAddress,
@@ -85,8 +88,10 @@ pub enum Error {
8588
/// Unable to read bzImage compressed image.
8689
ReadBzImageCompressedKernel,
8790
/// Unable to read Image header
91+
#[cfg(target_arch = "aarch64")]
8892
ReadImageHeader,
8993
/// Unable to read DTB image
94+
#[cfg(target_arch = "aarch64")]
9095
ReadDtbImage,
9196
/// Unable to seek to kernel start.
9297
SeekKernelStart,
@@ -101,12 +106,16 @@ pub enum Error {
101106
/// Unable to seek to bzImage compressed kernel.
102107
SeekBzImageCompressedKernel,
103108
/// Unable to seek to Image end.
109+
#[cfg(target_arch = "aarch64")]
104110
SeekImageEnd,
105111
/// Unable to seek to Image header.
112+
#[cfg(target_arch = "aarch64")]
106113
SeekImageHeader,
107114
/// Unable to seek to DTB start.
115+
#[cfg(target_arch = "aarch64")]
108116
SeekDtbStart,
109117
/// Unable to seek to DTB end.
118+
#[cfg(target_arch = "aarch64")]
110119
SeekDtbEnd,
111120
}
112121

@@ -121,6 +130,7 @@ impl error::Error for Error {
121130
}
122131
Error::CommandLineCopy => "Failed writing command line to guest memory",
123132
Error::CommandLineOverflow => "Command line overflowed guest memory",
133+
#[cfg(target_arch = "aarch64")]
124134
Error::DtbTooBig => "Device tree image too big",
125135
Error::InvalidElfMagicNumber => "Invalid Elf magic number",
126136
Error::InvalidProgramHeaderSize => "Invalid program header size",
@@ -129,14 +139,18 @@ impl error::Error for Error {
129139
Error::InvalidEntryAddress => "Invalid entry address",
130140
Error::InvalidBzImage => "Invalid bzImage",
131141
Error::InvalidKernelStartAddress => "Invalid kernel start address",
142+
#[cfg(target_arch = "aarch64")]
132143
Error::InvalidImage => "Invalid Image",
144+
#[cfg(target_arch = "aarch64")]
133145
Error::InvalidImageMagicNumber => "Invalid Image magic number",
134146
Error::MemoryOverflow => "Memory to load kernel image is not enough",
135147
Error::ReadElfHeader => "Unable to read elf header",
136148
Error::ReadKernelImage => "Unable to read kernel image",
137149
Error::ReadProgramHeader => "Unable to read program header",
138150
Error::ReadBzImageHeader => "Unable to read bzImage header",
151+
#[cfg(target_arch = "aarch64")]
139152
Error::ReadImageHeader => "Unable to read Image header",
153+
#[cfg(target_arch = "aarch64")]
140154
Error::ReadDtbImage => "Unable to read DTB image",
141155
Error::ReadBzImageCompressedKernel => "Unable to read bzImage compressed kernel",
142156
Error::SeekKernelStart => "Unable to seek to kernel start",
@@ -145,9 +159,13 @@ impl error::Error for Error {
145159
Error::SeekBzImageEnd => "Unable to seek bzImage end",
146160
Error::SeekBzImageHeader => "Unable to seek bzImage header",
147161
Error::SeekBzImageCompressedKernel => "Unable to seek bzImage compressed kernel",
162+
#[cfg(target_arch = "aarch64")]
148163
Error::SeekImageEnd => "Unable to seek Image end",
164+
#[cfg(target_arch = "aarch64")]
149165
Error::SeekImageHeader => "Unable to seek image header",
166+
#[cfg(target_arch = "aarch64")]
150167
Error::SeekDtbStart => "Unable to seek DTB start",
168+
#[cfg(target_arch = "aarch64")]
151169
Error::SeekDtbEnd => "Unable to seek DTB end",
152170
}
153171
}

0 commit comments

Comments
 (0)