[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] scripts/update-linux-headers: Handle __aligned_
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 2/6] scripts/update-linux-headers: Handle __aligned_u64 |
Date: |
Fri, 25 May 2018 14:27:51 +0100 |
We'll currently replace any 'u64' with a 'uint64_t' including when
it's embedded in an '__aligned_u64', creating a '__aligned_uint64_t'
which doesn't exist. We need to instead expand out the kernel's
definition of __aligned_u64:
#define __aligned_u64 __u64 __attribute__((aligned(8)))
before we convert the __u64 to uint64_t.
Signed-off-by: Peter Maydell <address@hidden>
---
scripts/update-linux-headers.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 947dec2852..1fe54f8ab1 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -51,7 +51,8 @@ cp_portable() {
fi
header=$(basename "$f");
- sed -e 's/__u\([0-9][0-9]*\)/uint\1_t/g' \
+ sed -e 's/__aligned_u64/__u64 __attribute__((aligned(8)))/g' \
+ -e 's/__u\([0-9][0-9]*\)/uint\1_t/g' \
-e 's/u\([0-9][0-9]*\)/uint\1_t/g' \
-e 's/__s\([0-9][0-9]*\)/int\1_t/g' \
-e 's/__le\([0-9][0-9]*\)/uint\1_t/g' \
--
2.17.0
- [Qemu-devel] [PATCH 0/6] Update Linux headers to 4.17-rc6, Peter Maydell, 2018/05/25
- [Qemu-devel] [PATCH 2/6] scripts/update-linux-headers: Handle __aligned_u64,
Peter Maydell <=
- [Qemu-devel] [PATCH 4/6] target/i386/kvm.c: Handle renaming of KVM_HINTS_DEDICATED, Peter Maydell, 2018/05/25
- [Qemu-devel] [PATCH 3/6] scripts/update-linux-headers: Handle kernel license no longer being one file, Peter Maydell, 2018/05/25
- [Qemu-devel] [PATCH 6/6] target/i386/kvm.c: Remove compatibility shim for KVM_HINTS_REALTIME, Peter Maydell, 2018/05/25
- [Qemu-devel] [PATCH 1/6] virtio-gpu-3d: Define VIRTIO_GPU_CAPSET_VIRGL2 elsewhere, Peter Maydell, 2018/05/25
- [Qemu-devel] [PATCH 5/6] Update Linux headers to 4.17-rc6, Peter Maydell, 2018/05/25
- Re: [Qemu-devel] [PATCH 0/6] Update Linux headers to 4.17-rc6, Michael S. Tsirkin, 2018/05/25