From patchwork Mon Jun 6 12:32:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kurz X-Patchwork-Id: 630857 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 3rNZ0L4tyKz9t42 for ; Mon, 6 Jun 2016 22:34:58 +1000 (AEST) Received: from localhost ([::1]:41947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9tk8-0002Pe-OL for incoming@patchwork.ozlabs.org; Mon, 06 Jun 2016 08:34:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54269) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9tig-0001DV-8l for qemu-devel@nongnu.org; Mon, 06 Jun 2016 08:33:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9tia-0001OM-R8 for qemu-devel@nongnu.org; Mon, 06 Jun 2016 08:33:26 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:57055 helo=mx0b-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9tia-0001OI-JC for qemu-devel@nongnu.org; Mon, 06 Jun 2016 08:33:20 -0400 Received: from pps.filterd (m0075771.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u56CTZ2e034120 for ; Mon, 6 Jun 2016 08:33:20 -0400 Message-Id: <201606061233.u56CTZ2e034120@mx0a-001b2d01.pphosted.com> Received: from e06smtp14.uk.ibm.com (e06smtp14.uk.ibm.com [195.75.94.110]) by mx0a-001b2d01.pphosted.com with ESMTP id 23d3b7df9n-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 06 Jun 2016 08:33:19 -0400 Received: from localhost by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 6 Jun 2016 13:33:17 +0100 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 6 Jun 2016 13:33:10 +0100 X-IBM-Helo: d06dlp01.portsmouth.uk.ibm.com X-IBM-MailFrom: gkurz@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id DB48B17D805A for ; Mon, 6 Jun 2016 13:34:18 +0100 (BST) Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u56CX9fa24707466 for ; Mon, 6 Jun 2016 12:33:09 GMT Received: from d06av03.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u56CX8ka028625 for ; Mon, 6 Jun 2016 06:33:09 -0600 Received: from smtp.lab.toulouse-stg.fr.ibm.com (srv01.lab.toulouse-stg.fr.ibm.com [9.101.4.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u56CX7fV028596; Mon, 6 Jun 2016 06:33:07 -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 CA247220164; Mon, 6 Jun 2016 14:33:06 +0200 (CEST) From: Greg Kurz To: qemu-devel@nongnu.org Date: Mon, 6 Jun 2016 14:32:40 +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-0016-0000-0000-000001F1DC07 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16060612-0017-0000-0000-000021CD5D08 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 2/7] 9p/fsdev: remove obsolete references to virtio 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" Most of the 9p code is now virtio agnostic. This patch does a final cleanup: - drop references to Virtio from the header comments - fix includes Also drop a couple of leading empty lines while here. Signed-off-by: Greg Kurz --- fsdev/file-op-9p.h | 2 +- fsdev/qemu-fsdev-dummy.c | 2 +- fsdev/qemu-fsdev-opts.c | 2 +- fsdev/qemu-fsdev.c | 2 +- fsdev/qemu-fsdev.h | 2 +- hw/9pfs/9p.h | 2 -- hw/9pfs/codir.c | 3 +-- hw/9pfs/cofile.c | 3 +-- hw/9pfs/cofs.c | 3 +-- hw/9pfs/coth.c | 1 - hw/9pfs/coth.h | 3 ++- hw/9pfs/coxattr.c | 3 +-- 12 files changed, 11 insertions(+), 17 deletions(-) diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h index b8c26024a955..1095fcc95757 100644 --- a/fsdev/file-op-9p.h +++ b/fsdev/file-op-9p.h @@ -1,5 +1,5 @@ /* - * Virtio 9p + * 9p * * Copyright IBM, Corp. 2010 * diff --git a/fsdev/qemu-fsdev-dummy.c b/fsdev/qemu-fsdev-dummy.c index 7622e86c1682..6dc0fbc4c402 100644 --- a/fsdev/qemu-fsdev-dummy.c +++ b/fsdev/qemu-fsdev-dummy.c @@ -1,5 +1,5 @@ /* - * Virtio 9p + * 9p * * Copyright IBM, Corp. 2010 * diff --git a/fsdev/qemu-fsdev-opts.c b/fsdev/qemu-fsdev-opts.c index 88a4ac3251a4..1dd8c7a24c9c 100644 --- a/fsdev/qemu-fsdev-opts.c +++ b/fsdev/qemu-fsdev-opts.c @@ -1,5 +1,5 @@ /* - * Virtio 9p + * 9p * * This work is licensed under the terms of the GNU GPL, version 2 or * later. See the COPYING file in the top-level directory. diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c index bf7f0b07fc22..266e442b871a 100644 --- a/fsdev/qemu-fsdev.c +++ b/fsdev/qemu-fsdev.c @@ -1,5 +1,5 @@ /* - * Virtio 9p + * 9p * * Copyright IBM, Corp. 2010 * diff --git a/fsdev/qemu-fsdev.h b/fsdev/qemu-fsdev.h index 9fa45bf5107c..29c962296d20 100644 --- a/fsdev/qemu-fsdev.h +++ b/fsdev/qemu-fsdev.h @@ -1,5 +1,5 @@ /* - * Virtio 9p + * 9p * * Copyright IBM, Corp. 2010 * diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h index 1a19418a8ce5..43378943cdda 100644 --- a/hw/9pfs/9p.h +++ b/hw/9pfs/9p.h @@ -5,8 +5,6 @@ #include #include #include -#include "standard-headers/linux/virtio_9p.h" -#include "hw/virtio/virtio.h" #include "fsdev/file-op-9p.h" #include "fsdev/9p-iov-marshal.h" #include "qemu/thread.h" diff --git a/hw/9pfs/codir.c b/hw/9pfs/codir.c index 91df7f7a7b8d..8e3ba17baeed 100644 --- a/hw/9pfs/codir.c +++ b/hw/9pfs/codir.c @@ -1,6 +1,5 @@ - /* - * Virtio 9p backend + * 9p backend * * Copyright IBM, Corp. 2011 * diff --git a/hw/9pfs/cofile.c b/hw/9pfs/cofile.c index 293483e0c927..10343c0a93b4 100644 --- a/hw/9pfs/cofile.c +++ b/hw/9pfs/cofile.c @@ -1,6 +1,5 @@ - /* - * Virtio 9p backend + * 9p backend * * Copyright IBM, Corp. 2011 * diff --git a/hw/9pfs/cofs.c b/hw/9pfs/cofs.c index 18c81cb3dcf6..70f584fcbd21 100644 --- a/hw/9pfs/cofs.c +++ b/hw/9pfs/cofs.c @@ -1,6 +1,5 @@ - /* - * Virtio 9p backend + * 9p backend * * Copyright IBM, Corp. 2011 * diff --git a/hw/9pfs/coth.c b/hw/9pfs/coth.c index 464293ef2e28..9b1151b60e49 100644 --- a/hw/9pfs/coth.c +++ b/hw/9pfs/coth.c @@ -16,7 +16,6 @@ #include "qemu-common.h" #include "block/thread-pool.h" #include "qemu/coroutine.h" -#include "qemu/main-loop.h" #include "coth.h" /* Called from QEMU I/O thread. */ diff --git a/hw/9pfs/coth.h b/hw/9pfs/coth.h index a911cbb16589..6adc773d4664 100644 --- a/hw/9pfs/coth.h +++ b/hw/9pfs/coth.h @@ -17,7 +17,8 @@ #include "qemu/thread.h" #include "qemu/coroutine.h" -#include "virtio-9p.h" +#include "qemu/main-loop.h" +#include "9p.h" /* * we want to use bottom half because we want to make sure the below diff --git a/hw/9pfs/coxattr.c b/hw/9pfs/coxattr.c index 6ad96ea9f60d..133c4ead37b6 100644 --- a/hw/9pfs/coxattr.c +++ b/hw/9pfs/coxattr.c @@ -1,6 +1,5 @@ - /* - * Virtio 9p backend + * 9p backend * * Copyright IBM, Corp. 2011 *