On Mon, Jun 03 2024, Paolo Bonzini <pbonz...@redhat.com> wrote:
> This series contains a few cleanups and fixes to update-linux-headers.sh,
> which I needed or found in order to pass CI for the SEV-SNP patches.
>
> First, updating linux-headers/ fails due to the lack of
> arch/loongarch/include/uapi/asm/bitsperlong.h. I am not sure if I am
> doing something wrong but it is caused by commit 3efc75ad9d9
> ("scripts/update-linux-headers.sh: Remove temporary directory inbetween",
> 2024-05-29); if so, I guess I'm 1-1 with Thomas given my own bug in
> commit 66210a1a30 that he fixed.
>
> Before commit 3efc75ad9d9, the missing file would incorrectly cause stale
> files to be included in linux-headers/. The files were never committed
> to qemu.git, but were wrong nevertheless. The build would just use
> the system version of the files, which is opposite to the idea of
> importing Linux header files into QEMU's tree.
>
> Second, pvpanic.h was incorrectly included in a slightly different
> path than what is used in Linux.
>
> Third, SNP host-side patches will need linux/kvm_para.h, because some
> of the supported distros do not have a definition for KVM_HC_MAP_GPA_RANGE.
> Including it is a bit complicated because we also have a version of
> x86's kvm_para.h under include/standard-headers/; linux/kvm_para.h
> tries to include <asm/kvm_para.h> and that could cause conflicts.
> So, the linux/kvm_para.h is also placed in include/standard-headers
> (patch 4).
>
> Pankaj Gupta (1):
> linux-headers: Update to current kvm/next
>
> Paolo Bonzini (3):
> update-linux-headers: fix forwarding to asm-generic headers
> update-linux-headers: move pvpanic.h to correct directory
> update-linux-headers: import linux/kvm_para.h header
>
> include/standard-headers/linux/kvm_para.h | 38 ++++++++++++++
> .../{linux => misc}/pvpanic.h | 0
> linux-headers/asm-loongarch/kvm.h | 4 ++
> linux-headers/asm-riscv/kvm.h | 1 +
> linux-headers/asm-x86/kvm.h | 52 ++++++++++++++++++-
> linux-headers/asm-x86/kvm_para.h | 1 +
> linux-headers/linux/kvm_para.h | 2 +
> linux-headers/linux/vhost.h | 15 +++---
> hw/misc/pvpanic-isa.c | 2 +-
> hw/misc/pvpanic-pci.c | 2 +-
> hw/misc/pvpanic.c | 2 +-
> scripts/update-linux-headers.sh | 37 +++++++++++--
> 12 files changed, 141 insertions(+), 15 deletions(-)
> create mode 100644 include/standard-headers/linux/kvm_para.h
> rename include/standard-headers/{linux => misc}/pvpanic.h (100%)
> create mode 100644 linux-headers/asm-x86/kvm_para.h
> create mode 100644 linux-headers/linux/kvm_para.h
With the hash added to the headers update,
Reviewed-by: Cornelia Huck <coh...@redhat.com>
for the series.
