From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Tue, 8 Jul 2008 19:32:08 +0000 (+0100)
Subject: ioemu: do not create the built-in cdrom device
X-Git-Tag: xen-3.3.0-rc1~51
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c0c865c3f46bb30bd6b52459e275d1b9fec3e0b5;p=qemu-xen-3.3-testing.git

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 e22de1ae..0add8b60 100644
--- 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 */