Index: xen-4.0.0-testing/tools/ioemu-remote/hw/xen_machine_fv.c
===================================================================
--- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/xen_machine_fv.c
+++ xen-4.0.0-testing/tools/ioemu-remote/hw/xen_machine_fv.c
@@ -268,6 +268,7 @@ void qemu_invalidate_entry(uint8_t *buff
 
 #endif /* defined(MAPCACHE) */
 
+extern void init_blktap(void);
 
 static void xen_init_fv(ram_addr_t ram_size, int vga_ram_size,
 			const char *boot_device,
@@ -293,6 +294,11 @@ static void xen_init_fv(ram_addr_t ram_s
     }
 #endif
 
+#ifndef CONFIG_STUBDOM
+    /* Initialize tapdisk client */
+    init_blktap();
+#endif
+
 #ifdef CONFIG_STUBDOM /* the hvmop is not supported on older hypervisors */
     xc_set_hvm_param(xc_handle, domid, HVM_PARAM_DM_DOMAIN, DOMID_SELF);
 #endif