Xen 4.2.0-rc3-pre patches for alpine Linux

diff --git /Makefile tools/qemu-xen-dir/Makefile
index 301c75e..e2c3cd4 100644
--- tools/qemu-xen-dir/Makefile
+++ tools/qemu-xen-dir/Makefile
@@ -34,7 +34,7 @@ configure: ;

 $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw)

-LIBS+=-lz $(LIBS_TOOLS)
+LIBS+=-lz -lm -lrt $(LIBS_TOOLS)

 ifdef BUILD_DOCS
 DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8
QMP/qmp-commands.txt
@@ -170,7 +170,7 @@ test-coroutine: test-coroutine.o qemu-timer-common.o
async.o $(coroutine-obj-y)
 $(qapi-obj-y): $(GENERATED_HEADERS)
 qapi-dir := $(BUILD_DIR)/qapi-generated
 test-visitor.o test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I
$(qapi-dir)
-qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
+qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) -lm

 $(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\
 $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py
diff --git tools/qemu-xen-dir/Makefile.target tools/qemu-xen-dir/Makefile.target
index a111521..95d6bc0 100644
--- tools/qemu-xen-dir/Makefile.target
+++ tools/qemu-xen-dir/Makefile.target
@@ -33,6 +33,8 @@ endif
 PROGS=$(QEMU_PROG)
 STPFILES=

+LIBS+=-lrt -lm
+
 ifndef CONFIG_HAIKU
 LIBS+=-lm
 endif
--- tools/qemu-xen-traditional-dir-remote/configure.old
+++ tools/qemu-xen-traditional-dir-remote/configure
@@ -1109,7 +1109,7 @@

 if test "$rt" = "yes" ; then
   # Hack, we should have a general purpose LIBS for this sort of thing
-  AIOLIBS="$AIOLIBS -lrt"
+  AIOLIBS="$AIOLIBS -lrt -lm"
 fi

 if test "$mingw32" = "yes" ; then
@@ -1513,9 +1513,11 @@

 tools=
 if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
-  tools="qemu-img\$(EXESUF) $tools"
+  #tools="qemu-img\$(EXESUF) $tools"
+  :
   if [ "$linux" = "yes" ] ; then
-      tools="qemu-nbd\$(EXESUF) $tools"
+      #tools="qemu-nbd\$(EXESUF) $tools"
+      :
   fi
 fi
 echo "TOOLS=$tools" >> $config_mak
--- tools/qemu-xen-dir-remote/configure.old
+++ tools/qemu-xen-dir-remote/configure
@@ -2471,6 +2471,7 @@
 elif compile_prog "" "-lrt" ; then
   LIBS="-lrt $LIBS"
 fi
+LIBS="-lrt -lm $LIBS"

 if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
         "$aix" != "yes" -a "$haiku" != "yes" ; then
@@ -2766,9 +2767,11 @@
 if test "$softmmu" = yes ; then
   tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
   if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
-      tools="qemu-nbd\$(EXESUF) $tools"
+      #tools="qemu-nbd\$(EXESUF) $tools"
+      :
     if [ "$guest_agent" = "yes" ]; then
-      tools="qemu-ga\$(EXESUF) $tools"
+      #tools="qemu-ga\$(EXESUF) $tools"
+      :
     fi
     if [ "$check_utests" = "yes" ]; then
       checks="check-qint check-qstring check-qdict check-qlist"
--- ./tools/qemu-xen-dir-remote/Makefile
+++ ./tools/qemu-xen-dir-remote/Makefile
@@ -34,7 +34,7 @@

 $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw)

-LIBS+=-lz -lm -lrt $(LIBS_TOOLS)
+LIBS+=-lz -lrt -lm $(LIBS_TOOLS)

 ifdef BUILD_DOCS
 DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
@@ -170,7 +170,7 @@
 $(qapi-obj-y): $(GENERATED_HEADERS)
 qapi-dir := $(BUILD_DIR)/qapi-generated
 test-visitor.o test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir)
-qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
+qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) -lrt -lm

 $(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\
 $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py
--- tools/qemu-xen-traditional-dir-remote/Makefile.target.orig
+++ tools/qemu-xen-traditional-dir-remote/Makefile.target
@@ -520,7 +520,7 @@
 OBJS+=block-raw-posix.o
 endif

-LIBS+=-lz
+LIBS+=-lz -lrt -lm
 ifdef CONFIG_ALSA
 LIBS += -lasound
 endif
--
1.7.9