From patchwork Thu Apr 8 20:49:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 49767 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8939FB7D30 for ; Fri, 9 Apr 2010 07:15:13 +1000 (EST) Received: from localhost ([127.0.0.1]:47403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NzyyU-0004lX-Ks for incoming@patchwork.ozlabs.org; Thu, 08 Apr 2010 17:09:18 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nzyg3-0005ik-N5 for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:50:15 -0400 Received: from [140.186.70.92] (port=45580 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nzyg2-0005h1-Hp for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:50:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nzyg1-0000Sm-AF for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:50:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48484) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nzyg1-0000SY-2U for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:50:13 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o38KoCue017627 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 8 Apr 2010 16:50:12 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o38KoBoK007055; Thu, 8 Apr 2010 16:50:12 -0400 Received: from amt.cnet (vpn-10-233.rdu.redhat.com [10.11.10.233]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o38KoAmM018063; Thu, 8 Apr 2010 16:50:11 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 1B77868A008; Thu, 8 Apr 2010 17:49:52 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id o38Knpjk029962; Thu, 8 Apr 2010 17:49:51 -0300 Date: Thu, 8 Apr 2010 17:49:50 -0300 From: Marcelo Tosatti To: qemu-devel@nongnu.org Message-ID: <20100408204950.GD25347@amt.cnet> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-08-17) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: "Michael S. Tsirkin" Subject: [Qemu-devel] vhost.c: include last X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org So the userspace headers define KERNEL_STRICT_NAMES and there's no conflict on type definition for older kernels. igned-off-by: Marcelo Tosatti diff --git a/hw/vhost.c b/hw/vhost.c index ad2f98a..d37a66e 100644 --- a/hw/vhost.c +++ b/hw/vhost.c @@ -10,13 +10,13 @@ * the COPYING file in the top-level directory. */ -#include #include #include #include "vhost.h" #include "hw/hw.h" /* For range_get_last */ #include "pci.h" +#include static void vhost_dev_sync_region(struct vhost_dev *dev, uint64_t mfirst, uint64_t mlast,