From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH v3 01/12] Add kernel header update script Date: Wed, 08 Jun 2011 18:22:17 +0200 Message-ID: <4DEFA1B9.2050006@siemens.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, Alexander Graf , Christoph Hellwig , Peter Maydell , =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= To: Avi Kivity , Marcelo Tosatti Return-path: Received: from david.siemens.de ([192.35.17.14]:15811 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751780Ab1FHQWb (ORCPT ); Wed, 8 Jun 2011 12:22:31 -0400 In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: This helper pulls the required kernel headers for KVM and vhost into a specified directory. The update is triggered via scripts/update-linux-headers.sh LINUX_PATH and will place the output under linux-headers/linux and linux-headers/a= sm-*. It also imports the COPYING to care for headers without an explicit lic= ense. CC: Alexander Graf CC: Christoph Hellwig CC: Peter Maydell CC: Andreas F=C3=A4rber Signed-off-by: Jan Kiszka --- Changes in v3: - remove bashism Changes in v2: - add quoting - use mktemp - avoid -o for test linux-headers/README | 2 + scripts/update-linux-headers.sh | 55 +++++++++++++++++++++++++++++++= ++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 linux-headers/README create mode 100755 scripts/update-linux-headers.sh diff --git a/linux-headers/README b/linux-headers/README new file mode 100644 index 0000000..5c9026b --- /dev/null +++ b/linux-headers/README @@ -0,0 +1,2 @@ +Automatically imported Linux kernel headers. +Only use scripts/update-linux-headers.sh to update! diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-hea= ders.sh new file mode 100755 index 0000000..9d2a4bc --- /dev/null +++ b/scripts/update-linux-headers.sh @@ -0,0 +1,55 @@ +#!/bin/sh -e +# +# Update Linux kernel headers QEMU requires from a specified kernel tr= ee. +# +# Copyright (C) 2011 Siemens AG +# +# Authors: +# Jan Kiszka +# +# This work is licensed under the terms of the GNU GPL version 2. +# See the COPYING file in the top-level directory. + +tmpdir=3D`mktemp -d` +linux=3D"$1" +output=3D"$2" + +if [ -z "$linux" ] || ! [ -d "$linux" ]; then + cat << EOF +usage: update-kernel-headers.sh LINUX_PATH [OUTPUT_PATH] + +LINUX_PATH Linux kernel directory to obtain the headers from +OUTPUT_PATH output directory, usually the qemu source tree (defaul= t: $PWD) +EOF + exit 1 +fi + +if [ -z "$output" ]; then + output=3D"$PWD" +fi + +for arch in x86 powerpc s390; do + make -C "$linux" INSTALL_HDR_PATH=3D"$tmpdir" SRCARCH=3D$arch head= ers_install + + rm -rf "$output/linux-headers/asm-$arch" + mkdir -p "$output/linux-headers/asm-$arch" + for header in kvm.h kvm_para.h; do + cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$a= rch" + done + if [ $arch =3D x86 ]; then + cp "$tmpdir/include/asm/hyperv.h" "$output/linux-headers/asm-x= 86" + fi +done + +rm -rf "$output/linux-headers/linux" +mkdir -p "$output/linux-headers/linux" +for header in kvm.h kvm_para.h vhost.h virtio_config.h virtio_ring.h; = do + cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux" +done +if [ -L "$linux/source" ]; then + cp "$linux/source/COPYING" "$output/linux-headers" +else + cp "$linux/COPYING" "$output/linux-headers" +fi + +rm -rf "$tmpdir" From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QULWR-0005ya-7d for qemu-devel@nongnu.org; Wed, 08 Jun 2011 12:22:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QULWP-0004M5-9J for qemu-devel@nongnu.org; Wed, 08 Jun 2011 12:22:22 -0400 Received: from david.siemens.de ([192.35.17.14]:24381) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QULWO-0004Lq-JP for qemu-devel@nongnu.org; Wed, 08 Jun 2011 12:22:21 -0400 Message-ID: <4DEFA1B9.2050006@siemens.com> Date: Wed, 08 Jun 2011 18:22:17 +0200 From: Jan Kiszka MIME-Version: 1.0 References: In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 01/12] Add kernel header update script List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity , Marcelo Tosatti Cc: Peter Maydell , kvm@vger.kernel.org, qemu-devel@nongnu.org, Alexander Graf , =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= , Christoph Hellwig This helper pulls the required kernel headers for KVM and vhost into a specified directory. The update is triggered via scripts/update-linux-headers.sh LINUX_PATH and will place the output under linux-headers/linux and linux-headers/asm= -*. It also imports the COPYING to care for headers without an explicit licen= se. CC: Alexander Graf CC: Christoph Hellwig CC: Peter Maydell CC: Andreas F=C3=A4rber Signed-off-by: Jan Kiszka --- Changes in v3: - remove bashism Changes in v2: - add quoting - use mktemp - avoid -o for test linux-headers/README | 2 + scripts/update-linux-headers.sh | 55 +++++++++++++++++++++++++++++++++= ++++++ 2 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 linux-headers/README create mode 100755 scripts/update-linux-headers.sh diff --git a/linux-headers/README b/linux-headers/README new file mode 100644 index 0000000..5c9026b --- /dev/null +++ b/linux-headers/README @@ -0,0 +1,2 @@ +Automatically imported Linux kernel headers. +Only use scripts/update-linux-headers.sh to update! diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-heade= rs.sh new file mode 100755 index 0000000..9d2a4bc --- /dev/null +++ b/scripts/update-linux-headers.sh @@ -0,0 +1,55 @@ +#!/bin/sh -e +# +# Update Linux kernel headers QEMU requires from a specified kernel tree. +# +# Copyright (C) 2011 Siemens AG +# +# Authors: +# Jan Kiszka +# +# This work is licensed under the terms of the GNU GPL version 2. +# See the COPYING file in the top-level directory. + +tmpdir=3D`mktemp -d` +linux=3D"$1" +output=3D"$2" + +if [ -z "$linux" ] || ! [ -d "$linux" ]; then + cat << EOF +usage: update-kernel-headers.sh LINUX_PATH [OUTPUT_PATH] + +LINUX_PATH Linux kernel directory to obtain the headers from +OUTPUT_PATH output directory, usually the qemu source tree (default:= $PWD) +EOF + exit 1 +fi + +if [ -z "$output" ]; then + output=3D"$PWD" +fi + +for arch in x86 powerpc s390; do + make -C "$linux" INSTALL_HDR_PATH=3D"$tmpdir" SRCARCH=3D$arch header= s_install + + rm -rf "$output/linux-headers/asm-$arch" + mkdir -p "$output/linux-headers/asm-$arch" + for header in kvm.h kvm_para.h; do + cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arc= h" + done + if [ $arch =3D x86 ]; then + cp "$tmpdir/include/asm/hyperv.h" "$output/linux-headers/asm-x86= " + fi +done + +rm -rf "$output/linux-headers/linux" +mkdir -p "$output/linux-headers/linux" +for header in kvm.h kvm_para.h vhost.h virtio_config.h virtio_ring.h; do + cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux" +done +if [ -L "$linux/source" ]; then + cp "$linux/source/COPYING" "$output/linux-headers" +else + cp "$linux/COPYING" "$output/linux-headers" +fi + +rm -rf "$tmpdir"