mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts/update-linux-headers: Add setup_data.h to import list

Browse Source 
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>
This commit is contained in:
Michael Roth 2024-02-18 23:35:02 -06:00 committed by Paolo Bonzini
parent a14a2b0148
commit 66210a1a30
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/update-linux-headers.sh
View File

@ -61,7 +61,7 @@ cp_portable() {
-e 'linux/const' \ -e 'linux/const' \
-e 'linux/kernel' \ -e 'linux/kernel' \
-e 'linux/sysinfo' \ -e 'linux/sysinfo' \
-e 'asm-generic/kvm_para' \ -e 'asm/setup_data.h' \
> /dev/null > /dev/null
then then
echo "Unexpected #include in input file $f". 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/__be\([0-9][0-9]*\)/uint\1_t/g' \
-e 's/"\(input-event-codes\.h\)"/"standard-headers\/linux\/\1"/' \ -e 's/"\(input-event-codes\.h\)"/"standard-headers\/linux\/\1"/' \
-e 's/<linux\/\([^>]*\)>/"standard-headers\/linux\/\1"/' \ -e 's/<linux\/\([^>]*\)>/"standard-headers\/linux\/\1"/' \
-e 's/<asm\/\([^>]*\)>/"standard-headers\/asm-'$arch'\/\1"/' \
-e 's/__bitwise//' \ -e 's/__bitwise//' \
-e 's/__attribute__((packed))/QEMU_PACKED/' \ -e 's/__attribute__((packed))/QEMU_PACKED/' \
-e 's/__inline__/inline/' \ -e 's/__inline__/inline/' \
@ -155,11 +156,14 @@ for arch in $ARCHLIST; do
"$tmpdir/include/asm/bootparam.h" > "$tmpdir/bootparam.h" "$tmpdir/include/asm/bootparam.h" > "$tmpdir/bootparam.h"
cp_portable "$tmpdir/bootparam.h" \ cp_portable "$tmpdir/bootparam.h" \
"$output/include/standard-headers/asm-$arch" "$output/include/standard-headers/asm-$arch"
cp_portable "$tmpdir/include/asm/setup_data.h" \
"$output/standard-headers/asm-x86"
fi fi
if [ $arch = riscv ]; then if [ $arch = riscv ]; then
cp "$tmpdir/include/asm/ptrace.h" "$output/linux-headers/asm-riscv/" cp "$tmpdir/include/asm/ptrace.h" "$output/linux-headers/asm-riscv/"
fi fi
done done
arch=
rm -rf "$output/linux-headers/linux" rm -rf "$output/linux-headers/linux"
mkdir -p "$output/linux-headers/linux" mkdir -p "$output/linux-headers/linux"