diff --git a/1018ab44-inspection-handle-failures-in-application-listing.patch b/1018ab44-inspection-handle-failures-in-application-listing.patch new file mode 100644 index 00000000..56e757d7 --- /dev/null +++ b/1018ab44-inspection-handle-failures-in-application-listing.patch @@ -0,0 +1,32 @@ +Subject: inspection: handle failures in application listing +From: Pino Toscano ptoscano@redhat.com Tue Feb 5 18:17:42 2019 +0100 +Date: Thu Feb 7 09:59:28 2019 -0500: +Git: 1018ab448484f2e5836fb540d253e813bd8cf6d6 + +The Python binding of libguestfs errors out in case any of the details +(e.g. summary, description) of an application are not proper UTF-8. +This seems a rare situation, which nevertheless causes the failure of +the inspection of a guest, making the rest of the metadata not used. + +While these encoding issues are tackled, and fixed in python-libguestfs +(or libguestfs itself), gracefully handle the failure of +inspect_list_applications(), so at least the rest of the details of a +guest are used/shown. + +diff --git a/virtManager/inspection.py b/virtManager/inspection.py +index fde48474..9923dde2 100644 +--- a/virtManager/inspection.py ++++ b/virtManager/inspection.py +@@ -275,7 +275,11 @@ class vmmInspection(vmmGObject): + icon = None + + # Inspection applications. +- apps = g.inspect_list_applications(root) ++ try: ++ apps = g.inspect_list_applications(root) ++ except Exception: ++ logging.exception("%s: exception while listing apps (ignored)", ++ prettyvm) + + # Force the libguestfs handle to close right now. + del g diff --git a/ae8a4f3d-engine-Fix-first-run-startup-error.patch b/ae8a4f3d-engine-Fix-first-run-startup-error.patch new file mode 100644 index 00000000..ff73de32 --- /dev/null +++ b/ae8a4f3d-engine-Fix-first-run-startup-error.patch @@ -0,0 +1,30 @@ +Subject: engine: Fix first run startup error (bz 1674040) +From: Cole Robinson crobinso@redhat.com Fri Feb 8 15:50:15 2019 -0500 +Date: Fri Feb 8 15:50:15 2019 -0500: +Git: ae8a4f3db3c1492a219a0d6ec8d32c765ac076bd + +unitpath can be used uninitialized + +https://bugzilla.redhat.com/show_bug.cgi?id=1674040 + +diff --git a/virtManager/engine.py b/virtManager/engine.py +index bf422b36..492c67db 100644 +--- a/virtManager/engine.py ++++ b/virtManager/engine.py +@@ -135,6 +135,7 @@ class vmmEngine(vmmGObject): + unitname = "libvirtd.service" + libvirtd_installed = False + libvirtd_active = False ++ unitpath = None + + # Fetch all units from systemd + try: +@@ -165,7 +166,7 @@ class vmmEngine(vmmGObject): + + # If it's not running, try to start it + try: +- if units and libvirtd_installed and not libvirtd_active: ++ if unitpath and libvirtd_installed and not libvirtd_active: + unit = Gio.DBusProxy.new_sync( + bus, 0, None, + "org.freedesktop.systemd1", unitpath, diff --git a/f7508d02-addhardware-Fix-setting-optimal-default-net-model.patch b/f7508d02-addhardware-Fix-setting-optimal-default-net-model.patch new file mode 100644 index 00000000..e33400e9 --- /dev/null +++ b/f7508d02-addhardware-Fix-setting-optimal-default-net-model.patch @@ -0,0 +1,19 @@ +Subject: addhardware: Fix setting optimal default net model +From: Cole Robinson crobinso@redhat.com Sun Feb 3 19:47:20 2019 -0500 +Date: Sun Feb 3 19:47:54 2019 -0500: +Git: f7508d024d58e54f9da5e7c51f5b805db929b76f + +We were unconditionally reseting it to the first list entry + +diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py +index eaab8275..69161782 100644 +--- a/virtManager/addhardware.py ++++ b/virtManager/addhardware.py +@@ -327,7 +327,6 @@ class vmmAddHardware(vmmGObjectUI): + + netmodel = self.widget("net-model") + self.populate_network_model_combo(self.vm, netmodel) +- netmodel.set_active(0) + + + # Char parameters diff --git a/virt-manager.changes b/virt-manager.changes index 93d94600..078e99ee 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Feb 12 13:34:26 MST 2019 - carnold@suse.com + +- Upstream bug fixes (bsc#1027942) + f7508d02-addhardware-Fix-setting-optimal-default-net-model.patch + 1018ab44-inspection-handle-failures-in-application-listing.patch + ae8a4f3d-engine-Fix-first-run-startup-error.patch + ------------------------------------------------------------------- Mon Feb 4 10:16:11 MST 2019 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index 585e0ab2..5d47b610 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -32,6 +32,9 @@ Source1: virt-install.rb Source2: virt-install.desktop Source3: virt-manager-supportconfig # Upstream Patches +Patch1: f7508d02-addhardware-Fix-setting-optimal-default-net-model.patch +Patch2: 1018ab44-inspection-handle-failures-in-application-listing.patch +Patch3: ae8a4f3d-engine-Fix-first-run-startup-error.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -159,6 +162,9 @@ machine). %prep %setup -q # Upstream Patches +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 # SUSE Only %patch70 -p1 %patch71 -p1