From be3d560ae8f1e58ec45fd20caf4ddcae998dacb4 Mon Sep 17 00:00:00 2001 From: Sooyoung Ha Date: Fri, 9 May 2014 14:56:15 +0900 Subject: virtio-9p: enable the virtfs on Windows. support the virtio-9p local operations on Windows to provide host directory sharing. Change-Id: Ib8869cba7bd1cb248d23feb19c73235b19192d86 Signed-off-by: Sooyoung Ha --- fsdev/file-op-9p.h | 17 +++++++++++++++++ fsdev/virtio-9p-marshal.c | 23 ++++++++++++++++++++++- fsdev/virtio-9p-marshal.h | 6 ++++++ 3 files changed, 45 insertions(+), 1 deletion(-) (limited to 'fsdev') diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h index 339113066d..45e6a4a620 100644 --- a/fsdev/file-op-9p.h +++ b/fsdev/file-op-9p.h @@ -12,12 +12,16 @@ */ #ifndef _FILEOP_H #define _FILEOP_H +#ifdef CONFIG_MARU + #include #include #include #include #include +#ifndef CONFIG_WIN32 #include +#endif #ifdef CONFIG_LINUX #include #endif @@ -25,7 +29,20 @@ #include #include #endif +#ifdef CONFIG_WIN32 +#include "tizen/src/resources_win32.h" +#endif +struct iovec; +#else /* ifndef CONFIG_MARU */ +#include +#include +#include +#include +#include +#include +#include +#endif #define SM_LOCAL_MODE_BITS 0600 #define SM_LOCAL_DIR_MODE_BITS 0700 diff --git a/fsdev/virtio-9p-marshal.c b/fsdev/virtio-9p-marshal.c index 20f308b760..53626a46ea 100644 --- a/fsdev/virtio-9p-marshal.c +++ b/fsdev/virtio-9p-marshal.c @@ -10,7 +10,8 @@ * the COPYING file in the top-level directory. * */ - +#include "qemu-common.h" +#ifndef CONFIG_MARU #include #include #include @@ -26,6 +27,26 @@ #include "virtio-9p-marshal.h" #include "qemu/bswap.h" +#else /* CONFIG_MARU */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "qemu/compiler.h" +#include "qemu/bswap.h" +#include "virtio-9p-marshal.h" + +#ifndef CONFIG_WIN32 +#include +#endif +#endif + void v9fs_string_free(V9fsString *str) { g_free(str->data); diff --git a/fsdev/virtio-9p-marshal.h b/fsdev/virtio-9p-marshal.h index 5df65a8357..431073cb5b 100644 --- a/fsdev/virtio-9p-marshal.h +++ b/fsdev/virtio-9p-marshal.h @@ -1,6 +1,12 @@ #ifndef _QEMU_VIRTIO_9P_MARSHAL_H #define _QEMU_VIRTIO_9P_MARSHAL_H +#ifdef CONFIG_MARU +#ifdef CONFIG_WIN32 +#include "tizen/src/resources_win32.h" +#endif +#endif + typedef struct V9fsString { uint16_t size; -- cgit v1.2.3