Blob Blame History Raw
# HG changeset patch
# User "Cole Robinson <crobinso@redhat.com>"
# Date 1205422642 14400
# Node ID 9d72e4722c7ff56ccf9e75f2e85873c5c8d3bc42
# Parent  b264738ca7a1f4d69a69ff334ca07261e361cf39
Have cdrom device stick around after reboot for qemu guest: requires current upstream libvirt.

diff -r b264738ca7a1 -r 9d72e4722c7f virtinst/FullVirtGuest.py
--- a/virtinst/FullVirtGuest.py	Mon Mar 10 19:51:34 2008 -0400
+++ b/virtinst/FullVirtGuest.py	Thu Mar 13 11:37:22 2008 -0400
@@ -313,14 +313,11 @@ class FullVirtGuest(Guest.XenGuest):
 
         for d in self._install_disks:
             saved_path = None
-            if d.device == Guest.VirtualDisk.DEVICE_CDROM and d.transient and not install:
-                # XXX hack. libvirt can't currently handle QEMU having an empty disk path..
-                if self.type == "xen":
-                    saved_path = d.path
-                    d.path = None
-                else:
-                    # .. so simply remove CDROM device completely in non-Xen
-                    continue
+            if d.device == Guest.VirtualDisk.DEVICE_CDROM \
+               and d.transient and not install:
+                # Keep cdrom around, but with no media attached
+                saved_path = d.path
+                d.path = None
 
             ret += d.get_xml_config(d.target)
             if saved_path != None: