diff -rup virtinst-0.300.0.orig/virtinst/FullVirtGuest.py virtinst-0.300.0.new/virtinst/FullVirtGuest.py

--- virtinst-0.300.0.orig/virtinst/FullVirtGuest.py	2007-09-19 15:19:16.000000000 -0400

+++ virtinst-0.300.0.new/virtinst/FullVirtGuest.py	2007-09-19 15:19:28.000000000 -0400

@@ -273,10 +273,13 @@ class FullVirtGuest(Guest.XenGuest):

         for d in self.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

+                # 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

             ret += d.get_xml_config(d.target)

             if saved_path != None: