Re: [Qemu-devel] [PATCH 1/4] update-linux-headers.sh: drop kvm_para.h hacks

[Cornelia Huck]

On Wed, 18 Apr 2018 19:05:15 +0300
"Michael S. Tsirkin" <address@hidden> wrote:

> On Wed, Apr 18, 2018 at 09:54:26AM +0200, Cornelia Huck wrote:
> > On Tue, 17 Apr 2018 21:58:21 +0300
> > "Michael S. Tsirkin" <address@hidden> wrote:
> >   
> > > It turns out (as will be clear from follow-up patches)
> > > we do not really need any kvm para macros host side
> > > for now, except on x86, and there we need it
> > > unconditionally whether we run on kvm or we don't.
> > > 
> > > Import the x86 asm/kvm_para.h into standard-headers,
> > > follow-up patches remove a bunch of code using this.
> > > 
> > > Signed-off-by: Michael S. Tsirkin <address@hidden>
> > > ---
> > >  scripts/update-linux-headers.sh | 16 +++++-----------
> > >  1 file changed, 5 insertions(+), 11 deletions(-)
> > > 
> > > diff --git a/scripts/update-linux-headers.sh 
> > > b/scripts/update-linux-headers.sh
> > > index 5b1d8dc..a017b53 100755
> > > --- a/scripts/update-linux-headers.sh
> > > +++ b/scripts/update-linux-headers.sh
> > > @@ -43,6 +43,7 @@ cp_portable() {
> > >                                       -e 'limits' \
> > >                                       -e 'linux/kernel' \
> > >                                       -e 'linux/sysinfo' \
> > > +                                     -e 'asm-generic/kvm_para' \  
> > >                                       > /dev/null    
> > >      then
> > >          echo "Unexpected #include in input file $f".
> > > @@ -98,13 +99,9 @@ for arch in $ARCHLIST; do
> > >  
> > >      rm -rf "$output/linux-headers/asm-$arch"
> > >      mkdir -p "$output/linux-headers/asm-$arch"
> > > -    for header in kvm.h kvm_para.h unistd.h; do
> > > +    for header in kvm.h unistd.h; do
> > >          cp "$tmpdir/include/asm/$header" 
> > > "$output/linux-headers/asm-$arch"
> > >      done
> > > -    if [ $arch = powerpc ]; then
> > > -        cp "$tmpdir/include/asm/epapr_hcalls.h" 
> > > "$output/linux-headers/asm-powerpc/"
> > > -    fi  
> > 
> > Hm, why are you dropping this one?
> > 
> > (The other changes look sane.)  
> 
> Because it's only used by kvm_para.h. Isn't it?
> 

Ok, I did not look into it in detail, sorry. (It's not obvious from the
file name :)