From patchwork Mon Jun 6 12:32:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kurz X-Patchwork-Id: 630856 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rNYzp04gQz9t42 for ; Mon, 6 Jun 2016 22:34:30 +1000 (AEST) Received: from localhost ([::1]:41945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9tjg-00021D-2C for incoming@patchwork.ozlabs.org; Mon, 06 Jun 2016 08:34:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9tiX-00018R-G8 for qemu-devel@nongnu.org; Mon, 06 Jun 2016 08:33:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9tiR-0001N8-Fh for qemu-devel@nongnu.org; Mon, 06 Jun 2016 08:33:16 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:7083 helo=mx0b-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9tiR-0001Mt-7U for qemu-devel@nongnu.org; Mon, 06 Jun 2016 08:33:11 -0400 Received: from pps.filterd (m0082756.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u56CUHAP004082 for ; Mon, 6 Jun 2016 08:33:08 -0400 Message-Id: <201606061233.u56CUHAP004082@mx0a-001b2d01.pphosted.com> Received: from e06smtp06.uk.ibm.com (e06smtp06.uk.ibm.com [195.75.94.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 23d97sg51s-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 06 Jun 2016 08:33:08 -0400 Received: from localhost by e06smtp06.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 6 Jun 2016 13:33:06 +0100 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp06.uk.ibm.com (192.168.101.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 6 Jun 2016 13:33:04 +0100 X-IBM-Helo: d06dlp03.portsmouth.uk.ibm.com X-IBM-MailFrom: gkurz@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 3818C1B0804B for ; Mon, 6 Jun 2016 13:34:09 +0100 (BST) Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u56CX4tr49610800 for ; Mon, 6 Jun 2016 12:33:04 GMT Received: from d06av11.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u56CX3Db023835 for ; Mon, 6 Jun 2016 06:33:04 -0600 Received: from smtp.lab.toulouse-stg.fr.ibm.com (srv01.lab.toulouse-stg.fr.ibm.com [9.101.4.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u56CX3Ip023827; Mon, 6 Jun 2016 06:33:03 -0600 Received: from bahia.huguette.org (icon-9-164-139-228.megacenter.de.ibm.com [9.164.139.228]) by smtp.lab.toulouse-stg.fr.ibm.com (Postfix) with ESMTP id E4EC4220164; Mon, 6 Jun 2016 14:33:02 +0200 (CEST) From: Greg Kurz To: qemu-devel@nongnu.org Date: Mon, 6 Jun 2016 14:32:39 +0200 X-Mailer: git-send-email 2.5.5 In-Reply-To: <1465216365-13078-1-git-send-email-gkurz@linux.vnet.ibm.com> References: <1465216365-13078-1-git-send-email-gkurz@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16060612-0024-0000-0000-000001DAE27D X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16060612-0025-0000-0000-00001F2D5A98 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-06-06_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=43 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606060149 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PULL 1/7] 9p: some more cleanup in #include directives 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 , "Aneesh Kumar K.V" , Greg Kurz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The "9p-attr.h" header isn't needed by 9p synth and virtio 9p. While here, also drop last references to virtio from 9p synth since it is now transport agnostic code. Signed-off-by: Greg Kurz --- hw/9pfs/9p-synth.c | 4 +--- hw/9pfs/virtio-9p-device.c | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/9pfs/9p-synth.c b/hw/9pfs/9p-synth.c index f1475dfd6def..8e504130d94b 100644 --- a/hw/9pfs/9p-synth.c +++ b/hw/9pfs/9p-synth.c @@ -1,5 +1,5 @@ /* - * Virtio 9p synthetic file system support + * 9p synthetic file system support * * Copyright IBM, Corp. 2011 * @@ -13,9 +13,7 @@ */ #include "qemu/osdep.h" -#include "hw/virtio/virtio.h" #include "9p.h" -#include "9p-xattr.h" #include "fsdev/qemu-fsdev.h" #include "9p-synth.h" #include "qemu/rcu.h" diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index a38850ee89da..74a3ccbcd1c5 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -17,7 +17,6 @@ #include "qemu/sockets.h" #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" -#include "9p-xattr.h" #include "coth.h" #include "hw/virtio/virtio-access.h" #include "qemu/iov.h"