Drop the linux-specific virtio headers, use the copy from standard-headers instead.
Signed-off-by: Michael S. Tsirkin <m...@redhat.com> --- scripts/update-linux-headers.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 738e590..9654553 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -61,7 +61,7 @@ done rm -rf "$output/linux-headers/linux" mkdir -p "$output/linux-headers/linux" -for header in kvm.h kvm_para.h vfio.h vhost.h virtio_config.h virtio_ring.h \ +for header in kvm.h kvm_para.h vfio.h vhost.h \ psci.h; do cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux" done @@ -76,6 +76,12 @@ else cp "$linux/COPYING" "$output/linux-headers" fi +cat <<EOF >$output/linux-headers/linux/virtio_config.h +#include "standard-headers/sys/virtio_config.h" +EOF +cat <<EOF >$output/linux-headers/linux/virtio_ring.h +#include "standard-headers/sys/virtio_ring.h" +EOF rm -rf "$output/include/standard-headers/sys" mkdir -p "$output/include/standard-headers/sys" -- MST