From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 16 Dec 2010 15:50:06 +0000 (+0000)
Subject: stubdom: fix stubdom build following dd9d12dc
X-Git-Tag: xen-4.1.0-rc1~7
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=47a25c461b6b5ab67397f7bbb209590a0839e213;p=qemu-xen-4.2-testing.git

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 7eb379249..a353ee6ca 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 724317465..0004904ee 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 2977569c4..253915d8d 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