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? This is on a F14 system, which may be relevant. Thanks, J _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
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@lists.xensource.com http://lists.xensource.com/xen-devel
Stefano Stabellini writes ("Re: Build error in stubdoms"):> Yeah, xen_disk should be compiled out in the stubdom case. > Something like this should work:I have applied a version of this patch which makes things compile :-). Thanks, Ian. commit 47a25c461b6b5ab67397f7bbb209590a0839e213 Author: Ian Jackson <ian.jackson@eu.citrix.com> Date: Thu Dec 16 15:50:06 2010 +0000 stubdom: fix stubdom build following dd9d12dc dd9d12dc does not build with stubdoms because xen_disk isn''t supported. Disable it in the stubdom case. Original version of this patch by Stefano Stabellini. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> diff --git a/hw/xen_machine_fv.c b/hw/xen_machine_fv.c index 7eb3792..a353ee6 100644 --- a/hw/xen_machine_fv.c +++ b/hw/xen_machine_fv.c @@ -368,7 +368,9 @@ static void xen_init_fv(ram_addr_t ram_size, int vga_ram_size, exit(1); } xen_be_register("console", &xen_console_ops); +#ifndef CONFIG_STUBDOM xen_be_register("qdisk", &xen_blkdev_ops); +#endif pc_machine.init(ram_size, vga_ram_size, boot_device, kernel_filename, kernel_cmdline, initrd_filename, diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c index 7243174..0004904 100644 --- a/hw/xen_machine_pv.c +++ b/hw/xen_machine_pv.c @@ -71,10 +71,12 @@ 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); domid_target = xenstore_read_target(); if (domid_target) xenstore_scan("qdisk", domid_target, &xen_blkdev_ops); +#endif /* setup framebuffer */ xen_init_display(xen_domid); 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@lists.xensource.com http://lists.xensource.com/xen-devel