virt-manager/virtinst-xenbus-disk-index-fix.patch
Charles Arnold 1a980429d2 - bsc#1140211 - VUL-1: CVE-2019-10183: virt-manager: unattended
option leaks password via command line argument
  58c68764-unattended-Read-the-passwords-from-a-file.patch
  51d28f04-unattended-Dont-log-user-admin-passwords.patch
- Upstream bug fix (bsc#1027942)
  5312a961-virt-install-Revive-wait-0-as-alias-for-noautoconsole.patch

- Update to virt-manager 2.2.0 (fate#326786)
  virt-manager-2.2.0.tar.bz2
  *  libvirt XML viewing and editing UI for new and existing domain, pools, volumes, networks
  *  virt-install: libosinfo –unattended support (Fabiano Fidêncio, Cole Robinson)
  *  Improve CPU model security defaults (Pavel Hrdina)
  *  virt-install: new –install option. Ex: virt-install –install fedora29
  *  virt-install: new –install kernel=,initrd=
  *  virt-install: –disk, –memory, –name defaults from libosinfo (Fabiano Fidêncio, Cole Robinson)
  *  virt-install: add device suboption aliases which consistently match libvirt XML naming
  *  virt-xml: new –start, –no-define options (Marc Hartmayer)
  *  virt-install: Add driver_queues argument to –controller (Vasudeva Kamath)
  *  RISC-V support (Andrea Bolognani)
  *  Device default improvements for non-x86 KVM (Andrea Bolognani)
  *  Redesigned ‘New Network’ wizard
  *  libguestfs inspection improvements (Pino Toscano)
  *  virt-install: Add support for xenbus controller (Jim Fehlig)
  *  cli: Add –disk wwn=,rawio= (Athina Plaskasoviti)
  *  cli: Add –memballoon autodeflate=,stats.period= (Athina Plaskasoviti)
  *  cli: Add –iothreads (Athina Plaskasoviti)
  *  cli: Add –numatune memory.placement (Athina Plaskasoviti)
  *  cli: Add –launchSecurity option (Erik Skultety)
  *  cli: Fill in –memorybacking options
  *  cli: –smartcard: support database= and certificate[0-9]*=

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=476
2019-07-03 18:19:42 +00:00

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-2.2.0/virtinst/devices/disk.py
===================================================================
--- virt-manager-2.2.0.orig/virtinst/devices/disk.py
+++ virt-manager-2.2.0/virtinst/devices/disk.py
@@ -861,6 +861,17 @@ class DeviceDisk(Device):
:returns: generated target
"""
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()
@@ -874,7 +885,12 @@ class DeviceDisk(Device):
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