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.

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

Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Message-id: 1523991487-241006-1-git-send-email-mst@redhat.com
Subject: [Qemu-devel] [PATCH 0/4] move kvm_para.h to standard-headers

=== TEST SCRIPT BEGIN ===
#!/bin/bash

BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0

git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram

commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
    echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
    if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
        failed=1
        echo
    fi
    n=$((n+1))
done

exit $failed
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 * [new tag]               patchew/1523991487-241006-1-git-send-email-mst@redhat.com -> patchew/1523991487-241006-1-git-send-email-mst@redhat.com
 t [tag update]            patchew/20180417133602.23832-1-marcandre.lureau@redhat.com -> patchew/20180417133602.23832-1-marcandre.lureau@redhat.com
 t [tag update]            patchew/cover.1523968389.git.berto@igalia.com -> patchew/cover.1523968389.git.berto@igalia.com
Switched to a new branch 'test'
6c8133c47c linux-headers: drop kvm_para.h
ce5d4ce607 x86/cpu: use standard-headers/asm-x86.kvm_para.h
124799b55a include/standard-headers: add asm-x86/kvm_para.h
cd93f5f702 update-linux-headers.sh: drop kvm_para.h hacks

=== OUTPUT BEGIN ===
Checking PATCH 1/4: update-linux-headers.sh: drop kvm_para.h hacks...
ERROR: line over 90 characters
#48: FILE: scripts/update-linux-headers.sh:124:
+        cp_portable "$tmpdir/include/asm/kvm_para.h" "$output/include/standard-headers/asm-$arch"

total: 1 errors, 0 warnings, 44 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

Checking PATCH 2/4: include/standard-headers: add asm-x86/kvm_para.h...
Checking PATCH 3/4: x86/cpu: use standard-headers/asm-x86.kvm_para.h...
Checking PATCH 4/4: linux-headers: drop kvm_para.h...
=== OUTPUT END ===

Test command exited with code: 1


---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

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
> 

On 15/05/2018 14:33, Michael S. Tsirkin wrote:
>> 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?

Yes, go ahead!

Paolo