Re: [Qemu-devel] [PATCH v2 15/17] scripts: add arch specific standard-headers

[Michael S. Tsirkin]

On Mon, Feb 16, 2015 at 04:56:39PM +0100, Thomas Huth wrote:
> On Sun, 15 Feb 2015 12:39:25 +0100
> "Michael S. Tsirkin" <address@hidden> wrote:
> 
> > Move virtio header copying logic to a function,
> > use that to copy arch specific virtio headers.
> > 
> > Signed-off-by: Michael S. Tsirkin <address@hidden>
> > ---
> >  scripts/update-linux-headers.sh | 56 
> > ++++++++++++++++++++++++-----------------
> >  1 file changed, 33 insertions(+), 23 deletions(-)
> > 
> > diff --git a/scripts/update-linux-headers.sh 
> > b/scripts/update-linux-headers.sh
> > index 9654553..1be4d83 100755
> > --- a/scripts/update-linux-headers.sh
> > +++ b/scripts/update-linux-headers.sh
> > @@ -28,6 +28,36 @@ if [ -z "$output" ]; then
> >      output="$PWD"
> >  fi
> > 
> > +cp_virtio() {
> > +    from=$1
> > +    to=$2
> > +    virtio=$(find "$from" -name '*virtio*h')
> > +    if [ "$virtio" ]; then
> > +        rm -rf "$to"
> > +        mkdir -p "$to"
> > +        for f in $virtio; do
> > +            if
> > +                grep '#include' "$f" | grep -v -e 'linux/virtio' \
> > +                                             -e 'linux/types' \
> > +                                             -e 'linux/if_ether' \
> > +                                             > /dev/null
> > +            then
> > +                echo "Unexpected #include in input file $f".
> > +                exit 2
> > +            fi
> > +
> > +            header=$(expr "$f" : '.*/\(.*\)');
> > +            sed -e 's/__u\([0-9][0-9]*\)/uint\1_t/g' \
> > +                -e 's/__le\([0-9][0-9]*\)/uint\1_t/g' \
> > +                -e 's/__be\([0-9][0-9]*\)/uint\1_t/g' \
> > +                -e 's/<linux\/\([^>]*\)>/"standard-headers\/sys\/\1"/' \
> > +                -e 's/__bitwise__//' \
> > +                -e 's/__attribute__((packed))/QEMU_PACKED/' \
> > +                "$f" > "$to/$header";
> > +        done
> > +    fi
> > +}
> 
> Could you maybe introduce this function in patch 1 already? That would
> avoid a bit of code churn here.
> 
>  Thomas

Yes but this part needs more testing, there are advantages
to keeping code as simple as possible.