From patchwork Wed Jun 8 14:10:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 99443 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7229FB6F89 for ; Thu, 9 Jun 2011 00:47:42 +1000 (EST) Received: from localhost ([::1]:36391 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUK2l-0004By-0z for incoming@patchwork.ozlabs.org; Wed, 08 Jun 2011 10:47:39 -0400 Received: from eggs.gnu.org ([140.186.70.92]:46863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUJTa-0003zR-Cs for qemu-devel@nongnu.org; Wed, 08 Jun 2011 10:11:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QUJTU-00054X-Ih for qemu-devel@nongnu.org; Wed, 08 Jun 2011 10:11:18 -0400 Received: from goliath.siemens.de ([192.35.17.28]:31852) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUJTT-00052u-KX for qemu-devel@nongnu.org; Wed, 08 Jun 2011 10:11:12 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p58EB7Jr012107; Wed, 8 Jun 2011 16:11:07 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p58EB6vY024799; Wed, 8 Jun 2011 16:11:07 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Wed, 8 Jun 2011 16:10:55 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by goliath.siemens.de id p58EB7Jr012107 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.28 Cc: Peter Maydell , kvm@vger.kernel.org, qemu-devel@nongnu.org, Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Christoph Hellwig Subject: [Qemu-devel] [PATCH 01/12] Add kernel header update script X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 license. CC: Alexander Graf CC: Christoph Hellwig CC: Peter Maydell CC: Andreas Färber Signed-off-by: Jan Kiszka Reviewed-by: Peter Maydell --- 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-headers.sh new file mode 100755 index 0000000..e5f45b2 --- /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=$TMPDIR/.tmp-hdrs-$$ +linux=$1 +output=$2 + +if [ -z "$linux" -o ! -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=$PWD +fi + +for arch in x86 powerpc s390; do + make -C $linux INSTALL_HDR_PATH=$tmpdir SRCARCH=$arch headers_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-$arch + done + if [ $arch == 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