From patchwork Tue Apr 22 14:52:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gabriel L. Somlo" X-Patchwork-Id: 4033121 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2BF549F1F4 for ; Tue, 22 Apr 2014 14:52:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B9372021B for ; Tue, 22 Apr 2014 14:52:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 27548201FB for ; Tue, 22 Apr 2014 14:52:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756642AbaDVOwJ (ORCPT ); Tue, 22 Apr 2014 10:52:09 -0400 Received: from mail-qc0-f182.google.com ([209.85.216.182]:34371 "EHLO mail-qc0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756210AbaDVOwG (ORCPT ); Tue, 22 Apr 2014 10:52:06 -0400 Received: by mail-qc0-f182.google.com with SMTP id e16so5527123qcx.27 for ; Tue, 22 Apr 2014 07:52:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=4SywKOkI58rC5CO9farOVujMOcTAlQsg/Mv8tAlOqZ4=; b=R5/Z+PAZg43aE+sjkQNNrmIvo18DVEXcdLCzMx4K0qiau+4rzyNP9viQBlQ+Zm05gO 1ybMNSSLUnhoGwu9xoQD2XobzJd+FGweAxYFL46z+dt/tVRd4xL0FTuff9iIVyQGtnFk eEJMlfenPC6Qrmd1BaTEw2fiEl3w9AQJGppnbkxwnNLQ7+qA0HwaEe1wsKApQ41k1fdI KgeMCDXYtGlh98+u8p9NMuQcYler5Su3W5T9Ve4qTi1Yu0uCKdNKeSOJNoKn6Pq1GQt0 qbhml7amU7/SErKaQENsO0PmTOe4V/lu8Xe204HtdBTNQ2OQgNk7RI/NyYuRBC62EJTw oDxw== X-Received: by 10.224.126.9 with SMTP id a9mr44134534qas.39.1398178325426; Tue, 22 Apr 2014 07:52:05 -0700 (PDT) Received: from ERROL.INI.CMU.EDU (ERROL.INI.CMU.EDU. [128.2.16.43]) by mx.google.com with ESMTPSA id 11sm49591776qgv.20.2014.04.22.07.52.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Apr 2014 07:52:04 -0700 (PDT) Date: Tue, 22 Apr 2014 10:52:03 -0400 From: gsomlo@gmail.com To: jan.kiszka@siemens.com Cc: kvm@vger.kernel.org Subject: [kvm-kmod PATCH 2/2] sync: copy linux/vfio.h from kvm source tree Message-ID: <20140422145202.GB1630@ERROL.INI.CMU.EDU> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Gabriel Somlo --- vfio.c gets copied by sync, and it needs vfio.h. I don't think there's an easy way to #define ourselves out of this one, copying vfio.h into kvm-kmod/include/linux/ seems to be the path of least resistance... Thanks, Gabriel P.S. I'm not a native Python speaker, so, while the glob() line does the job, it may not be the most beautiful way to express the new requirement :) sync | 1 + 1 file changed, 1 insertion(+) diff --git a/sync b/sync index e447ec4..9902a11 100755 --- a/sync +++ b/sync @@ -433,6 +433,7 @@ def header_sync(arch): T = 'header' rmtree(T) for file in (glob('%(linux)s/include/linux/kvm*.h' % { 'linux': linux }) + + glob('%(linux)s/include/linux/vfio.h' % { 'linux': linux }) + glob('%(linux)s/include/uapi/linux/kvm*.h' % { 'linux': linux })): out = ('%(T)s/include/linux/%(name)s' % { 'T': T, 'name': os.path.basename(file) })