From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 23 Oct 2008 16:43:06 +0000 (+0100)
Subject: Post stubdom merge compilation fixes
X-Git-Tag: t.master-before-merge~64
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=45a63258ac28cac7c2d52cc42dbdbebe03222d78;p=qemu-xen-4.2-testing.git

Post stubdom merge compilation fixes
---

diff --git a/aio.c b/aio.c
index 70d3cdc5a..f8590a6ba 100644
--- a/aio.c
+++ b/aio.c
@@ -16,6 +16,8 @@
 #include "sys-queue.h"
 #include "qemu_socket.h"
 
+#ifndef CONFIG_STUBDOM
+
 typedef struct AioHandler AioHandler;
 
 /* The list of registered AIO handlers */
@@ -193,3 +195,5 @@ void qemu_aio_wait(void)
         }
     } while (ret == 0);
 }
+
+#endif
diff --git a/block-nbd.c b/block-nbd.c
index 5b6cc4f86..dc631834f 100644
--- a/block-nbd.c
+++ b/block-nbd.c
@@ -29,6 +29,8 @@
 #include "qemu-common.h"
 #include "nbd.h"
 
+#ifndef CONFIG_STUBDOM
+
 #include <sys/types.h>
 #include <unistd.h>
 
@@ -187,3 +189,5 @@ BlockDriver bdrv_nbd = {
     .bdrv_getlength = nbd_getlength,
     .protocol_name = "nbd",
 };
+
+#endif
diff --git a/block-vbd.c b/block-vbd.c
index 9e64c62d2..4341259b1 100644
--- a/block-vbd.c
+++ b/block-vbd.c
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "audio/sys-queue.h"
+#include "sys-queue.h"
 #include "block_int.h"
 #include <assert.h>
 #include <xenbus.h>
@@ -106,10 +106,6 @@ void qemu_aio_init(void)
 {
 }
 
-void qemu_aio_poll(void)
-{
-}
-
 /* Wait for all IO requests to complete.  */
 void qemu_aio_flush(void)
 {
@@ -118,10 +114,6 @@ void qemu_aio_flush(void)
 	blkfront_sync(s->dev);
 }
 
-void qemu_aio_wait_start(void)
-{
-}
-
 void qemu_aio_wait(void)
 {
     int some = 0;
@@ -139,10 +131,6 @@ void qemu_aio_wait(void)
     remove_waiter(w);
 }
 
-void qemu_aio_wait_end(void)
-{
-}
-
 static void vbd_aio_callback(struct blkfront_aiocb *aiocbp, int ret) {
     VbdAIOCB *acb = aiocbp->data;
 
@@ -208,12 +196,10 @@ static int vbd_aligned_io(BlockDriverState *bs,
     VbdAIOCB *acb;
     int result[2];
     result[0] = 0;
-    qemu_aio_wait_start();
     acb = vbd_aio_setup(bs, sector_num, (uint8_t*) buf, nb_sectors, vbd_cb, &result);
     blkfront_aio(&acb->aiocb, write);
     while (!result[0])
 	qemu_aio_wait();
-    qemu_aio_wait_end();
     return result[1];
 }
 
diff --git a/block.c b/block.c
index 64e7c3edc..8eadd6eae 100644
--- a/block.c
+++ b/block.c
@@ -1420,7 +1420,9 @@ void bdrv_init(void)
     bdrv_register(&bdrv_vvfat);
     bdrv_register(&bdrv_qcow2);
     bdrv_register(&bdrv_parallels);
+#ifndef CONFIG_STUBDOM
     bdrv_register(&bdrv_nbd);
+#endif
 }
 
 void *qemu_aio_get(BlockDriverState *bs, BlockDriverCompletionFunc *cb,
diff --git a/nbd.c b/nbd.c
index bb4f5d427..a9b9401fb 100644
--- a/nbd.c
+++ b/nbd.c
@@ -32,6 +32,8 @@
 
 #include "qemu_socket.h"
 
+#ifndef CONFIG_STUBDOM
+
 //#define DEBUG_NBD
 
 #ifdef DEBUG_NBD
@@ -659,3 +661,5 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset,
 
 	return 0;
 }
+
+#endif
diff --git a/xen-config-host.h b/xen-config-host.h
index 5e84c7b3b..3d53364fa 100644
--- a/xen-config-host.h
+++ b/xen-config-host.h
@@ -1,7 +1,8 @@
 #ifdef __MINIOS__
 #define CONFIG_STUBDOM
-#define NO_AIO 1
+#undef CONFIG_AIO
 #define NO_UNIX_SOCKETS 1
+#define NO_BLUETOOTH_PASSTHROUGH 1
 #endif
 
 extern char domain_name[64];
diff --git a/xen-hooks.mak b/xen-hooks.mak
index 205280f5a..cc899dc01 100644
--- a/xen-hooks.mak
+++ b/xen-hooks.mak
@@ -36,7 +36,8 @@ OBJS += helper2.o
 OBJS += battery_mgmt.o
 
 ifdef CONFIG_STUBDOM
-CPPFLAGS += $(TARGET_CPPFLAGS)
+CPPFLAGS += $(TARGET_CPPFLAGS) -DNEED_CPU_H \
+	-I$(QEMU_ROOT)/i386-dm -I$(QEMU_ROOT)/hw -I$(QEMU_ROOT)/fpu
 CONFIG_SDL=
 CONFIG_AUDIO=
 OBJS += xenfbfront.o