From patchwork Sun May 26 18:10:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 246446 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CFDC62C0299 for ; Mon, 27 May 2013 04:10:31 +1000 (EST) Received: from localhost ([::1]:54935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UgfOn-0005Yc-NA for incoming@patchwork.ozlabs.org; Sun, 26 May 2013 14:10:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UgfOR-0005VY-Pe for qemu-devel@nongnu.org; Sun, 26 May 2013 14:10:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UgfOJ-0002Np-Gq for qemu-devel@nongnu.org; Sun, 26 May 2013 14:10:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9326) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UgfOJ-0002Ne-9T for qemu-devel@nongnu.org; Sun, 26 May 2013 14:09:59 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4QI9uhv028957 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 26 May 2013 14:09:56 -0400 Received: from redhat.com (vpn-202-184.tlv.redhat.com [10.35.202.184]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id r4QI9shh027327; Sun, 26 May 2013 14:09:55 -0400 Date: Sun, 26 May 2013 21:10:18 +0300 From: "Michael S. Tsirkin" To: Peter Maydell Message-ID: <20130526181017.GB3115@redhat.com> References: <1369581694-1655-1-git-send-email-mst@redhat.com> <20130526175110.GA3115@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , qemu-devel@nongnu.org Subject: Re: [Qemu-devel] [PATCH v2 00/11] qemu: use virtio linux headers in portable code 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 On Sun, May 26, 2013 at 07:00:58PM +0100, Peter Maydell wrote: > On 26 May 2013 18:51, Michael S. Tsirkin wrote: > > On Sun, May 26, 2013 at 04:43:57PM +0100, Peter Maydell wrote: > >> This series breaks compilation on MacOSX: > >> > >> CC net/eth.o > >> In file included from net/eth.c:18: > >> In file included from /Users/pm215/src/qemu/include/net/eth.h:29: > >> /Users/pm215/src/qemu/linux-headers/linux/if_ether.h:24:10: fatal > >> error: 'linux/types.h' file not found > >> #include > >> ^ > >> 1 error generated. > >> make: *** [net/eth.o] Error 1 > > > Could be a stale file in your tree ... > > Did configure get re-run? > > Could you post the config-host.mak file please? > > Configure did get rerun, but where are you expecting the header > to pull linux/types.h from? Your patchset adds files which include > it but doesn't add any copy itself, so if you're not on a Linux > host then it just doesn't exist... > > config-host.mak attached. > > thanks > -- PMM Ouch. Forgot to git-add them. Thanks. I'll send a fixed version - could you please try this patch on top? linux-stubs: linux/types.h This adds a directory with minimal stubs that make it possible to use some linux headers in qemu in a portable environment. Signed-off-by: Michael S. Tsirkin diff --git a/linux-stubs/linux/types.h b/linux-stubs/linux/types.h new file mode 100644 index 0000000..8642cbb --- /dev/null +++ b/linux-stubs/linux/types.h @@ -0,0 +1,37 @@ +#ifndef STUBS_LINUX_TYPES_H +#define STUBS_LINUX_TYPES_H + +#include + +/* + * Below are Linux-specific types that should never collide with + * any application/library that wants linux/types.h. + */ + +typedef uint8_t __u8; +typedef uint16_t __u16; +typedef uint32_t __u32; +typedef uint64_t __u64; + +#ifdef __CHECKER__ +#define __bitwise__ __attribute__((bitwise)) +#else +#define __bitwise__ +#endif +#ifdef __CHECK_ENDIAN__ +#define __bitwise __bitwise__ +#else +#define __bitwise +#endif + +typedef __u16 __bitwise __le16; +typedef __u16 __bitwise __be16; +typedef __u32 __bitwise __le32; +typedef __u32 __bitwise __be32; +typedef __u64 __bitwise __le64; +typedef __u64 __bitwise __be64; + +typedef __u16 __bitwise __sum16; +typedef __u32 __bitwise __wsum; + +#endif