Skip to contentSkip to conversation

tools: add option to explicitly enable VirtFS in QEMU build

PATCH In review Paul Durrant 3 participants 5 messages Sep 11, 2018 – Sep 19, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 tools: add option to explicitly enable VirtFS in QEMU build

9pfs support has been a documented feature since Xen 4.9, but QEMU will not be built with backend support unless VirtFS is enabled, which is predicated on the libcap and libattr dev packages being installed. This is not obvious to anyone intending to use 9pfs.

This patch adds an 'enable-9pfs' option to configure which, if specified, will cause '--enable-virtfs' to be passed to QEMU's configure. This will cause the dependency on libcap and libattr to be called out if the packages are not in installed.

For completeness, specifying 'disable-9pfs' will cause '--disable-virtfs' to be passed to QEMU's confgure and not specifying an option will keep the previous behaviour of predicating VirtFS on whether the libcap and libattr packages are installed.

---
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>

v3:
- Modify configure.ac and generate configure.

v2:
- Add the configure option rather then enabling VirtFS in all Linux builds.

---
 config/Tools.mk.in |  1 +
 tools/Makefile     | 10 +++++++++-
 tools/configure    | 17 ++++++++++++++++-
 tools/configure.ac |  9 ++++++++-
 4 files changed, 34 insertions(+), 3 deletions(-)
config/Tools.mk.in +1 -0
index 0964f6f9e9..bdba087af0 100644
@@ -62,6 +62,7 @@ SYSTEMD_CFLAGS      := @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS        := @SYSTEMD_LIBS@
 XEN_SYSTEMD_DIR     := @SYSTEMD_DIR@
 XEN_SYSTEMD_MODULES_LOAD := @SYSTEMD_MODULES_LOAD@
+CONFIG_9PFS         := @ninepfs@
 
 LINUX_BACKEND_MODULES := @LINUX_BACKEND_MODULES@
 
tools/Makefile +9 -1
index 67977ad850..c903d6a63e 100644
@@ -232,6 +232,13 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
 	else \
 		enable_trace_backend='' ; \
 	fi ; \
+	if [ "$(CONFIG_9PFS)" = "y" ]; then \
+		virtfs='--enable-virtfs' ; \
+	elif [ "$(CONFIG_9PFS)" = "n" ]; then \
+		virtfs='--disable-virtfs' ; \
+	else \
+		virtfs='' ; \
+	fi ; \
 	PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-config$${PKG_CONFIG_PATH:+:$${PKG_CONFIG_PATH}} \
 	$$source/configure --enable-xen --target-list=i386-softmmu \
 		$(QEMU_XEN_ENABLE_DEBUG) \
@@ -279,7 +286,8 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
 		--python=$(PYTHON) \
 		$(CONFIG_QEMUU_EXTRA_ARGS) \
 		--cpu=$(IOEMU_CPU_ARCH) \
-		$(IOEMU_CONFIGURE_CROSS); \
+		$(IOEMU_CONFIGURE_CROSS) \
+		$$virtfs; \
 	$(MAKE) all
 
 subdir-install-qemu-xen-dir: subdir-all-qemu-xen-dir
tools/configure +16 -1
index 27c8d054ab..acbcf9eb3e 100755
@@ -624,6 +624,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+ninepfs
 SYSTEMD_LIBS
 SYSTEMD_CFLAGS
 SYSTEMD_MODULES_LOAD
@@ -820,6 +821,7 @@ with_xenstored
 enable_systemd
 with_systemd
 with_systemd_modules_load
+enable_9pfs
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1500,6 +1502,8 @@ Optional Features:
   --disable-ipxe          Enable in-tree IPXE, (DEFAULT is on if rombios is
                           enabled, otherwise off, see also --with-system-ipxe)
   --enable-systemd        Enable systemd support (default is DISABLED)
+  --enable-9pfs           Explicitly enable 9pfs support in QEMU build
+                          (default is to defer to QEMU configure default)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -9799,6 +9803,18 @@ if test "x$systemd" = "xy"; then :
 
 fi
 
+# Check whether --enable-9pfs was given.
+if test "${enable_9pfs+set}" = set; then :
+  enableval=$enable_9pfs; if test "x$enable_9pfs" = "xyes"; then :
+  ninepfs=y
+else
+  ninepfs=n
+fi
+fi
+
+
+
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -11103,4 +11119,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
-
tools/configure.ac +8 -1
index bca2545280..e7d2e6f4ff 100644
@@ -486,5 +486,12 @@ AS_IF([test "x$systemd" = "xy"], [
     ])
 ])
 
-AC_OUTPUT()
+AC_ARG_ENABLE([9pfs],
+    AS_HELP_STRING([--enable-9pfs],
+                   [Explicitly enable 9pfs support in QEMU build (default is to defer to QEMU configure default)]),
+    [AS_IF([test "x$enable_9pfs" = "xyes"], [ninepfs=y], [ninepfs=n])],[
+])
 
+AC_SUBST(ninepfs)
+
+AC_OUTPUT()
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#1 lore raw

Ping?

Quoted 173 lines

-----Original Message-----
From: Paul Durrant [mailto:[email protected]]
Sent: 11 September 2018 16:01
To: [email protected]
Cc: Paul Durrant <[email protected]>; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Ian Jackson <[email protected]>; Jan Beulich <[email protected]>; Julien Grall <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; Stefano Stabellini <[email protected]>; Tim (Xen.org) <[email protected]>; Wei Liu <[email protected]>
Subject: [PATCH v3] tools: add option to explicitly enable VirtFS in QEMU build

9pfs support has been a documented feature since Xen 4.9, but QEMU will not be built with backend support unless VirtFS is enabled, which is predicated on the libcap and libattr dev packages being installed. This is not obvious to anyone intending to use 9pfs.

This patch adds an 'enable-9pfs' option to configure which, if specified, will cause '--enable-virtfs' to be passed to QEMU's configure. This will cause the dependency on libcap and libattr to be called out if the packages
are not in installed.

For completeness, specifying 'disable-9pfs' will cause '--disable-virtfs' to
be passed to QEMU's confgure and not specifying an option will keep the previous behaviour of predicating VirtFS on whether the libcap and libattr packages are installed.

---
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>

v3:
- Modify configure.ac and generate configure.

v2:
- Add the configure option rather then enabling VirtFS in all Linux
builds.

---
 config/Tools.mk.in |  1 +
 tools/Makefile     | 10 +++++++++-
 tools/configure    | 17 ++++++++++++++++-
 tools/configure.ac |  9 ++++++++-
 4 files changed, 34 insertions(+), 3 deletions(-)
config/Tools.mk.in +1 -0
index 0964f6f9e9..bdba087af0 100644
@@ -62,6 +62,7 @@ SYSTEMD_CFLAGS      := @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS        := @SYSTEMD_LIBS@
 XEN_SYSTEMD_DIR     := @SYSTEMD_DIR@
 XEN_SYSTEMD_MODULES_LOAD := @SYSTEMD_MODULES_LOAD@
+CONFIG_9PFS         := @ninepfs@
 
 LINUX_BACKEND_MODULES := @LINUX_BACKEND_MODULES@
 
tools/Makefile +7 -0
index 67977ad850..c903d6a63e 100644
@@ -232,6 +232,13 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
 	else \
 		enable_trace_backend='' ; \
 	fi ; \
+	if [ "$(CONFIG_9PFS)" = "y" ]; then \
+		virtfs='--enable-virtfs' ; \
+	elif [ "$(CONFIG_9PFS)" = "n" ]; then \
+		virtfs='--disable-virtfs' ; \
+	else \
+		virtfs='' ; \
+	fi ; \
 	PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-
 config$${PKG_CONFIG_PATH:+:$${PKG_CONFIG_PATH}} \
 	$$source/configure --enable-xen --target-list=i386-softmmu \
tools/Makefile +2 -1
 		$(QEMU_XEN_ENABLE_DEBUG) \
@@ -279,7 +286,8 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
 		--python=$(PYTHON) \
 		$(CONFIG_QEMUU_EXTRA_ARGS) \
 		--cpu=$(IOEMU_CPU_ARCH) \
-		$(IOEMU_CONFIGURE_CROSS); \
+		$(IOEMU_CONFIGURE_CROSS) \
+		$$virtfs; \
 	$(MAKE) all
 
 subdir-install-qemu-xen-dir: subdir-all-qemu-xen-dir
tools/configure +2 -0
index 27c8d054ab..acbcf9eb3e 100755
@@ -624,6 +624,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+ninepfs
 SYSTEMD_LIBS
 SYSTEMD_CFLAGS
 SYSTEMD_MODULES_LOAD
@@ -820,6 +821,7 @@ with_xenstored
 enable_systemd
 with_systemd
 with_systemd_modules_load
+enable_9pfs
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1500,6 +1502,8 @@ Optional Features:
   --disable-ipxe          Enable in-tree IPXE, (DEFAULT is on if rombios

is
enabled, otherwise off, see also --with-system-
ipxe)
--enable-systemd Enable systemd support (default is DISABLED)

tools/configure +14 -0
+  --enable-9pfs           Explicitly enable 9pfs support in QEMU build
+                          (default is to defer to QEMU configure default)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -9799,6 +9803,18 @@ if test "x$systemd" = "xy"; then :
 
 fi
 
+# Check whether --enable-9pfs was given.
+if test "${enable_9pfs+set}" = set; then :
+  enableval=$enable_9pfs; if test "x$enable_9pfs" = "xyes"; then :
+  ninepfs=y
+else
+  ninepfs=n
+fi
+fi
+
+
+
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -11103,4 +11119,3 @@ if test -n "$ac_unrecognized_opts" && test

"$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts"

Quoted 1 line

&2;}

fi

tools/configure +0 -1
-
tools/configure.ac +8 -2
index bca2545280..e7d2e6f4ff 100644
@@ -486,5 +486,12 @@ AS_IF([test "x$systemd" = "xy"], [
     ])
 ])
 
-AC_OUTPUT()
+AC_ARG_ENABLE([9pfs],
+    AS_HELP_STRING([--enable-9pfs],
+                   [Explicitly enable 9pfs support in QEMU build (default
 is to defer to QEMU configure default)]),
+    [AS_IF([test "x$enable_9pfs" = "xyes"], [ninepfs=y], [ninepfs=n])],[
+])
 
+AC_SUBST(ninepfs)
+
+AC_OUTPUT()
--
Quoted 1 line

2.11.0

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#2 lore raw
Quoted 1 line · Paul Durrant

Ping?

Looks good to me

Quoted 169 lines
Quoted 169 lines

-----Original Message-----
From: Paul Durrant [mailto:[email protected]]
Sent: 11 September 2018 16:01
To: [email protected]
Cc: Paul Durrant <[email protected]>; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Ian Jackson <[email protected]>; Jan Beulich <[email protected]>; Julien Grall <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; Stefano Stabellini <[email protected]>; Tim (Xen.org) <[email protected]>; Wei Liu <[email protected]>
Subject: [PATCH v3] tools: add option to explicitly enable VirtFS in QEMU build

9pfs support has been a documented feature since Xen 4.9, but QEMU will not be built with backend support unless VirtFS is enabled, which is predicated on the libcap and libattr dev packages being installed. This is not obvious to anyone intending to use 9pfs.

This patch adds an 'enable-9pfs' option to configure which, if specified, will cause '--enable-virtfs' to be passed to QEMU's configure. This will cause the dependency on libcap and libattr to be called out if the packages
are not in installed.

For completeness, specifying 'disable-9pfs' will cause '--disable-virtfs' to
be passed to QEMU's confgure and not specifying an option will keep the previous behaviour of predicating VirtFS on whether the libcap and libattr packages are installed.

---
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>

v3:
- Modify configure.ac and generate configure.

v2:
- Add the configure option rather then enabling VirtFS in all Linux
builds.

---
 config/Tools.mk.in |  1 +
 tools/Makefile     | 10 +++++++++-
 tools/configure    | 17 ++++++++++++++++-
 tools/configure.ac |  9 ++++++++-
 4 files changed, 34 insertions(+), 3 deletions(-)
config/Tools.mk.in +1 -0
index 0964f6f9e9..bdba087af0 100644
@@ -62,6 +62,7 @@ SYSTEMD_CFLAGS      := @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS        := @SYSTEMD_LIBS@
 XEN_SYSTEMD_DIR     := @SYSTEMD_DIR@
 XEN_SYSTEMD_MODULES_LOAD := @SYSTEMD_MODULES_LOAD@
+CONFIG_9PFS         := @ninepfs@
 
 LINUX_BACKEND_MODULES := @LINUX_BACKEND_MODULES@
 
tools/Makefile +7 -0
index 67977ad850..c903d6a63e 100644
@@ -232,6 +232,13 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
 	else \
 		enable_trace_backend='' ; \
 	fi ; \
+	if [ "$(CONFIG_9PFS)" = "y" ]; then \
+		virtfs='--enable-virtfs' ; \
+	elif [ "$(CONFIG_9PFS)" = "n" ]; then \
+		virtfs='--disable-virtfs' ; \
+	else \
+		virtfs='' ; \
+	fi ; \
 	PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-
 config$${PKG_CONFIG_PATH:+:$${PKG_CONFIG_PATH}} \
 	$$source/configure --enable-xen --target-list=i386-softmmu \
tools/Makefile +2 -1
 		$(QEMU_XEN_ENABLE_DEBUG) \
@@ -279,7 +286,8 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
 		--python=$(PYTHON) \
 		$(CONFIG_QEMUU_EXTRA_ARGS) \
 		--cpu=$(IOEMU_CPU_ARCH) \
-		$(IOEMU_CONFIGURE_CROSS); \
+		$(IOEMU_CONFIGURE_CROSS) \
+		$$virtfs; \
 	$(MAKE) all
 
 subdir-install-qemu-xen-dir: subdir-all-qemu-xen-dir
tools/configure +2 -0
index 27c8d054ab..acbcf9eb3e 100755
@@ -624,6 +624,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+ninepfs
 SYSTEMD_LIBS
 SYSTEMD_CFLAGS
 SYSTEMD_MODULES_LOAD
@@ -820,6 +821,7 @@ with_xenstored
 enable_systemd
 with_systemd
 with_systemd_modules_load
+enable_9pfs
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1500,6 +1502,8 @@ Optional Features:
   --disable-ipxe          Enable in-tree IPXE, (DEFAULT is on if rombios

is
enabled, otherwise off, see also --with-system-
ipxe)
--enable-systemd Enable systemd support (default is DISABLED)

tools/configure +14 -0
+  --enable-9pfs           Explicitly enable 9pfs support in QEMU build
+                          (default is to defer to QEMU configure default)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -9799,6 +9803,18 @@ if test "x$systemd" = "xy"; then :
 
 fi
 
+# Check whether --enable-9pfs was given.
+if test "${enable_9pfs+set}" = set; then :
+  enableval=$enable_9pfs; if test "x$enable_9pfs" = "xyes"; then :
+  ninepfs=y
+else
+  ninepfs=n
+fi
+fi
+
+
+
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -11103,4 +11119,3 @@ if test -n "$ac_unrecognized_opts" && test

"$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts"

Quoted 1 line

&2;}

fi

tools/configure +0 -1
-
tools/configure.ac +5 -1
index bca2545280..e7d2e6f4ff 100644
@@ -486,5 +486,12 @@ AS_IF([test "x$systemd" = "xy"], [
     ])
 ])
 
-AC_OUTPUT()
+AC_ARG_ENABLE([9pfs],
+    AS_HELP_STRING([--enable-9pfs],
+                   [Explicitly enable 9pfs support in QEMU build (default
 is to defer to QEMU configure default)]),
+    [AS_IF([test "x$enable_9pfs" = "xyes"], [ninepfs=y], [ninepfs=n])],[
+])
Quoted 6 lines
Quoted 5 lines
tools/configure.ac +3 -1
+AC_SUBST(ninepfs)
+
+AC_OUTPUT()
--

2.11.0

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#3 lore raw
Quoted 13 lines

-----Original Message-----
From: Stefano Stabellini [mailto:[email protected]]
Sent: 18 September 2018 17:46
To: Paul Durrant <[email protected]>
Cc: [email protected]; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Ian Jackson <[email protected]>; Jan Beulich <[email protected]>; Julien Grall <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; Stefano Stabellini <[email protected]>; Tim (Xen.org) <[email protected]>; Wei Liu <[email protected]>
Subject: RE: [PATCH v3] tools: add option to explicitly enable VirtFS in QEMU build

Quoted 4 lines
Quoted 1 line · Paul Durrant

Ping?

Looks good to me

I'll take that as an R-b then :-)

Paul

Quoted 180 lines
Quoted 8 lines
Quoted 8 lines

-----Original Message-----
From: Paul Durrant [mailto:[email protected]]
Sent: 11 September 2018 16:01
To: [email protected]
Cc: Paul Durrant <[email protected]>; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>;

Ian

Quoted 1 line
Quoted 1 line

Jackson <[email protected]>; Jan Beulich <[email protected]>;

Julien

Quoted 2 lines
Quoted 2 lines

Grall <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; Stefano Stabellini <[email protected]>;

Tim

Quoted 2 lines
Quoted 2 lines

(Xen.org) <[email protected]>; Wei Liu <[email protected]>
Subject: [PATCH v3] tools: add option to explicitly enable VirtFS in

QEMU

Quoted 3 lines
Quoted 3 lines

build

9pfs support has been a documented feature since Xen 4.9, but QEMU

will

Quoted 2 lines
Quoted 2 lines

not be built with backend support unless VirtFS is enabled, which is predicated on the libcap and libattr dev packages being installed.

This is

Quoted 3 lines
Quoted 3 lines

not obvious to anyone intending to use 9pfs.

This patch adds an 'enable-9pfs' option to configure which, if

specified,

Quoted 1 line
Quoted 1 line

will cause '--enable-virtfs' to be passed to QEMU's configure. This

will

Quoted 5 lines
Quoted 5 lines

cause the dependency on libcap and libattr to be called out if the packages
are not in installed.

For completeness, specifying 'disable-9pfs' will cause '--disable-

virtfs'

Quoted 2 lines
Quoted 2 lines

to
be passed to QEMU's confgure and not specifying an option will keep

the

Quoted 1 line
Quoted 1 line

previous behaviour of predicating VirtFS on whether the libcap and

libattr

Quoted 74 lines
Quoted 74 lines

packages are installed.

---
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>

v3:
- Modify configure.ac and generate configure.

v2:
- Add the configure option rather then enabling VirtFS in all Linux
builds.

---
 config/Tools.mk.in |  1 +
 tools/Makefile     | 10 +++++++++-
 tools/configure    | 17 ++++++++++++++++-
 tools/configure.ac |  9 ++++++++-
 4 files changed, 34 insertions(+), 3 deletions(-)
config/Tools.mk.in +1 -0
index 0964f6f9e9..bdba087af0 100644
@@ -62,6 +62,7 @@ SYSTEMD_CFLAGS      := @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS        := @SYSTEMD_LIBS@
 XEN_SYSTEMD_DIR     := @SYSTEMD_DIR@
 XEN_SYSTEMD_MODULES_LOAD := @SYSTEMD_MODULES_LOAD@
+CONFIG_9PFS         := @ninepfs@
 
 LINUX_BACKEND_MODULES := @LINUX_BACKEND_MODULES@
 
tools/Makefile +7 -0
index 67977ad850..c903d6a63e 100644
@@ -232,6 +232,13 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
 	else \
 		enable_trace_backend='' ; \
 	fi ; \
+	if [ "$(CONFIG_9PFS)" = "y" ]; then \
+		virtfs='--enable-virtfs' ; \
+	elif [ "$(CONFIG_9PFS)" = "n" ]; then \
+		virtfs='--disable-virtfs' ; \
+	else \
+		virtfs='' ; \
+	fi ; \
 	PKG_CONFIG_PATH=$(XEN_ROOT)/tools/pkg-
 config$${PKG_CONFIG_PATH:+:$${PKG_CONFIG_PATH}} \
 	$$source/configure --enable-xen --target-list=i386-softmmu \
tools/Makefile +2 -1
 		$(QEMU_XEN_ENABLE_DEBUG) \
@@ -279,7 +286,8 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
 		--python=$(PYTHON) \
 		$(CONFIG_QEMUU_EXTRA_ARGS) \
 		--cpu=$(IOEMU_CPU_ARCH) \
-		$(IOEMU_CONFIGURE_CROSS); \
+		$(IOEMU_CONFIGURE_CROSS) \
+		$$virtfs; \
 	$(MAKE) all
 
 subdir-install-qemu-xen-dir: subdir-all-qemu-xen-dir
tools/configure +0 -0
index 27c8d054ab..acbcf9eb3e 100755
@@ -624,6 +624,7 @@ ac_includes_default="\
 
Quoted 16 lines
Quoted 15 lines
tools/configure +2 -0
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+ninepfs
 SYSTEMD_LIBS
 SYSTEMD_CFLAGS
 SYSTEMD_MODULES_LOAD
@@ -820,6 +821,7 @@ with_xenstored
 enable_systemd
 with_systemd
 with_systemd_modules_load
+enable_9pfs
 '
       ac_precious_vars='build_alias
 host_alias

tools/configure Optional Features: · line 1502

Quoted 1 line
tools/configure +0 -0
@@ -1500,6 +1502,8 @@ Optional Features:
   --disable-ipxe          Enable in-tree IPXE, (DEFAULT is on if

rombios

Quoted 2 lines
Quoted 2 lines

is
enabled, otherwise off, see also --with-

system-

Quoted 2 lines
Quoted 2 lines

ipxe)
--enable-systemd Enable systemd support (default is

DISABLED)

Quoted 1 line
Quoted 1 line

+ --enable-9pfs Explicitly enable 9pfs support in QEMU

build

Quoted 1 line
Quoted 1 line

+ (default is to defer to QEMU configure

default)

Quoted 17 lines
Quoted 17 lines

Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]

tools/configure +10 -0
@@ -9799,6 +9803,18 @@ if test "x$systemd" = "xy"; then :
 
 fi
 
+# Check whether --enable-9pfs was given.
+if test "${enable_9pfs+set}" = set; then :
+  enableval=$enable_9pfs; if test "x$enable_9pfs" = "xyes"; then :
+  ninepfs=y
+else
+  ninepfs=n
+fi
+fi
+
+
Quoted 8 lines
Quoted 8 lines
tools/configure +2 -0
+
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -11103,4 +11119,3 @@ if test -n "$ac_unrecognized_opts" && test

"$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options:

$ac_unrecognized_opts"

Quoted 12 lines
Quoted 12 lines
Quoted 1 line

&2;}

fi

tools/configure +0 -1
-
tools/configure.ac +0 -0
index bca2545280..e7d2e6f4ff 100644
@@ -486,5 +486,12 @@ AS_IF([test "x$systemd" = "xy"], [
     ])
 ])
 
Quoted 16 lines
Quoted 4 lines

tools/configure.ac AS_IF([test "x$systemd" = "xy"], [

Quoted 4 lines
tools/configure.ac +3 -1
-AC_OUTPUT()
+AC_ARG_ENABLE([9pfs],
+    AS_HELP_STRING([--enable-9pfs],
+                   [Explicitly enable 9pfs support in QEMU build

(default

Quoted 2 lines

tools/configure.ac AS_IF([test "x$systemd" = "xy"], [ · line 493

Quoted 2 lines
tools/configure.ac +1 -0
 is to defer to QEMU configure default)]),
+    [AS_IF([test "x$enable_9pfs" = "xyes"], [ninepfs=y],

[ninepfs=n])],[

Quoted 8 lines
Quoted 7 lines
tools/configure.ac +4 -1
+])
 
+AC_SUBST(ninepfs)
+
+AC_OUTPUT()
--

2.11.0

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

Acked-by
#4 lore raw
Quoted 13 lines · Paul Durrant
Quoted 13 lines

-----Original Message-----
From: Stefano Stabellini [mailto:[email protected]]
Sent: 18 September 2018 17:46
To: Paul Durrant <[email protected]>
Cc: [email protected]; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Ian Jackson <[email protected]>; Jan Beulich <[email protected]>; Julien Grall <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; Stefano Stabellini <[email protected]>; Tim (Xen.org) <[email protected]>; Wei Liu <[email protected]>
Subject: RE: [PATCH v3] tools: add option to explicitly enable VirtFS in QEMU build

Quoted 6 lines
Quoted 4 lines · Paul Durrant
Quoted 1 line

Ping?

Looks good to me

I'll take that as an R-b then :-)

Note to self: rerun autogen.sh when applying this patch.

Wei.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel