More stubdom build fixes.

* Do not fail to build stubdom if the compiler fails to optimise out
  never-called static functions containing undefined references.
* Properly disable stubdom ioemu docs build.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/savevm.c b/savevm.c
index ae880d336409f8b3792f8b241127372f8eab5466..e4bad26733046d77a5829d8f1755b1861a28082d 100644 (file)
--- a/savevm.c
+++ b/savevm.c
@@ -198,10 +198,12 @@ static int popen_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size)
 
 static int popen_close(void *opaque)
 {
+#ifndef CONFIG_STUBDOM
     QEMUFilePopen *s = opaque;
     pclose(s->popen_file);
     qemu_free(s);
     return 0;
+#endif
 }
 
 QEMUFile *qemu_popen(FILE *popen_file, const char *mode)

diff --git a/xen-setup-stubdom b/xen-setup-stubdom
index 741f6c6ea14e9e05e1befdb8666e942e83b540a5..835e505333b9c9936244105a1b756d9331f21e10 100755 (executable)
--- a/xen-setup-stubdom
+++ b/xen-setup-stubdom
@@ -64,14 +64,14 @@ ARCH_LDFLAGS=-m32
 EXESUF=
 AIOLIBS=
 ARCH=i386
-CONFIG_GDBSTUB=no
-CONFIG_OSS=no
+CONFIG_GDBSTUB=
+CONFIG_OSS=
 CONFIG_OSS_LIB=
 VERSION=$qemu_version
 SRC_PATH=`pwd`
 TARGET_DIRS=$target
-BUILD_DOCS=no
-CONFIG_AIO=no
+BUILD_DOCS=
+CONFIG_AIO=
 TOOLS=
 QEMU_ROOT ?= `pwd`
 END