1. Patchew
  2. QEMU
  3. [Qemu-devel] [PATCH 0/4] move kvm_para.h to standard-headers
  4. View patch

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

Michael S. Tsirkin posted 4 patches 7 years, 9 months ago
[Qemu-devel] [PATCH 1/4] update-linux-headers.sh: drop kvm_para.h hacks
Posted by Michael S. Tsirkin 7 years, 9 months ago 
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 <mst@redhat.com>
---
 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
-
     rm -rf "$output/include/standard-headers/asm-$arch"
     mkdir -p "$output/include/standard-headers/asm-$arch"
     if [ $arch = s390 ]; then
@@ -124,20 +121,17 @@ EOF
         cp "$tmpdir/include/asm/unistd_32.h" "$output/linux-headers/asm-x86/"
         cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"
         cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"
+        cp_portable "$tmpdir/include/asm/kvm_para.h" "$output/include/standard-headers/asm-$arch"
     fi
 done
 
 rm -rf "$output/linux-headers/linux"
 mkdir -p "$output/linux-headers/linux"
-for header in kvm.h kvm_para.h vfio.h vfio_ccw.h vhost.h \
+for header in kvm.h vfio.h vfio_ccw.h vhost.h \
               psci.h psp-sev.h userfaultfd.h; do
     cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux"
 done
-rm -rf "$output/linux-headers/asm-generic"
-mkdir -p "$output/linux-headers/asm-generic"
-for header in kvm_para.h; do
-    cp "$tmpdir/include/asm-generic/$header" "$output/linux-headers/asm-generic"
-done
+
 if [ -L "$linux/source" ]; then
     cp "$linux/source/COPYING" "$output/linux-headers"
 else
-- 
MST
Re: [Qemu-devel] [PATCH 1/4] update-linux-headers.sh: drop kvm_para.h hacks
Posted by Eduardo Habkost 7 years, 9 months ago 
On Tue, Apr 17, 2018 at 09:58:21PM +0300, Michael S. Tsirkin 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 <mst@redhat.com>

I didn't review the code yet but I agree it's a good change, so:

Acked-by: Eduardo Habkost <ehabkost@redhat.com>

-- 
Eduardo
Re: [Qemu-devel] [PATCH 1/4] update-linux-headers.sh: drop kvm_para.h hacks
Posted by Cornelia Huck 7 years, 9 months ago 
On Tue, 17 Apr 2018 21:58:21 +0300
"Michael S. Tsirkin" <mst@redhat.com> 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 <mst@redhat.com>
> ---
>  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.)
Re: [Qemu-devel] [PATCH 1/4] update-linux-headers.sh: drop kvm_para.h hacks
Posted by Michael S. Tsirkin 7 years, 9 months ago 
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" <mst@redhat.com> 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 <mst@redhat.com>
> > ---
> >  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?

-- 
MST
Re: [Qemu-devel] [PATCH 1/4] update-linux-headers.sh: drop kvm_para.h hacks
Posted by Cornelia Huck 7 years, 9 months ago 
On Wed, 18 Apr 2018 19:05:15 +0300
"Michael S. Tsirkin" <mst@redhat.com> 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" <mst@redhat.com> 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 <mst@redhat.com>
> > > ---
> > >  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 :)
Re: [Qemu-devel] [PATCH 1/4] update-linux-headers.sh: drop kvm_para.h hacks
Posted by Cornelia Huck 7 years, 9 months ago 
On Tue, 17 Apr 2018 21:58:21 +0300
"Michael S. Tsirkin" <mst@redhat.com> 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 <mst@redhat.com>
> ---
>  scripts/update-linux-headers.sh | 16 +++++-----------
>  1 file changed, 5 insertions(+), 11 deletions(-)

Acked-by: Cornelia Huck <cohuck@redhat.com>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.