| Message ID | 201606061233.u56CTZ2e034120@mx0a-001b2d01.pphosted.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 <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 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 *
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> --- 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(-)