---
Changes in v5:
- improved README changes
- changed qemuu_add_par variable to qemuu_extra_args
- fixed some indentation errors
- changed 2 additions that was bash-only
- run autoconf to update configure file
Changes in v4:
- removed upstream qemu debug option already included by default if
tools debug is enabled.
- refresh for latest xen unstable git
---
README | 7 +++++++
config/Tools.mk.in | 1 +
tools/Makefile | 1 +
tools/configure | 17 +++++++++++++++++
tools/configure.ac | 8 ++++++++
5 files changed, 34 insertions(+)
diff --git a/README b/README
index 9bbe734..f5d3c83 100644
--- a/README
+++ b/README
@@ -72,6 +72,13 @@ disabled at compile time:
* cmake (if building vtpm stub domains)
* markdown
* figlet (for generating the traditional Xen start of day banner)
+ * Development install of spice protocol (e.g. libspice-protocol-dev).
+ Required to build Spice for qemu upstream if enabled with configure.
+ * Development install of spice server (e.g. libspice-server-dev).
+ Required to build Spice for qemu upstream if enabled with configure.
+ * Development install of usb redirection (e.g. libusbredirparser-dev).
+ Required to build usb redirection for qemu upstream if enabled
+ with configure.
Second, you need to acquire a suitable kernel for use in domain 0. If
possible you should use a kernel provided by your OS distributor. If
diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 0bdf37a..efe5bc6 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -54,6 +54,7 @@ CONFIG_SEABIOS := @seabios@
CONFIG_QEMU_TRAD := @qemu_traditional@
CONFIG_QEMU_XEN := @qemu_xen@
CONFIG_BLKTAP1 := @blktap1@
+CONFIG_QEMUU_EXTRA_ARGS:= @qemuu_extra_args@
#System options
ZLIB := @zlib@
diff --git a/tools/Makefile b/tools/Makefile
index c3cfb38..555682b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -203,6 +203,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
--disable-docs \
--disable-guest-agent \
--python=$(PYTHON) \
+ $(CONFIG_QEMUU_EXTRA_ARGS) \
$(IOEMU_CONFIGURE_CROSS); \
$(MAKE) all
diff --git a/tools/configure b/tools/configure
index e1eeff4..354cacf 100755
--- a/tools/configure
+++ b/tools/configure
@@ -687,6 +687,7 @@ ovmf_path
seabios_path
qemu_xen
qemu_traditional
+qemuu_extra_args
blktap1
debug
seabios
@@ -763,6 +764,8 @@ enable_rombios
enable_seabios
enable_debug
enable_blktap1
+enable_qemuu_spice
+enable_qemuu_usbredir
enable_qemu_traditional
with_system_qemu
with_system_seabios
@@ -1423,6 +1426,8 @@ Optional Features:
--disable-seabios Disable SeaBIOS (default is ENABLED)
--disable-debug Disable debug build of tools (default is ENABLED)
--enable-blktap1 Enable blktap1 tools (default is DISABLED)
+ --enable-qemuu-spice Enable Spice build on qemu upstream
+ --enable-qemuu-usbredir Enable usb redirection build on qemu upstream
--enable-qemu-traditional
Enable qemu traditional device model, (DEFAULT is on
for x86, otherwise off)
@@ -3741,6 +3746,18 @@ blktap1=$ax_cv_blktap1
+# Check whether --enable-qemuu-spice was given.
+if test "${enable_qemuu_spice+set}" = set; then :
+ enableval=$enable_qemuu_spice; qemuu_extra_args="$qemuu_extra_args
--enable-spice"
+fi
+
+# Check whether --enable-qemuu-usbredir was given.
+if test "${enable_qemuu_usbredir+set}" = set; then :
+ enableval=$enable_qemuu_usbredir; qemuu_extra_args="$qemuu_extra_args
--enable-usb-redir"
+fi
+
+
+
# Check whether --enable-qemu-traditional was given.
if test "${enable_qemu_traditional+set}" = set; then :
enableval=$enable_qemu_traditional;
diff --git a/tools/configure.ac b/tools/configure.ac
index 00fb47b..b0f8b54 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -59,6 +59,14 @@ AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS])
AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools])
AX_ARG_DEFAULT_DISABLE([blktap1], [Enable blktap1 tools])
+AC_ARG_ENABLE([qemuu-spice],
+ [ --enable-qemuu-spice Enable Spice build on qemu upstream],
+ [qemuu_extra_args="$qemuu_extra_args --enable-spice"])
+AC_ARG_ENABLE([qemuu-usbredir],
+ [ --enable-qemuu-usbredir Enable usb redirection build on qemu upstream],
+ [qemuu_extra_args="$qemuu_extra_args --enable-usb-redir"])
+AC_SUBST(qemuu_extra_args)
+
AC_ARG_ENABLE([qemu-traditional],
AS_HELP_STRING([--enable-qemu-traditional],
[Enable qemu traditional device model, (DEFAULT is on for
x86, otherwise off)]),,[
