From 53545deafaf982234ea73231dc2742a103815cd0 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Thu, 21 May 2015 15:12:46 +0000 Subject: [PATCH] - Upstream bug fixes 776c1d97-fix-changing-USB-device-model.patch bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch f8af2e6b-verify-HYPER-V-support-after-customization.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=234 --- 776c1d97-fix-changing-USB-device-model.patch | 41 +++++++++++++++ ...le-qemu_ga-for-sles-11-sp4-and-newer.patch | 23 +++++++++ ...-HYPER-V-support-after-customization.patch | 51 +++++++++++++++++++ virt-manager.changes | 8 +++ virt-manager.spec | 9 +++- virtman-add-s390x-arch-support.patch | 2 +- virtman-autoyast-support.patch | 14 ++--- 7 files changed, 139 insertions(+), 9 deletions(-) create mode 100644 776c1d97-fix-changing-USB-device-model.patch create mode 100644 bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch create mode 100644 f8af2e6b-verify-HYPER-V-support-after-customization.patch diff --git a/776c1d97-fix-changing-USB-device-model.patch b/776c1d97-fix-changing-USB-device-model.patch new file mode 100644 index 00000000..69c5b994 --- /dev/null +++ b/776c1d97-fix-changing-USB-device-model.patch @@ -0,0 +1,41 @@ +Subject: domain: Fix changing USB device model +From: Cole Robinson crobinso@redhat.com Tue May 19 13:21:36 2015 -0400 +Date: Tue May 19 18:29:45 2015 -0400: +Git: 776c1d97c667628b03ad79d4e89457675f475dfb + +Broken before v1.2.0 + +Index: virt-manager-1.2.0/virtManager/domain.py +=================================================================== +--- virt-manager-1.2.0.orig/virtManager/domain.py ++++ virt-manager-1.2.0/virtManager/domain.py +@@ -953,23 +953,22 @@ class vmmDomain(vmmLibvirtObject): + + def _change_model(): + if editdev.type == "usb": +- guest = self._make_xmlobj_to_define() +- ctrls = guest.get_devices("controller") ++ ctrls = xmlobj.get_devices("controller") + ctrls = [x for x in ctrls if (x.type == + VirtualController.TYPE_USB)] + for dev in ctrls: +- guest.remove_device(dev) ++ xmlobj.remove_device(dev) + + if model == "ich9-ehci1": + for dev in VirtualController.get_usb2_controllers( +- guest.conn): +- guest.add_device(dev) ++ xmlobj.conn): ++ xmlobj.add_device(dev) + else: +- dev = VirtualController(guest.conn) ++ dev = VirtualController(xmlobj.conn) + dev.type = "usb" + if model != "default": + dev.model = model +- guest.add_device(dev) ++ xmlobj.add_device(dev) + + elif editdev.type == "scsi": + if model == "default": diff --git a/bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch b/bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch new file mode 100644 index 00000000..f18a750f --- /dev/null +++ b/bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch @@ -0,0 +1,23 @@ +Subject: virtinst: enable qemu_ga for sles-11-sp4 and newer +From: Lin Ma lma@suse.com Wed May 20 09:26:44 2015 +0800 +Date: Wed May 20 14:01:50 2015 -0400: +Git: bbc4f83bd3233617122ce89504f8cda8ddf88512 + +Qemu guest agent becomes available since sles 11 sp4 distro, +So enable qemu_ga while installing sles11sp4 and newer sles. + +Signed-off-by: Lin Ma + +diff --git a/virtinst/osdict.py b/virtinst/osdict.py +index 57039b0..76c2260 100644 +--- a/virtinst/osdict.py ++++ b/virtinst/osdict.py +@@ -514,7 +514,7 @@ class _OsVariant(object): + return False + + def supports_qemu_ga(self): +- return self._is_related_to(["fedora18", "rhel6.0"]) ++ return self._is_related_to(["fedora18", "rhel6.0", "sles11sp4"]) + + def default_videomodel(self, guest): + if guest.os.is_pseries(): diff --git a/f8af2e6b-verify-HYPER-V-support-after-customization.patch b/f8af2e6b-verify-HYPER-V-support-after-customization.patch new file mode 100644 index 00000000..dcdc2dd9 --- /dev/null +++ b/f8af2e6b-verify-HYPER-V-support-after-customization.patch @@ -0,0 +1,51 @@ +Subject: create: verify HYPER-V support after customization +From: Giuseppe Scrivano gscrivan@redhat.com Wed May 20 18:27:13 2015 +0200 +Date: Wed May 20 22:48:33 2015 +0200: +Git: f8af2e6b1083ec38ffa143ce4d04751f6d543362 + +commit 938060ae5340f6e28dc9669ba1ab79a1aa3d615e moved default devices +setup to happen before UEFI is set invalidating what the commit +5acfccf6032abb9e8be89130d05b661e8b3f42c7 does. + +Add another check to happen before installing the guest to disable +HYPER-V when not supported. + +Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1185253 + +Signed-off-by: Giuseppe Scrivano + +Index: virt-manager-1.2.0/virtManager/create.py +=================================================================== +--- virt-manager-1.2.0.orig/virtManager/create.py ++++ virt-manager-1.2.0/virtManager/create.py +@@ -1790,6 +1790,7 @@ class vmmCreate(vmmGObjectUI): + if not self.is_visible(): + return + logging.debug("User finished customize dialog, starting install") ++ guest.check_defaults() + self.start_install(guest) + + def config_canceled(ignore): +Index: virt-manager-1.2.0/virtinst/guest.py +=================================================================== +--- virt-manager-1.2.0.orig/virtinst/guest.py ++++ virt-manager-1.2.0/virtinst/guest.py +@@ -814,6 +814,18 @@ class Guest(XMLBuilder): + return False + return True + ++ def check_defaults(self): ++ # This is used only by virt-manager to reset any defaults that may have ++ # changed through manual intervention via the customize wizard. ++ if not self._hv_supported(): ++ self.features.hyperv_relaxed = None ++ self.features.hyperv_vapic = None ++ self.features.hyperv_spinlocks = None ++ self.features.hyperv_spinlocks_retries = None ++ for i in self.clock.timers: ++ if i.name == "hypervclock": ++ self.clock.remove_timer(i) ++ + def _set_feature_defaults(self): + if self.os.is_container(): + self.features.acpi = None diff --git a/virt-manager.changes b/virt-manager.changes index 25c0c2cf..4190ee4c 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed May 20 13:14:27 MDT 2015 - carnold@suse.com + +- Upstream bug fixes + 776c1d97-fix-changing-USB-device-model.patch + bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch + f8af2e6b-verify-HYPER-V-support-after-customization.patch + ------------------------------------------------------------------- Fri May 15 13:10:49 MDT 2015 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index b81102d9..5ab2371b 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,7 +1,7 @@ # # spec file for package virt-manager # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define with_guestfs 0 %define askpass_package "openssh-askpass" %define qemu_user "qemu" @@ -44,6 +45,9 @@ Patch5: 88e18c86-fix-sending-net-removed-signal.patch Patch6: fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch Patch7: 2c1e482b-fix--show-host-summary-error-windows-flooding.patch Patch8: 4b5c836a-read-start-mode-from-inactive-conf-XML.patch +Patch9: 776c1d97-fix-changing-USB-device-model.patch +Patch10: bbc4f83b-enable-qemu_ga-for-sles-11-sp4-and-newer.patch +Patch11: f8af2e6b-verify-HYPER-V-support-after-customization.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -170,6 +174,9 @@ machine). %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 # SUSE Only %patch70 -p1 %patch71 -p1 diff --git a/virtman-add-s390x-arch-support.patch b/virtman-add-s390x-arch-support.patch index 1dc8bf66..f046c8a3 100644 --- a/virtman-add-s390x-arch-support.patch +++ b/virtman-add-s390x-arch-support.patch @@ -75,7 +75,7 @@ Index: virt-manager-1.2.0/virtinst/guest.py return self.add_device(VirtualGraphics(self.conn)) -@@ -948,7 +953,7 @@ class Guest(XMLBuilder): +@@ -960,7 +965,7 @@ class Guest(XMLBuilder): if self._hv_only_supports_virtio(): return True diff --git a/virtman-autoyast-support.patch b/virtman-autoyast-support.patch index 532dcb64..8844d423 100644 --- a/virtman-autoyast-support.patch +++ b/virtman-autoyast-support.patch @@ -1,9 +1,9 @@ Enhancement to switch the label from 'Kickstart' to 'Autoyast' when a suse distro is selected. -Index: virt-manager-1.1.0/virtManager/create.py +Index: virt-manager-1.2.0/virtManager/create.py =================================================================== ---- virt-manager-1.1.0.orig/virtManager/create.py -+++ virt-manager-1.1.0/virtManager/create.py +--- virt-manager-1.2.0.orig/virtManager/create.py ++++ virt-manager-1.2.0/virtManager/create.py @@ -1242,11 +1242,34 @@ class vmmCreate(vmmGObjectUI): self.populate_os_type_model() return @@ -51,7 +51,7 @@ Index: virt-manager-1.1.0/virtManager/create.py if extraargs: self.guest.installer.extraargs = extraargs -@@ -2053,6 +2079,7 @@ class vmmCreate(vmmGObjectUI): +@@ -2054,6 +2080,7 @@ class vmmCreate(vmmGObjectUI): dl = self.set_os_val(self.widget("install-os-type"), distro_type) vl = self.set_os_val(self.widget("install-os-version"), distro_var) self.set_distro_labels(dl, vl) @@ -59,10 +59,10 @@ Index: virt-manager-1.1.0/virtManager/create.py def check_detection(self, idx, forward): results = None -Index: virt-manager-1.1.0/ui/create.ui +Index: virt-manager-1.2.0/ui/create.ui =================================================================== ---- virt-manager-1.1.0.orig/ui/create.ui -+++ virt-manager-1.1.0/ui/create.ui +--- virt-manager-1.2.0.orig/ui/create.ui ++++ virt-manager-1.2.0/ui/create.ui @@ -843,7 +843,7 @@ bar 6 4