From patchwork Wed Jul 25 15:29:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10239 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 3588D24000 for ; Wed, 25 Jul 2012 15:29:17 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id DE7A0A18CDC for ; Wed, 25 Jul 2012 15:29:16 +0000 (UTC) Received: by yenq6 with SMTP id q6so839431yen.11 for ; Wed, 25 Jul 2012 08:29:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=f9w1ExYBN4zcpJIYjRUA9P/EllpGl0bvi0c0NEW1MFQ=; b=PRDjSVLTIjdBkpvM17vhi0y1TONRoC8XtrC2TWq/ZL6oi1jQK/rJ6fj6vjG3R5xDEb Vo6eJrWbYt1PShtlrfJ1bm6kMrX9v1IjWz6ObnxpfD7P+tyqf3SvZrN8rtdiB7vw1hId yppj4X15yEYZUvi/5X3+bV/rxm2xJ8wmKe/9WxmGg2cF8g6TyzmhG8YwJdjgpDLGBC2M PCOJPgan+Lm2T/7ikf7k9Nuulj7HQrXJ5lp+gLPtgfDVdA7gu3xiKQsEcqeye2cFvSfB yyBek+KE7vZe7FR83MujqGxKwJ3VUYo5rM5l9f3ICyDp/rIjmviN7KZdN1EaDuJ6/L+g 3ieQ== Received: by 10.42.38.83 with SMTP id b19mr25166920ice.10.1343230156145; Wed, 25 Jul 2012 08:29:16 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.43.93.3 with SMTP id bs3csp100284icc; Wed, 25 Jul 2012 08:29:15 -0700 (PDT) Received: by 10.101.6.27 with SMTP id j27mr3892271ani.56.1343230154881; Wed, 25 Jul 2012 08:29:14 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id u62si18290660yhd.62.2012.07.25.08.29.13 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 25 Jul 2012 08:29:14 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1Su3WN-0006ee-Bb; Wed, 25 Jul 2012 16:29:07 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Jan Kiszka , Rusty Russell Subject: [PATCH] update-linux-headers.sh: Pull in asm-generic/kvm_para.h Date: Wed, 25 Jul 2012 16:29:07 +0100 Message-Id: <1343230147-25557-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQnts1rRQN1FS5mYSLQR7GuH0KphoMAsJFYYu1aMeGZ0hDo8U+59uzsMdcjOgoa/NQZI60h4 Add asm-generic/kvm_para.h to the set of non-architecture specific KVM kernel headers we copy into QEMU. This header may be included by an architecture's kvm_para.h header. Signed-off-by: Peter Maydell Reviewed-by: Jan Kiszka --- scripts/update-linux-headers.sh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 9d2a4bc..a639c5b 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -46,6 +46,11 @@ 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 +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