From patchwork Fri Jul 1 16:56:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kurz X-Patchwork-Id: 643156 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rh2g235xWz9sCy for ; Sat, 2 Jul 2016 02:58:38 +1000 (AEST) Received: from localhost ([::1]:34580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ1m0-0004wo-DS for incoming@patchwork.ozlabs.org; Fri, 01 Jul 2016 12:58:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ1km-000412-SN for qemu-devel@nongnu.org; Fri, 01 Jul 2016 12:57:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bJ1kj-0004Jt-Oj for qemu-devel@nongnu.org; Fri, 01 Jul 2016 12:57:20 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:52303 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ1kj-0004Jl-Jm for qemu-devel@nongnu.org; Fri, 01 Jul 2016 12:57:17 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u61GrjaZ123650 for ; Fri, 1 Jul 2016 12:57:15 -0400 Received: from e06smtp16.uk.ibm.com (e06smtp16.uk.ibm.com [195.75.94.112]) by mx0b-001b2d01.pphosted.com with ESMTP id 23vvce89cc-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 01 Jul 2016 12:57:14 -0400 Received: from localhost by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 1 Jul 2016 17:57:12 +0100 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp16.uk.ibm.com (192.168.101.146) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 1 Jul 2016 17:57:11 +0100 X-IBM-Helo: d06dlp03.portsmouth.uk.ibm.com X-IBM-MailFrom: groug@kaod.org X-IBM-RcptTo: qemu-devel@nongnu.org Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id C22BE1B0805F for ; Fri, 1 Jul 2016 17:58:26 +0100 (BST) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u61GvApj18088350 for ; Fri, 1 Jul 2016 16:57:10 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u61GvANt025207 for ; Fri, 1 Jul 2016 10:57:10 -0600 Received: from smtp.lab.toulouse-stg.fr.ibm.com (srv01.lab.toulouse-stg.fr.ibm.com [9.101.4.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u61GvA2c025200; Fri, 1 Jul 2016 10:57:10 -0600 Received: from bahia.lan (icon-9-164-136-204.megacenter.de.ibm.com [9.164.136.204]) by smtp.lab.toulouse-stg.fr.ibm.com (Postfix) with ESMTP id 1514722032C; Fri, 1 Jul 2016 18:57:08 +0200 (CEST) From: Greg Kurz To: qemu-devel@nongnu.org Date: Fri, 1 Jul 2016 18:56:33 +0200 X-Mailer: git-send-email 2.5.5 In-Reply-To: <1467392194-8589-1-git-send-email-groug@kaod.org> References: <1467392194-8589-1-git-send-email-groug@kaod.org> MIME-Version: 1.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16070116-0024-0000-0000-000002250007 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16070116-0025-0000-0000-00001951E783 Message-Id: <1467392194-8589-2-git-send-email-groug@kaod.org> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-07-01_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=4 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1607010167 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0b-001b2d01.pphosted.com id u61GrjaZ123650 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PULL 1/2] 9p: don't include X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Greg Kurz , "Aneesh Kumar K.V" , Greg Kurz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Greg Kurz The system header doesn't exist on all host platforms. Code should include "qemu/osdep.h" instead to avoid build breaks on plafforms that don't define CONFIG_IOVEC (like win32, if it is to support 9p one day). Acked-by: Cédric Le Goater Acked-by: Michael Fritscher Signed-off-by: Greg Kurz --- fsdev/9p-iov-marshal.c | 1 - fsdev/9p-marshal.c | 1 - fsdev/file-op-9p.h | 1 - 3 files changed, 3 deletions(-) diff --git a/fsdev/9p-iov-marshal.c b/fsdev/9p-iov-marshal.c index fce1ee9e5531..584082b5d61a 100644 --- a/fsdev/9p-iov-marshal.c +++ b/fsdev/9p-iov-marshal.c @@ -14,7 +14,6 @@ #include "qemu/osdep.h" #include #include -#include #include "9p-iov-marshal.h" #include "qemu/bswap.h" diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c index f56ef0e60c0f..238dbf21b1d5 100644 --- a/fsdev/9p-marshal.c +++ b/fsdev/9p-marshal.c @@ -15,7 +15,6 @@ #include #include #include -#include #include "9p-marshal.h" diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h index 55614949740d..b1338ba06c95 100644 --- a/fsdev/file-op-9p.h +++ b/fsdev/file-op-9p.h @@ -14,7 +14,6 @@ #define _FILEOP_H #include #include -#include #include #define SM_LOCAL_MODE_BITS 0600