ioemu: do not create the built-in cdrom device

This conflicts with xenstore.c's arrangements.
This current patch is a bit of a kludge but the upstream arrangements
make it hard to do better.

diff --git a/vl.c b/vl.c
index e22de1aee8b7fe16445533e5994c252a314b4c21..0add8b602b6a1be0ed86c56e57fa6f8caa416627 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -8673,8 +8673,10 @@ int main(int argc, char **argv)
 
     /* we always create the cdrom drive, even if no disk is there */
 
+#ifndef CONFIG_DM
     if (nb_drives_opt < MAX_DRIVES)
         drive_add(NULL, CDROM_ALIAS);
+#endif
 
     /* we always create at least one floppy */