- bsc#1174176 - IDE: "Only 2 disks for bus 'NONE' are supported"

virtman-disallow-adding-floppy-disk.patch

- bsc#1172356 - Not able to hot-plug NIC via virt-manager, asks to
  attach on next reboot while it should be live attached
  virtinst-set-default-nic.patch

- bsc#1169708 - Virtualization/virt-manager: Bug yast2 virt-install
  internal error
  virt-install.rb

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=503

virt-install.rb

@@ -48,7 +48,7 @@ module Yast
         status = UI.RunInTerminal("/usr/bin/vm-install")
       else
         Builtins.y2milestone("Launching virt-manager to run virt-install in GUI mode.")
-        if Arch.is_xen == false
+        if Arch.is_xen0 == false
           details = Convert.to_map(SCR.Execute(path(".target.bash_output"), "/usr/bin/virt-manager --connect=qemu:///system --show-domain-creator"))
         else
           details = Convert.to_map(SCR.Execute(path(".target.bash_output"), "/usr/bin/virt-manager --connect=xen:/// --show-domain-creator"))

virt-manager.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Wed Jul 29 13:22:53 MDT 2020 - carnold@suse.com
+
+- bsc#1174176 - IDE: "Only 2 disks for bus 'NONE' are supported"
+  virtman-disallow-adding-floppy-disk.patch
+
+-------------------------------------------------------------------
+Thu Jul 23 17:20:03 MDT 2020 - carnold@suse.com
+
+- bsc#1172356 - Not able to hot-plug NIC via virt-manager, asks to
+  attach on next reboot while it should be live attached
+  virtinst-set-default-nic.patch
+
+-------------------------------------------------------------------
+Mon Jul 13 14:43:35 MDT 2020 - carnold@suse.com
+
+- bsc#1169708 - Virtualization/virt-manager: Bug yast2 virt-install
+  internal error
+  virt-install.rb
+
 -------------------------------------------------------------------
 Tue Mar 24 14:00:39 MDT 2020 - carnold@suse.com
 

virt-manager.spec

@@ -78,6 +78,7 @@ Patch154:       virtman-allow-creating-i686-vm.patch
 Patch155:       virtman-dont-specify-vte-version.patch
 Patch156:       virtman-dont-specify-gtksource-version.patch
 Patch157:       virtman-fix-restore-vm-menu-selection.patch
+Patch158:       virtman-disallow-adding-floppy-disk.patch
 Patch160:       virtinst-xen-drive-type.patch
 Patch161:       virtinst-xenbus-disk-index-fix.patch
 Patch162:       virtinst-refresh_before_fetch_pool.patch
@@ -86,6 +87,7 @@ Patch164:       virtinst-use-qemu-for-cdrom-device.patch
 Patch165:       virtinst-keep-install-iso-attached.patch
 Patch166:       virtinst-osdict-get_supported.patch
 Patch167:       virtinst-dont-use-special-copy-cpu-features.patch
+Patch168:       virtinst-set-default-nic.patch
 # Python2 to Python3 patches
 Patch200:       virtconv-python2-to-python3-conversion.patch
 Patch201:       virtinst-python2-to-python3-conversion.patch
@@ -226,6 +228,7 @@ machine).
 %patch155 -p1
 %patch156 -p1
 %patch157 -p1
+%patch158 -p1
 %patch160 -p1
 %patch161 -p1
 %patch162 -p1
@@ -234,6 +237,7 @@ machine).
 %patch165 -p1
 %patch166 -p1
 %patch167 -p1
+%patch168 -p1
 # Python2 to Python3 patches
 %patch200 -p1
 %patch201 -p1

virtinst-set-default-nic.patch

@@ -0,0 +1,16 @@
+References: bsc#1172356
+Libvirt doesn't accept "Hypervisor default" as a model name
+
+Index: virt-manager-2.2.1/virtinst/devices/interface.py
+===================================================================
+--- virt-manager-2.2.1.orig/virtinst/devices/interface.py
++++ virt-manager-2.2.1/virtinst/devices/interface.py
+@@ -256,6 +256,8 @@ class DeviceInterface(Device):
+             return "e1000e"
+         if not guest.os.is_x86():
+             return None
++        if guest.conn.is_xen() and guest.os.is_hvm():
++            return "netfront"
+ 
+         prefs = ["e1000", "rtl8139", "ne2k_pci", "pcnet"]
+         supported_models = guest.osinfo.supported_netmodels()

virtman-disallow-adding-floppy-disk.patch

@@ -0,0 +1,41 @@
+References: bsc#1174176, bsc#1174139
+Current libxl does not support adding a floppy. Code is included
+in this patch anyways to correctly set up a bus if a floppy were
+added.
+
+
+Index: virt-manager-2.2.1/virtManager/addhardware.py
+===================================================================
+--- virt-manager-2.2.1.orig/virtManager/addhardware.py
++++ virt-manager-2.2.1/virtManager/addhardware.py
+@@ -528,6 +528,9 @@ class vmmAddHardware(vmmGObjectUI):
+             buses = domcaps.devices.disk.get_enum("bus").get_values()
+         else:
+             buses = vmmAddHardware.disk_old_recommended_buses(guest)
++        # libxl doesn't support floppy but request one from qemu anyways if specified
++        if guest.conn.is_xen() and devtype == "floppy":
++            buses.append("fdc")
+ 
+         bus_map = {
+             "disk": ["ide", "sata", "scsi", "sd", "usb", "virtio", "xen"],
+@@ -539,7 +542,7 @@ class vmmAddHardware(vmmGObjectUI):
+ 
+     @staticmethod
+     def disk_pretty_bus(bus):
+-        if bus in ["ide", "sata", "scsi", "usb", "sd"]:
++        if bus in ["ide", "sata", "scsi", "usb", "sd", "fdc"]:
+             return bus.upper()
+         if bus in ["xen"]:
+             return bus.capitalize()
+@@ -724,8 +727,9 @@ class vmmAddHardware(vmmGObjectUI):
+                       "drive-harddisk", _("Disk device")])
+         target_model.append([DeviceDisk.DEVICE_CDROM,
+                       "media-optical", _("CDROM device")])
+-        target_model.append([DeviceDisk.DEVICE_FLOPPY,
+-                      "media-floppy", _("Floppy device")])
++        if not self.conn.is_xen():
++            target_model.append([DeviceDisk.DEVICE_FLOPPY,
++                          "media-floppy", _("Floppy device")])
+         if self.conn.is_qemu() or self.conn.is_test():
+             target_model.append([DeviceDisk.DEVICE_LUN,
+                           "drive-harddisk", _("LUN Passthrough")])