On Tue, Apr 17, 2018 at 09:58:16PM +0300, Michael S. Tsirkin wrote:
> kvm_para.h is normally an interface for guest. It's natural to need the
> header in host to emulate that in qemu.
>
> ATM it does not actually work on non-kvm systems, which allowed us to
> get by sticking it in linux-headers and only pulling it in on Linux, but
> that turns out to be more pain than it's worth.
>
> The result seems to be that we are forced to duplicate
> more and more code from there when we are in portable code.
> Not nice.
>
> Let's just pull it into standard-headers instead, and use
> on all platforms unconditionally.
>
> It turns out we only need the x86 version, so that is
> and extra a plus - drop the rest.
Ping kvm maintainers - any comments?
Should I merge this one?
> Michael S. Tsirkin (4):
> update-linux-headers.sh: drop kvm_para.h hacks
> include/standard-headers: add asm-x86/kvm_para.h
> x86/cpu: use standard-headers/asm-x86.kvm_para.h
> linux-headers: drop kvm_para.h
>
> .../standard-headers}/asm-x86/kvm_para.h | 49 ++++++-----
> include/sysemu/kvm.h | 1 -
> linux-headers/asm-arm/kvm_para.h | 2 -
> linux-headers/asm-arm64/kvm_para.h | 1 -
> linux-headers/asm-generic/kvm_para.h | 4 -
> linux-headers/asm-mips/kvm_para.h | 5 --
> linux-headers/asm-powerpc/epapr_hcalls.h | 99 ----------------------
> linux-headers/asm-powerpc/kvm_para.h | 98 ---------------------
> linux-headers/asm-s390/kvm_para.h | 8 --
> linux-headers/linux/kvm_para.h | 35 --------
> target/i386/cpu.h | 2 -
> target/i386/kvm_i386.h | 6 --
> hw/i386/kvm/clock.c | 2 +-
> target/i386/cpu.c | 4 +-
> target/i386/kvm.c | 4 +-
> scripts/update-linux-headers.sh | 16 ++--
> 16 files changed, 35 insertions(+), 301 deletions(-)
> rename {linux-headers => include/standard-headers}/asm-x86/kvm_para.h (80%)
> delete mode 100644 linux-headers/asm-arm/kvm_para.h
> delete mode 100644 linux-headers/asm-arm64/kvm_para.h
> delete mode 100644 linux-headers/asm-generic/kvm_para.h
> delete mode 100644 linux-headers/asm-mips/kvm_para.h
> delete mode 100644 linux-headers/asm-powerpc/epapr_hcalls.h
> delete mode 100644 linux-headers/asm-powerpc/kvm_para.h
> delete mode 100644 linux-headers/asm-s390/kvm_para.h
> delete mode 100644 linux-headers/linux/kvm_para.h
>
> --
> MST
>
