From 756cb74a59cfe5a4f5ceb4ac178d99d39cd5f0fe Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Wed, 25 Nov 2015 16:58:20 +0000 Subject: 9pfs: merge hw/virtio/virtio-9p.h into hw/9pfs/virtio-9p.h The deleted file only contained V9fsConf which wasn't virtio specific. Merge that to the general header of 9pfs. Fixed header inclusions as I went along. Signed-off-by: Wei Liu Signed-off-by: Aneesh Kumar K.V --- hw/virtio/virtio-pci.h | 1 - 1 file changed, 1 deletion(-) (limited to 'hw/virtio') diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h index a104ff2..7cf5974 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -23,7 +23,6 @@ #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/virtio-balloon.h" #include "hw/virtio/virtio-bus.h" -#include "hw/virtio/virtio-9p.h" #include "hw/virtio/virtio-input.h" #include "hw/virtio/virtio-gpu.h" #ifdef CONFIG_VIRTFS -- cgit v1.1 From 00588a0aa2ade2e32a552633bbbefdc6ae5e32a2 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 11 Jan 2016 09:29:37 +0000 Subject: 9pfs: introduce V9fsVirtioState V9fsState now only contains generic fields. Introduce V9fsVirtioState for virtio transport. Change virtio-pci and virtio-ccw to use V9fsVirtioState. Signed-off-by: Wei Liu Signed-off-by: Aneesh Kumar K.V --- hw/virtio/virtio-pci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/virtio') diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h index 7cf5974..e096e98 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -242,7 +242,7 @@ struct VirtIONetPCI { typedef struct V9fsPCIState { VirtIOPCIProxy parent_obj; - V9fsState vdev; + V9fsVirtioState vdev; } V9fsPCIState; #endif -- cgit v1.1