56082a3f99
virt-manager-1.4.1.tar.bz2 virtinst-check-date-format.patch virtinst-no-usb-tablet-for-xenpv.patch * New VM wixard virt-bootstrap integration (Radostin Stoyanov) * New VM wizard support for virtuozzo containers (Mikhail Feoktistov) * network UI: add support to create SR-IOV VF pool (Lin Ma) * Nicer OS list in New VM wizard (Pino Toscano) * Better defaults for UEFI secureboot builds (Pavel Hrdina) * Fix defaults for aarch64 VMs if graphics are requested * virt-install: new –memdev option (Pavel Hrdina) * virt-install: add –disk logical/physical_block_size (Yuri Arabadji) * virt-install: add –features hyperv_reset=, hyperv_synic= (Venkat Datta N H) - Dropped the following patches contained in new tarball f5d709d9-lang-it-1.patch c66098f3-lang-it-2.patch 452a693e-lang-update.patch 6b5106ea-lang-it-ko-fix.patch 9c8ffe51-fix-multiple-warnings-1.patch cb182f7e-skip-authentication-only-for-VNC-with-listen-type-none.patch 0610cd6a-ensure-bool-value-used-for-set_sensitive-call.patch f341352c-remove-redundant-error-string.patch ff3b4dc5-dont-overwrite-install-bootorder.patch 2099a194-reset-guest-domain-to-none-on-domain-creation-error.patch 93085d2b-reset-guest-domain-to-none-on-domain-creation-error.patch 7aee124d-fix-multiple-warnings-2.patch f38c56c9-add-support-for-SMM-feature.patch 24f9d053-add-support-for-loader-secure-attribute.patch 4f8e795c-if-required-by-UEFI-enable-SMM-feature-and-set-q35-machine-type.patch b690908a-enable-secure-feature-together-with-smm-for-UEFI.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=356
45 lines
1.9 KiB
Diff
45 lines
1.9 KiB
Diff
Reference: bnc#872789
|
|
This is an indexing problem created by virt-manager. It knows not
|
|
to add two IDE disks of the same name (eg, 'hda' twice) or two Xen
|
|
disks of the same name (eg, 'xvda' twice) but with the different bus
|
|
types (ide vs xen) it added xvda with hda. These disks were then
|
|
passed to qemu where it error'ed out with the disks having the same
|
|
index (in this case both are 0).
|
|
|
|
Index: virt-manager-1.4.2/virtinst/devicedisk.py
|
|
===================================================================
|
|
--- virt-manager-1.4.2.orig/virtinst/devicedisk.py
|
|
+++ virt-manager-1.4.2/virtinst/devicedisk.py
|
|
@@ -1003,6 +1003,17 @@ class VirtualDisk(VirtualDevice):
|
|
@rtype C{str}
|
|
"""
|
|
prefix, maxnode = self.get_target_prefix(skip_targets)
|
|
+ postfix_targets = []
|
|
+ if self.conn.is_xen():
|
|
+ prefixes = [ "hd", "xvd", "vd", "sd", "fd" ]
|
|
+ for x in skip_targets:
|
|
+ if x is None:
|
|
+ continue
|
|
+ for p in prefixes:
|
|
+ found = x.split(p,1)
|
|
+ if found and len(found) == 2:
|
|
+ postfix_targets.append(found[1])
|
|
+ break
|
|
skip_targets = [t for t in skip_targets if t and t.startswith(prefix)]
|
|
skip_targets.sort()
|
|
|
|
@@ -1016,7 +1027,12 @@ class VirtualDisk(VirtualDevice):
|
|
ran = range(pref_ctrl * 7, (pref_ctrl + 1) * 7)
|
|
|
|
for i in ran:
|
|
- gen_t = prefix + self.num_to_target(i + 1)
|
|
+ postfix = self.num_to_target(i + 1)
|
|
+ gen_t = prefix + postfix
|
|
+ if self.conn.is_xen() and postfix in postfix_targets:
|
|
+ if gen_t in skip_targets:
|
|
+ skip_targets.remove(gen_t)
|
|
+ continue
|
|
if gen_t in skip_targets:
|
|
skip_targets.remove(gen_t)
|
|
continue
|