Added optional build configs for qemu upstream

diff -r 7beedc18adf7 -r a2b1d2c9f959 README
@@ -60,6 +60,9 @@
     * 16-bit x86 assembler, loader and compiler (dev86 rpm or bin86 & bcc debs)
     * ACPI ASL compiler (iasl)
     * markdown
+    Optionals:
+    * Dev of spice protocol (e.g. libspice-protocol-dev >=0.10)
+    * Dev of spice server (e.g. libspice-server-dev >=0.10)
 
 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 -r 7beedc18adf7 -r a2b1d2c9f959 config/Tools.mk.in
@@ -37,6 +37,8 @@
 OCAML_TOOLS         := @ocamltools@
 CONFIG_MINITERM     := @miniterm@
 CONFIG_LOMOUNT      := @lomount@
+CONFIG_QEMUU_SPICE  := @qemuuspice@
+CONFIG_QEMUU_DEBUG  := @qemuudebug@
 
 #System options
 CONFIG_SYSTEM_LIBAIO:= @system_aio@

diff -r 7beedc18adf7 -r a2b1d2c9f959 tools/Makefile
@@ -87,6 +87,14 @@
 			 --interp-prefix=$(CROSS_SYS_ROOT)
 endif
 
+ifeq ($(CONFIG_QEMUU_DEBUG),y)
+QEMU_OPTIONAL_CONFIGS += --enable-debug
+endif
+
+ifeq ($(CONFIG_QEMUU_SPICE),y)
+QEMU_OPTIONAL_CONFIGS += --enable-spice
+endif
+
 QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi)
 ifneq ($(QEMU_ROOT),.)
 export QEMU_ROOT

@@ -158,6 +166,7 @@
 		--disable-kvm \
 		--python=$(PYTHON) \
 		$(IOEMU_CONFIGURE_CROSS); \
+		$(QEMU_OPTIONAL_CONFIGS); \
 	$(MAKE) install
 
 subdir-clean-qemu-xen-dir:

1,897 lines not on this page · raw message

diff -r 7beedc18adf7 -r a2b1d2c9f959 tools/configure.ac
@@ -45,6 +45,7 @@
 AX_ARG_ENABLE_AND_EXPORT([miniterm], [Enable miniterm])
 AX_ARG_ENABLE_AND_EXPORT([lomount], [Enable lomount])
 AX_ARG_DISABLE_AND_EXPORT([debug], [Disable debug build of tools])
+AX_ARG_ENABLE_AND_EXPORT([qemuudebug], [Enable debug build of Qemu upstream])
 
 AC_ARG_VAR([PREPEND_INCLUDES],
     [List of include folders to prepend to CFLAGS (without -I)])

@@ -99,6 +100,13 @@
 AX_PATH_PROG_OR_FAIL([XGETTEXT], [xgettext])
 AX_CHECK_UUID
 PKG_CHECK_MODULES(glib, glib-2.0)
+PKG_CHECK_MODULES(spice_protocol, spice-protocol >= 0.10, [have_spice_protocol=y], [libspice-protocol=n])
+PKG_CHECK_MODULES(spice_server, spice-server >= 0.10, [have_spice_server=y], [libspice-server=n])
+AS_IF([test "x$have_spice_protocol" = "xy" -a "x$have_spice_server" = "xy"], 
+	[qemuuspice="y"],
+	[qemuuspice="n"]
+)
+AC_SUBST(qemuuspice)
 
 # Check library path
 AX_DEFAULT_LIB