84 lines
3.5 KiB
Diff
84 lines
3.5 KiB
Diff
|
From 2d0989fe09703ef46ba9c5d14770dbf8a6fd2f80 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Roth <michael.roth@amd.com>
|
||
|
|
Date: Sun, 18 Feb 2024 23:35:02 -0600
|
||
|
|
Subject: [PATCH 015/100] scripts/update-linux-headers: Add setup_data.h to
|
||
|
|
import list
|
||
|
|
|
||
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
RH-MergeRequest: 245: SEV-SNP support
|
||
|
|
RH-Jira: RHEL-39544
|
||
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
RH-Acked-by: Bandan Das <bdas@redhat.com>
|
||
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||
|
|
RH-Commit: [15/91] 9d46c8787259317710a84e7a6aa36731e9f55a17 (bonzini/rhel-qemu-kvm)
|
||
|
|
|
||
|
|
Data structures like struct setup_data have been moved to a separate
|
||
|
|
setup_data.h header which bootparam.h relies on. Add setup_data.h to
|
||
|
|
the cp_portable() list and sync it along with the other header files.
|
||
|
|
|
||
|
|
Note that currently struct setup_data is stripped away as part of
|
||
|
|
generating bootparam.h, but that handling is no currently needed for
|
||
|
|
setup_data.h since it doesn't pull in many external
|
||
|
|
headers/dependencies. However, QEMU currently redefines struct
|
||
|
|
setup_data in hw/i386/x86.c, so that will need to be removed as part of
|
||
|
|
any header update that pulls in the new setup_data.h to avoid build
|
||
|
|
bisect breakage.
|
||
|
|
|
||
|
|
Because <asm/setup_data.h> is the first architecture specific #include
|
||
|
|
in include/standard-headers/, add a new sed substitution to rewrite
|
||
|
|
asm/ include to the standard-headers/asm-* subdirectory for the current
|
||
|
|
architecture.
|
||
|
|
|
||
|
|
And while at it, remove asm-generic/kvm_para.h from the list of
|
||
|
|
allowed includes: it does not have a matching substitution, and therefore
|
||
|
|
it would not be possible to use it on non-Linux systems where there is
|
||
|
|
no /usr/include/asm-generic/ directory.
|
||
|
|
|
||
|
|
Signed-off-by: Michael Roth <michael.roth@amd.com>
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
(cherry picked from commit 66210a1a30f2384bb59f9dad8d769dba56dd30f1)
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
---
|
||
|
|
scripts/update-linux-headers.sh | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
|
||
|
|
index a0006eec6f..d48856f9e2 100755
|
||
|
|
--- a/scripts/update-linux-headers.sh
|
||
|
|
+++ b/scripts/update-linux-headers.sh
|
||
|
|
@@ -61,7 +61,7 @@ cp_portable() {
|
||
|
|
-e 'linux/const' \
|
||
|
|
-e 'linux/kernel' \
|
||
|
|
-e 'linux/sysinfo' \
|
||
|
|
- -e 'asm-generic/kvm_para' \
|
||
|
|
+ -e 'asm/setup_data.h' \
|
||
|
|
> /dev/null
|
||
|
|
then
|
||
|
|
echo "Unexpected #include in input file $f".
|
||
|
|
@@ -77,6 +77,7 @@ cp_portable() {
|
||
|
|
-e 's/__be\([0-9][0-9]*\)/uint\1_t/g' \
|
||
|
|
-e 's/"\(input-event-codes\.h\)"/"standard-headers\/linux\/\1"/' \
|
||
|
|
-e 's/<linux\/\([^>]*\)>/"standard-headers\/linux\/\1"/' \
|
||
|
|
+ -e 's/<asm\/\([^>]*\)>/"standard-headers\/asm-'$arch'\/\1"/' \
|
||
|
|
-e 's/__bitwise//' \
|
||
|
|
-e 's/__attribute__((packed))/QEMU_PACKED/' \
|
||
|
|
-e 's/__inline__/inline/' \
|
||
|
|
@@ -155,11 +156,14 @@ for arch in $ARCHLIST; do
|
||
|
|
"$tmpdir/include/asm/bootparam.h" > "$tmpdir/bootparam.h"
|
||
|
|
cp_portable "$tmpdir/bootparam.h" \
|
||
|
|
"$output/include/standard-headers/asm-$arch"
|
||
|
|
+ cp_portable "$tmpdir/include/asm/setup_data.h" \
|
||
|
|
+ "$output/standard-headers/asm-x86"
|
||
|
|
fi
|
||
|
|
if [ $arch = riscv ]; then
|
||
|
|
cp "$tmpdir/include/asm/ptrace.h" "$output/linux-headers/asm-riscv/"
|
||
|
|
fi
|
||
|
|
done
|
||
|
|
+arch=
|
||
|
|
|
||
|
|
rm -rf "$output/linux-headers/linux"
|
||
|
|
mkdir -p "$output/linux-headers/linux"
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|