From c0c865c3f46bb30bd6b52459e275d1b9fec3e0b5 Mon Sep 17 00:00:00 2001
From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Tue, 8 Jul 2008 20:32:08 +0100
Subject: [PATCH] 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.
---
 vl.c | 2 ++
 1 file changed, 2 insertions(+)

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 */
 
-- 
2.39.5