Skip to content

Commit 57ad18a

Browse files
slpepilys
authored andcommitted
virtio-bindings: Fix powerpc64 bindings
Change scripts/generate-bindings.sh to generate bindings for both powerpc64 and powerpc64le (let's drop 32-bit powerpc) and fix src/lib.rs to import to right headers for each powerpc64 variant according to its endianess. Signed-off-by: Sergio Lopez <[email protected]>
1 parent d36cc20 commit 57ad18a

File tree

12 files changed

+60
-14
lines changed

12 files changed

+60
-14
lines changed

virtio-bindings/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
## Changed
44

55
- Regenerate bindings with Linux 6.16.
6+
- Drop powerpc (32-bit) bindings.
7+
8+
## Fixed
9+
10+
- Fix powerpc64 little-endian bindings.
611

712
# v0.2.6
813

virtio-bindings/scripts/generate-bindings.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ mips mips-linux-gnu
3939
mips32r6 mipsisa32r6-linux-gnu
4040
mips64 mips64-linux-gnu
4141
mips64r6 mipsisa64r6-linux-gnu
42-
powerpc powerpc-linux-gnu
4342
powerpc64 powerpc64-linux-gnu
43+
powerpc64le powerpc64le-linux-gnu
4444
riscv32 riscv32-linux-gnu
4545
riscv64 riscv64-linux-gnu
4646
s390x s390x-linux-gnu
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

virtio-bindings/src/bindings/powerpc/virtio_ring.rs renamed to virtio-bindings/src/bindings/powerpc64le/virtio_ring.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@ pub struct vring {
132132
}
133133
#[allow(clippy::unnecessary_operation, clippy::identity_op)]
134134
const _: () = {
135-
["Size of vring"][::std::mem::size_of::<vring>() - 16usize];
136-
["Alignment of vring"][::std::mem::align_of::<vring>() - 4usize];
135+
["Size of vring"][::std::mem::size_of::<vring>() - 32usize];
136+
["Alignment of vring"][::std::mem::align_of::<vring>() - 8usize];
137137
["Offset of field: vring::num"][::std::mem::offset_of!(vring, num) - 0usize];
138-
["Offset of field: vring::desc"][::std::mem::offset_of!(vring, desc) - 4usize];
139-
["Offset of field: vring::avail"][::std::mem::offset_of!(vring, avail) - 8usize];
140-
["Offset of field: vring::used"][::std::mem::offset_of!(vring, used) - 12usize];
138+
["Offset of field: vring::desc"][::std::mem::offset_of!(vring, desc) - 8usize];
139+
["Offset of field: vring::avail"][::std::mem::offset_of!(vring, avail) - 16usize];
140+
["Offset of field: vring::used"][::std::mem::offset_of!(vring, used) - 24usize];
141141
};
142142
impl Default for vring {
143143
fn default() -> Self {

0 commit comments

Comments
 (0)