From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60027)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1YNOKq-0001GS-GV
	for qemu-devel@nongnu.org; Mon, 16 Feb 2015 11:15:49 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1YNOKp-0000NM-Ll
	for qemu-devel@nongnu.org; Mon, 16 Feb 2015 11:15:48 -0500
Received: from mx1.redhat.com ([209.132.183.28]:56822)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1YNOKp-0000N0-6S
	for qemu-devel@nongnu.org; Mon, 16 Feb 2015 11:15:47 -0500
Date: Mon, 16 Feb 2015 17:15:34 +0100
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20150216161534.GE25470@redhat.com>
References: <1423999136-17320-1-git-send-email-mst@redhat.com>
	<1423999136-17320-16-git-send-email-mst@redhat.com>
	<20150216165639.589a5cfe@oc7435384737.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150216165639.589a5cfe@oc7435384737.ibm.com>
Subject: Re: [Qemu-devel] [PATCH v2 15/17] scripts: add arch specific
 standard-headers
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Thomas Huth <thuth@linux.vnet.ibm.com>
Cc: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org, Alexander Graf <agraf@suse.de>, Stefan Hajnoczi <stefanha@redhat.com>, Cornelia Huck <cornelia.huck@de.ibm.com>, "Chen,
	Tiejun" <tiejun.chen@intel.com>

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" <mst@redhat.com> wrote:
> 
> > Move virtio header copying logic to a function,
> > use that to copy arch specific virtio headers.
> > 
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> >  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.