[Qemu-devel] [PATCH v2 14/15] virtio-9p: move init function to virtio-9p-device.h

[Paolo Bonzini]

Signed-off-by: Paolo Bonzini <address@hidden>
---
 hw/9pfs/virtio-9p-device.h |    2 ++
 hw/virtio.h                |    6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/hw/9pfs/virtio-9p-device.h b/hw/9pfs/virtio-9p-device.h
index 7f2a4eb..28b0012 100644
--- a/hw/9pfs/virtio-9p-device.h
+++ b/hw/9pfs/virtio-9p-device.h
@@ -21,6 +21,8 @@ typedef struct V9fsConf
     char *fsdev_id;
 } V9fsConf;
 
+VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf);
+
 #define DEFINE_VIRTIO_9P_PROPERTIES(_state, _features_field, _conf_field) \
     DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, _features_field), \
     DEFINE_PROP_STRING("mount_tag", VirtIOPCIProxy, _conf_field.tag), \
diff --git a/hw/virtio.h b/hw/virtio.h
index 6943368..74576ed 100644
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -20,9 +20,6 @@
 #include "sysemu.h"
 #include "block.h"
 #include "event_notifier.h"
-#ifdef CONFIG_VIRTFS
-#include "9pfs/virtio-9p-device.h"
-#endif
 
 /* from Linux's linux/virtio_config.h */
 
@@ -193,9 +190,6 @@ void virtio_bind_device(VirtIODevice *vdev, const 
VirtIOBindings *binding,
 /* Base devices.  */
 typedef struct VirtIOBlkConf VirtIOBlkConf;
 VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk);
-#ifdef CONFIG_VIRTFS
-VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf);
-#endif
 
 
 void virtio_blk_exit(VirtIODevice *vdev);
-- 
1.7.7.1