From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Mon, 23 Mar 2009 15:58:28 +0000 (+0000)
Subject: More stubdom build fixes.
X-Git-Tag: xen-3.4.0-rc2~51
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c6cca375a2fc681726b7c1e0e37dbc0a4f354032;p=qemu-xen-3.4-testing.git

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 ae880d33..e4bad267 100644
--- 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 741f6c6e..835e5053 100755
--- 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