On Thu, 16 Dec 2010, Jeremy Fitzhardinge wrote:
> Current xen-unstable w/ most recent qemu-xen is failing to build:
>
> CC i386-stubdom/xenfb.o
> CC i386-stubdom/xen_console.o
> CC i386-stubdom/xen_disk.o
> /home/jeremy/hg/xen/unstable/stubdom/ioemu/hw/xen_disk.c:34:21: fatal error:
> sys/uio.h: No such file or directory
> compilation terminated.
> make[3]: *** [xen_disk.o] Error 1
> make[3]: Leaving directory
> `/home/jeremy/hg/xen/unstable/stubdom/ioemu/i386-stubdom'
>
>
> It looks like the stubdom libc doesn't have sys/uio.h, but I don't think
> it should be getting xen_disk in the first place?
>
Yeah, xen_disk should be compiled out in the stubdom case.
Something like this should work:
diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 7243174..401228b 100644
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -71,7 +71,9 @@ static void xen_init_pv(ram_addr_t ram_size, int vga_ram_size,
xen_be_register("console", &xen_console_ops);
xen_be_register("vkbd", &xen_kbdmouse_ops);
xen_be_register("vfb", &xen_framebuffer_ops);
+#ifndef CONFIG_STUBDOM
xen_be_register("qdisk", &xen_blkdev_ops);
+#endif
domid_target = xenstore_read_target();
if (domid_target)
xenstore_scan("qdisk", domid_target, &xen_blkdev_ops);
diff --git a/xen-hooks.mak b/xen-hooks.mak
index 2977569..253915d 100644
--- a/xen-hooks.mak
+++ b/xen-hooks.mak
@@ -30,7 +30,9 @@ OBJS += xen_machine_pv.o
OBJS += xen_backend.o
OBJS += xenfb.o
OBJS += xen_console.o
+ifndef CONFIG_STUBDOM
OBJS += xen_disk.o
+endif
OBJS += xen_machine_fv.o
OBJS += exec-dm.o
OBJS += pci_emulation.o
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home