virt-manager/virtinst-cdrom.diff

29 lines
1.1 KiB
Diff
Raw Normal View History

- Update to virt-manager version 0.8.2 * Right click in the manager window operates on the clicked row, NOT the last selected row. This could cause an admin to accidentally shut down the wrong machine. * Running virt-manager on a new machine / user account no longer produces a traceback. * Allow ejecting and connecting floppy media - First time running virt-manager throws exception in engine.py add_connection(). virtman-autoconnect.diff - Update to virt-manager version 0.8.1 * VM Migration wizard, exposing various migration options * Enumerate CDROM and bridge devices on remote connections * Can once again list multiple graphs in main manager window (Jon Nordby) * Support disabling dhcp (Michal Novotny), and specifying 'routed' type for new virtual networks * Support storage pool source enumeration for LVM, NFS, and SCSI * Allow changing VM ACPI, APIC, clock offset, individual vcpu pinning, and video model (vga, cirrus, etc.) * Many improvements and bugfixes - bnc#552785 - virt-manager cannot connect to xend when started from an ordinary user's X session virtman-desktop.diff - bnc#553633 - Update breaks menu access keys in virt-viewer and still misses some key sequences. This is a SLE10 bug fixed for the virt-manager viewer in all versions. virtman-keycombo.diff - Use "graphics listen" for vnc connection (bnc#436629) - Remove unsupported SCSI disk option (bnc#464293) - Change cdrom start node to hdc instead of hdb (bnc#376935) OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=12
2010-01-09 00:19:17 +01:00
Index: virtinst-0.500.1/virtinst/VirtualDisk.py
===================================================================
- Update to virt-manager version 0.8.2 * Right click in the manager window operates on the clicked row, NOT the last selected row. This could cause an admin to accidentally shut down the wrong machine. * Running virt-manager on a new machine / user account no longer produces a traceback. * Allow ejecting and connecting floppy media - First time running virt-manager throws exception in engine.py add_connection(). virtman-autoconnect.diff - Update to virt-manager version 0.8.1 * VM Migration wizard, exposing various migration options * Enumerate CDROM and bridge devices on remote connections * Can once again list multiple graphs in main manager window (Jon Nordby) * Support disabling dhcp (Michal Novotny), and specifying 'routed' type for new virtual networks * Support storage pool source enumeration for LVM, NFS, and SCSI * Allow changing VM ACPI, APIC, clock offset, individual vcpu pinning, and video model (vga, cirrus, etc.) * Many improvements and bugfixes - bnc#552785 - virt-manager cannot connect to xend when started from an ordinary user's X session virtman-desktop.diff - bnc#553633 - Update breaks menu access keys in virt-viewer and still misses some key sequences. This is a SLE10 bug fixed for the virt-manager viewer in all versions. virtman-keycombo.diff - Use "graphics listen" for vnc connection (bnc#436629) - Remove unsupported SCSI disk option (bnc#464293) - Change cdrom start node to hdc instead of hdb (bnc#376935) OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=12
2010-01-09 00:19:17 +01:00
--- virtinst-0.500.1.orig/virtinst/VirtualDisk.py
+++ virtinst-0.500.1/virtinst/VirtualDisk.py
@@ -1354,14 +1354,18 @@ class VirtualDisk(VirtualDevice):
return self.target
raise ValueError(_("IDE CDROM must use 'hdc', but target in use."))
- # Regular scanning
+ # Start cdrom at 'c' and skip 'c' for non-cdrom
for i in range(maxnode):
gen_t = "%s%c" % (prefix, ord('a') + i)
- if gen_t in except_targets:
- continue
if gen_t not in skip_targets:
- self.target = gen_t
- return self.target
+ if self.device != self.DEVICE_CDROM:
+ if i != ord('c') - ord('a'):
+ self.target = gen_t
+ return self.target
+ else:
+ if i >= ord('c') - ord('a'):
+ self.target = gen_t
+ return self.target
# Check except_targets for any options
for t in except_targets: