[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/18] Enable 9pfs for Windows in configure / makefi
From: |
Michael Fritscher |
Subject: |
[Qemu-devel] [PATCH 18/18] Enable 9pfs for Windows in configure / makefiles |
Date: |
Fri, 29 Sep 2017 13:13:23 +0200 |
Signed-off-by: Michael Fritscher <address@hidden>
---
Makefile.objs | 1 +
configure | 23 +++++++++++++++++------
hw/9pfs/Makefile.objs | 11 +++++++----
3 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index bdfa3b6177..1ab197f48c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -47,6 +47,7 @@ common-obj-$(CONFIG_WIN32) += os-win32.o
common-obj-$(CONFIG_POSIX) += os-posix.o
common-obj-$(CONFIG_LINUX) += fsdev/
+common-obj-$(CONFIG_WIN32) += fsdev/
common-obj-y += migration/
diff --git a/configure b/configure
index 6587e8014b..74ca56c060 100755
--- a/configure
+++ b/configure
@@ -5067,13 +5067,22 @@ if test "$want_tools" = "yes" ; then
fi
fi
if test "$softmmu" = yes ; then
- if test "$linux" = yes; then
- if test "$virtfs" != no && test "$cap" = yes && test "$attr" = yes ; then
+ if test "$virtfs" != no ; then
+ if test "$linux" = yes; then
+ if test "$cap" = yes && test "$attr" = yes ; then
+ virtfs=yes
+ tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
+ else
+ if test "$virtfs" = yes; then
+ error_exit "VirtFS requires libcap devel and libattr devel on Linux"
+ fi
+ virtfs=no
+ fi
+ elif test "$mingw32" = yes; then
virtfs=yes
- tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
else
if test "$virtfs" = yes; then
- error_exit "VirtFS requires libcap devel and libattr devel"
+ error_exit "VirtFS is only supported on Linux or Windows"
fi
virtfs=no
fi
@@ -5085,10 +5094,12 @@ if test "$softmmu" = yes ; then
fi
mpath=no
fi
- tools="$tools scsi/qemu-pr-helper\$(EXESUF)"
+ if test "$linux" = yes; then
+ tools="$tools scsi/qemu-pr-helper\$(EXESUF)"
+ fi
else
if test "$virtfs" = yes; then
- error_exit "VirtFS is supported only on Linux"
+ error_exit "VirtFS is supported only on Linux or Windows"
fi
virtfs=no
if test "$mpath" = yes; then
diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs
index fd90b62900..d11100857d 100644
--- a/hw/9pfs/Makefile.objs
+++ b/hw/9pfs/Makefile.objs
@@ -1,10 +1,13 @@
-common-obj-y = 9p.o 9p-util.o
-common-obj-y += 9p-local.o 9p-xattr.o
-common-obj-y += 9p-xattr-user.o 9p-posix-acl.o
+common-obj-y = 9p.o
+common-obj-$(CONFIG_LINUX) += 9p-util.o
+common-obj-$(CONFIG_LINUX) += 9p-local.o 9p-xattr.o
+common-obj-$(CONFIG_LINUX) += 9p-xattr-user.o 9p-posix-acl.o
+common-obj-$(CONFIG_WIN32) += 9p-util.o
+common-obj-$(CONFIG_WIN32) += 9p-local.o
common-obj-y += coth.o cofs.o codir.o cofile.o
common-obj-y += coxattr.o 9p-synth.o
common-obj-$(CONFIG_OPEN_BY_HANDLE) += 9p-handle.o
-common-obj-y += 9p-proxy.o
+common-obj-$(CONFIG_POSIX) += 9p-proxy.o
common-obj-$(CONFIG_XEN) += xen-9p-backend.o
obj-$(CONFIG_VIRTIO) += virtio-9p-device.o
--
2.13.2.windows.1
- [Qemu-devel] [PATCH 08/18] Stub 9pfs xattr functions for Windows., (continued)
- [Qemu-devel] [PATCH 08/18] Stub 9pfs xattr functions for Windows., Michael Fritscher, 2017/09/29
- [Qemu-devel] [PATCH 05/18] Add definitions for 9p.c., Michael Fritscher, 2017/09/29
- [Qemu-devel] [PATCH 06/18] Stub out functions for 9pfs., Michael Fritscher, 2017/09/29
- [Qemu-devel] [PATCH 14/18] Disable rlimit under Windows, Michael Fritscher, 2017/09/29
- [Qemu-devel] [PATCH 15/18] Fix unavailable fields in stbuf under Windows., Michael Fritscher, 2017/09/29
- [Qemu-devel] [PATCH 16/18] Workaround for missing dent->d_type/d_off under Windows, Michael Fritscher, 2017/09/29
- [Qemu-devel] [PATCH 07/18] Fix unused variable error and unsuded function if FS_IOC_GETVERSION is not defined., Michael Fritscher, 2017/09/29
- [Qemu-devel] [PATCH 02/18] #include <sys/vfs.h> is not available under Windows., Michael Fritscher, 2017/09/29
- [Qemu-devel] [PATCH 17/18] Compile fixes for Windows., Michael Fritscher, 2017/09/29
- [Qemu-devel] [PATCH 12/18] Buildfix in 9p-util.c., Michael Fritscher, 2017/09/29
- [Qemu-devel] [PATCH 18/18] Enable 9pfs for Windows in configure / makefiles,
Michael Fritscher <=
- [Qemu-devel] [PATCH 11/18] Sete ctx->xops to null on Windows., Michael Fritscher, 2017/09/29
- [Qemu-devel] [PATCH 10/18] dirent has no d_off on Windows., Michael Fritscher, 2017/09/29
- [Qemu-devel] [PATCH 13/18] fsetxattrat_nofollow doesn't seem to be defined on Windows - disable it., Michael Fritscher, 2017/09/29
- [Qemu-devel] [PATCH 09/18] Dont initialize fields which aren't available on Windows., Michael Fritscher, 2017/09/29
- Re: [Qemu-devel] Make 9pfs buildable for Windows, Paolo Bonzini, 2017/09/29