9p/fsdev: remove obsolete references to virtio

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 <gkurz@linux.vnet.ibm.com>

diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h
index b8c26024a9555f27f6503ef3f159c34182464626..1095fcc957579879af70dd7b8859cac2db82da75 100644 (file)
--- 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 7622e86c16829f9d31215a10b080feb627de9531..6dc0fbc4c4024eb6895d358eddaf3b5f7bb66170 100644 (file)
--- 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 88a4ac3251a4267b35b5264ef5d60612e2d1023f..1dd8c7a24c9c79fc57fc7acb54048149f68c52e4 100644 (file)
--- 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 bf7f0b07fc22cd318f5d60a380f5d343a578ca69..266e442b871a3afdbeb88d9d77fa4e0442a44af9 100644 (file)
--- 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 9fa45bf5107c4e85d3b804d73c15fde1d938b6ce..29c962296d20819cc2625fcefe00ba52f2f363de 100644 (file)
--- 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 1a19418a8ce5493e53a1d396b5177496e28db23a..43378943cdda95c20c93987db1b46681d2676242 100644 (file)
--- a/hw/9pfs/9p.h
+++ b/hw/9pfs/9p.h
@@ -5,8 +5,6 @@
 #include <utime.h>
 #include <sys/resource.h>
 #include <glib.h>
-#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 91df7f7a7b8d1f6b7a0eea576a0f4f4b0c0b7420..8e3ba17baeed8e74e1837174969dbce480b60efe 100644 (file)
--- 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 293483e0c92712a60b6894ad1700c31bbab35795..10343c0a93b4ec6d8c16e9dd992a919f813f89e2 100644 (file)
--- 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 18c81cb3dcf62cc6bebb3f6c6392299990b3811d..70f584fcbd21da9107d38dd02a77a14fc2213b40 100644 (file)
--- 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 464293ef2e28082ea8674cec9f695eb614aff1da..9b1151b60e496a7b802633dbdebe28d53974a007 100644 (file)
--- 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 a911cbb16589ed983390771f31ae431ed72d1dc8..6adc773d4664ee778c162ef3e1c1afbe2fef875f 100644 (file)
--- 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 6ad96ea9f60dfb78ca272f088fb931264790a0f5..133c4ead37b6f9368a1f68d24087624cdf2d27b7 100644 (file)
--- a/hw/9pfs/coxattr.c
+++ b/hw/9pfs/coxattr.c
@@ -1,6 +1,5 @@
-
 /*
- * Virtio 9p backend
+ * 9p backend
  *
  * Copyright IBM, Corp. 2011
  *