pool/virt-manager
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bsc#1157144 - [s390][virt-manager] There was the black screen

Browse Source 
from guest graphical console during guest installation
  virtinst-s390x-disable-graphics.patch
- bsc#1158227 - virt-manager: Fix duplicate entries in the
  operating system URL drop down menu
  virtman-show-suse-install-repos.patch
- Drop virtman-default-to-xen-pv.patch
- Refreshed
  virtinst-add-pvh-support.patch
  virtinst-modify-gui-defaults.patch
  virt-manager.changes
  virt-manager.spec
  virtman-allow-creating-i686-vm.patch
  virtman-python2-to-python3-conversion.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=494
This commit is contained in:
Charles Arnold 2019-12-02 22:14:53 +00:00 committed by Git OBS Bridge
parent 38097ad9c3
commit 96ad550775
9 changed files with 80 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
virt-manager.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Mon Dec 2 14:03:00 MST 2019 - carnold@suse.com
- bsc#1157144 - [s390][virt-manager] There was the black screen
from guest graphical console during guest installation
virtinst-s390x-disable-graphics.patch
- bsc#1158227 - virt-manager: Fix duplicate entries in the
operating system URL drop down menu
virtman-show-suse-install-repos.patch
- Drop virtman-default-to-xen-pv.patch
- Refreshed
virtinst-add-pvh-support.patch
virtinst-modify-gui-defaults.patch
virt-manager.changes
virt-manager.spec
virtman-allow-creating-i686-vm.patch
virtman-python2-to-python3-conversion.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 27 14:53:06 MST 2019 - carnold@suse.com Wed Nov 27 14:53:06 MST 2019 - carnold@suse.com

2
virt-manager.spec
View File

@ -57,7 +57,6 @@ Patch76: virtinst-change-location-for-grub_xen.patch
Patch77: virtman-fix-env-script-interpreter.patch Patch77: virtman-fix-env-script-interpreter.patch
Patch78: virtinst-set-qemu-emulator.patch Patch78: virtinst-set-qemu-emulator.patch
# Features or Enhancements # Features or Enhancements
Patch102: virtman-default-to-xen-pv.patch
Patch103: virtman-load-stored-uris.patch Patch103: virtman-load-stored-uris.patch
Patch120: virtinst-default-xen-to-qcow2-format.patch Patch120: virtinst-default-xen-to-qcow2-format.patch
Patch121: virtinst-detect-oes-distros.patch Patch121: virtinst-detect-oes-distros.patch
@ -203,7 +202,6 @@ machine).
%patch77 -p1 %patch77 -p1
%patch78 -p1 %patch78 -p1
# Enhancements # Enhancements
%patch102 -p1
%patch103 -p1 %patch103 -p1
%patch120 -p1 %patch120 -p1
%patch121 -p1 %patch121 -p1

2
virtinst-add-pvh-support.patch
View File

@ -5,7 +5,7 @@ Index: virt-manager-2.2.1/virtManager/createvm.py
=================================================================== ===================================================================
--- virt-manager-2.2.1.orig/virtManager/createvm.py --- virt-manager-2.2.1.orig/virtManager/createvm.py
+++ virt-manager-2.2.1/virtManager/createvm.py +++ virt-manager-2.2.1/virtManager/createvm.py
@@ -796,6 +796,9 @@ class vmmCreateVM(vmmGObjectUI): @@ -792,6 +792,9 @@ class vmmCreateVM(vmmGObjectUI):
for guest in guests: for guest in guests:
if not guest.domains: if not guest.domains:
continue continue

8
virtinst-modify-gui-defaults.patch
View File

@ -1,11 +1,11 @@
Enhancement for the following GUI wizard installation option. Enhancement for the following GUI wizard installation option.
1) If Xen, leave 'Architecture options' expanded so users know PV 1) If Xen, leave 'Architecture options' expanded so users know PV
is the default is the default
Index: virt-manager-2.2.0/virtManager/createvm.py Index: virt-manager-2.2.1/virtManager/createvm.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/createvm.py --- virt-manager-2.2.1.orig/virtManager/createvm.py
+++ virt-manager-2.2.0/virtManager/createvm.py +++ virt-manager-2.2.1/virtManager/createvm.py
@@ -403,8 +403,20 @@ class vmmCreateVM(vmmGObjectUI): @@ -404,8 +404,20 @@ class vmmCreateVM(vmmGObjectUI):
self.widget("method-local").set_active(True) self.widget("method-local").set_active(True)
self.widget("create-conn").set_active(-1) self.widget("create-conn").set_active(-1)
activeconn = self._populate_conn_list(urihint) activeconn = self._populate_conn_list(urihint)

9
virtinst-s390x-disable-graphics.patch
View File

@ -34,12 +34,3 @@ Index: virt-manager-2.2.1/virtinst/guest.py
return return
if self.devices.video: if self.devices.video:
return return
@@ -931,7 +934,7 @@ class Guest(XMLBuilder):
return
if self.os.is_container() and not self.conn.is_vz():
return
- if self.os.arch not in ["x86_64", "i686", "ppc64", "ppc64le"]:
+ if self.os.arch not in ["x86_64", "i686", "ppc64", "ppc64le", "s390x"]:
return
self.add_device(DeviceGraphics(self.conn))

8
virtman-allow-creating-i686-vm.patch
View File

@ -1,11 +1,11 @@
References: bsc#919692 References: bsc#919692
Because openSUSE repos combine 32 and 64 bit sources we need to Because openSUSE repos combine 32 and 64 bit sources we need to
continue showing the 'Architecture' pop-up. continue showing the 'Architecture' pop-up.
Index: virt-manager-2.2.0/virtManager/createvm.py Index: virt-manager-2.2.1/virtManager/createvm.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/createvm.py --- virt-manager-2.2.1.orig/virtManager/createvm.py
+++ virt-manager-2.2.0/virtManager/createvm.py +++ virt-manager-2.2.1/virtManager/createvm.py
@@ -834,11 +834,6 @@ class vmmCreateVM(vmmGObjectUI): @@ -830,11 +830,6 @@ class vmmCreateVM(vmmGObjectUI):
for guest in self.conn.caps.guests: for guest in self.conn.caps.guests:
if guest.os_type == self._capsinfo.os_type: if guest.os_type == self._capsinfo.os_type:
archs.append(guest.arch) archs.append(guest.arch)

18
virtman-default-to-xen-pv.patch
View File

@ -1,18 +0,0 @@
Enhancement to default to PV instead of HVM on Xen host.
Index: virt-manager-2.2.0/virtManager/createvm.py
===================================================================
--- virt-manager-2.2.0.orig/virtManager/createvm.py
+++ virt-manager-2.2.0/virtManager/createvm.py
@@ -740,7 +740,12 @@ class vmmCreateVM(vmmGObjectUI):
if gtype is None:
# If none specified, prefer HVM so install options aren't limited
# with a default PV choice.
+ # If xen connection, favor PV installation
+ conn_is_xen = self.conn.is_xen()
for g in self.conn.caps.guests:
+ if conn_is_xen and g.os_type == "xen":
+ gtype = "xen"
+ break
if g.os_type == "hvm":
gtype = "hvm"
break

86
virtman-python2-to-python3-conversion.patch
View File

@ -1,7 +1,7 @@
Index: virt-manager-2.2.0/virt-manager Index: virt-manager-2.2.1/virt-manager
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virt-manager --- virt-manager-2.2.1.orig/virt-manager
+++ virt-manager-2.2.0/virt-manager +++ virt-manager-2.2.1/virt-manager
@@ -66,7 +66,7 @@ def _import_gtk(leftovers): @@ -66,7 +66,7 @@ def _import_gtk(leftovers):
print("gtk3 3.22.0 or later is required.") print("gtk3 3.22.0 or later is required.")
sys.exit(1) sys.exit(1)
@ -11,10 +11,10 @@ Index: virt-manager-2.2.0/virt-manager
# This will error if Gtk wasn't correctly initialized # This will error if Gtk wasn't correctly initialized
Gtk.Window() Gtk.Window()
else: else:
Index: virt-manager-2.2.0/virtManager/details/console.py Index: virt-manager-2.2.1/virtManager/details/console.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/details/console.py --- virt-manager-2.2.1.orig/virtManager/details/console.py
+++ virt-manager-2.2.0/virtManager/details/console.py +++ virt-manager-2.2.1/virtManager/details/console.py
@@ -21,7 +21,7 @@ from ..vmwindow import DETAILS_PAGE_CONS @@ -21,7 +21,7 @@ from ..vmwindow import DETAILS_PAGE_CONS
(_CONSOLE_PAGE_UNAVAILABLE, (_CONSOLE_PAGE_UNAVAILABLE,
_CONSOLE_PAGE_AUTHENTICATE, _CONSOLE_PAGE_AUTHENTICATE,
@ -24,10 +24,10 @@ Index: virt-manager-2.2.0/virtManager/details/console.py
class _TimedRevealer(vmmGObject): class _TimedRevealer(vmmGObject):
Index: virt-manager-2.2.0/virtManager/connection.py Index: virt-manager-2.2.1/virtManager/connection.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/connection.py --- virt-manager-2.2.1.orig/virtManager/connection.py
+++ virt-manager-2.2.0/virtManager/connection.py +++ virt-manager-2.2.1/virtManager/connection.py
@@ -159,7 +159,7 @@ class vmmConnection(vmmGObject): @@ -159,7 +159,7 @@ class vmmConnection(vmmGObject):
(_STATE_DISCONNECTED, (_STATE_DISCONNECTED,
@ -37,10 +37,10 @@ Index: virt-manager-2.2.0/virtManager/connection.py
def __init__(self, uri): def __init__(self, uri):
self._uri = uri self._uri = uri
Index: virt-manager-2.2.0/virtManager/addhardware.py Index: virt-manager-2.2.1/virtManager/addhardware.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/addhardware.py --- virt-manager-2.2.1.orig/virtManager/addhardware.py
+++ virt-manager-2.2.0/virtManager/addhardware.py +++ virt-manager-2.2.1/virtManager/addhardware.py
@@ -44,7 +44,7 @@ from .xmleditor import vmmXMLEditor @@ -44,7 +44,7 @@ from .xmleditor import vmmXMLEditor
PAGE_TPM, PAGE_TPM,
PAGE_RNG, PAGE_RNG,
@ -50,10 +50,10 @@ Index: virt-manager-2.2.0/virtManager/addhardware.py
def _build_combo(combo, values, default_value=None, sort=True): def _build_combo(combo, values, default_value=None, sort=True):
Index: virt-manager-2.2.0/virtManager/details/snapshots.py Index: virt-manager-2.2.1/virtManager/details/snapshots.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/details/snapshots.py --- virt-manager-2.2.1.orig/virtManager/details/snapshots.py
+++ virt-manager-2.2.0/virtManager/details/snapshots.py +++ virt-manager-2.2.1/virtManager/details/snapshots.py
@@ -55,7 +55,7 @@ def _make_screenshot_pixbuf(mime, sdata) @@ -55,7 +55,7 @@ def _make_screenshot_pixbuf(mime, sdata)
@ -63,10 +63,10 @@ Index: virt-manager-2.2.0/virtManager/details/snapshots.py
if val == m and not reverse: if val == m and not reverse:
return e return e
if val == e and reverse: if val == e and reverse:
Index: virt-manager-2.2.0/virtManager/engine.py Index: virt-manager-2.2.1/virtManager/engine.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/engine.py --- virt-manager-2.2.1.orig/virtManager/engine.py
+++ virt-manager-2.2.0/virtManager/engine.py +++ virt-manager-2.2.1/virtManager/engine.py
@@ -22,7 +22,7 @@ from .lib.inspection import vmmInspectio @@ -22,7 +22,7 @@ from .lib.inspection import vmmInspectio
from .systray import vmmSystray from .systray import vmmSystray
@ -76,10 +76,10 @@ Index: virt-manager-2.2.0/virtManager/engine.py
def _show_startup_error(fn): def _show_startup_error(fn):
Index: virt-manager-2.2.0/virtManager/device/mediacombo.py Index: virt-manager-2.2.1/virtManager/device/mediacombo.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/device/mediacombo.py --- virt-manager-2.2.1.orig/virtManager/device/mediacombo.py
+++ virt-manager-2.2.0/virtManager/device/mediacombo.py +++ virt-manager-2.2.1/virtManager/device/mediacombo.py
@@ -22,7 +22,7 @@ class vmmMediaCombo(vmmGObjectUI): @@ -22,7 +22,7 @@ class vmmMediaCombo(vmmGObjectUI):
(MEDIA_FIELD_PATH, (MEDIA_FIELD_PATH,
MEDIA_FIELD_LABEL, MEDIA_FIELD_LABEL,
@ -89,10 +89,10 @@ Index: virt-manager-2.2.0/virtManager/device/mediacombo.py
def __init__(self, conn, builder, topwin): def __init__(self, conn, builder, topwin):
vmmGObjectUI.__init__(self, None, None, builder=builder, topwin=topwin) vmmGObjectUI.__init__(self, None, None, builder=builder, topwin=topwin)
Index: virt-manager-2.2.0/virtManager/manager.py Index: virt-manager-2.2.1/virtManager/manager.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/manager.py --- virt-manager-2.2.1.orig/virtManager/manager.py
+++ virt-manager-2.2.0/virtManager/manager.py +++ virt-manager-2.2.1/virtManager/manager.py
@@ -33,7 +33,7 @@ ROW_IS_CONN_CONNECTED, @@ -33,7 +33,7 @@ ROW_IS_CONN_CONNECTED,
ROW_IS_VM, ROW_IS_VM,
ROW_IS_VM_RUNNING, ROW_IS_VM_RUNNING,
@ -111,10 +111,10 @@ Index: virt-manager-2.2.0/virtManager/manager.py
def _style_get_prop(widget, propname): def _style_get_prop(widget, propname):
Index: virt-manager-2.2.0/virtManager/device/addstorage.py Index: virt-manager-2.2.1/virtManager/device/addstorage.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/device/addstorage.py --- virt-manager-2.2.1.orig/virtManager/device/addstorage.py
+++ virt-manager-2.2.0/virtManager/device/addstorage.py +++ virt-manager-2.2.1/virtManager/device/addstorage.py
@@ -108,7 +108,7 @@ class vmmAddStorage(vmmGObjectUI): @@ -108,7 +108,7 @@ class vmmAddStorage(vmmGObjectUI):
errmsg = _("Errors were encountered changing permissions for the " errmsg = _("Errors were encountered changing permissions for the "
"following directories:") "following directories:")
@ -124,10 +124,10 @@ Index: virt-manager-2.2.0/virtManager/device/addstorage.py
if p not in broken_paths: if p not in broken_paths:
continue continue
details += "%s : %s\n" % (p, error) details += "%s : %s\n" % (p, error)
Index: virt-manager-2.2.0/virtManager/details/details.py Index: virt-manager-2.2.1/virtManager/details/details.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/details/details.py --- virt-manager-2.2.1.orig/virtManager/details/details.py
+++ virt-manager-2.2.0/virtManager/details/details.py +++ virt-manager-2.2.1/virtManager/details/details.py
@@ -104,7 +104,7 @@ from ..xmleditor import vmmXMLEditor @@ -104,7 +104,7 @@ from ..xmleditor import vmmXMLEditor
EDIT_FS, EDIT_FS,
@ -164,10 +164,10 @@ Index: virt-manager-2.2.0/virtManager/details/details.py
def _calculate_disk_bus_index(disklist): def _calculate_disk_bus_index(disklist):
Index: virt-manager-2.2.0/virtManager/createvm.py Index: virt-manager-2.2.1/virtManager/createvm.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/createvm.py --- virt-manager-2.2.1.orig/virtManager/createvm.py
+++ virt-manager-2.2.0/virtManager/createvm.py +++ virt-manager-2.2.1/virtManager/createvm.py
@@ -40,7 +40,7 @@ DEFAULT_MEM = 1024 @@ -40,7 +40,7 @@ DEFAULT_MEM = 1024
PAGE_INSTALL, PAGE_INSTALL,
PAGE_MEM, PAGE_MEM,
@ -193,7 +193,7 @@ Index: virt-manager-2.2.0/virtManager/createvm.py
##################### #####################
@@ -2127,7 +2127,7 @@ class vmmCreateVM(vmmGObjectUI): @@ -2123,7 +2123,7 @@ class vmmCreateVM(vmmGObjectUI):
'insecure': self._get_config_oscontainer_isecure, 'insecure': self._get_config_oscontainer_isecure,
'root_password': self._get_config_oscontainer_root_password, 'root_password': self._get_config_oscontainer_root_password,
} }
@ -202,10 +202,10 @@ Index: virt-manager-2.2.0/virtManager/createvm.py
bootstrap_args[key] = getter() bootstrap_args[key] = getter()
parentobj = self._customize_window or self parentobj = self._customize_window or self
Index: virt-manager-2.2.0/virtManager/preferences.py Index: virt-manager-2.2.1/virtManager/preferences.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/preferences.py --- virt-manager-2.2.1.orig/virtManager/preferences.py
+++ virt-manager-2.2.0/virtManager/preferences.py +++ virt-manager-2.2.1/virtManager/preferences.py
@@ -129,7 +129,7 @@ class vmmPreferences(vmmGObjectUI): @@ -129,7 +129,7 @@ class vmmPreferences(vmmGObjectUI):
} }
model.append([-1, _("System default (%s)") % model.append([-1, _("System default (%s)") %
@ -215,10 +215,10 @@ Index: virt-manager-2.2.0/virtManager/preferences.py
model.append([key, val]) model.append([key, val])
combo.set_model(model) combo.set_model(model)
uiutil.init_combo_text_column(combo, 1) uiutil.init_combo_text_column(combo, 1)
Index: virt-manager-2.2.0/virtManager/migrate.py Index: virt-manager-2.2.1/virtManager/migrate.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/migrate.py --- virt-manager-2.2.1.orig/virtManager/migrate.py
+++ virt-manager-2.2.0/virtManager/migrate.py +++ virt-manager-2.2.1/virtManager/migrate.py
@@ -23,7 +23,7 @@ from .object.domain import vmmDomain @@ -23,7 +23,7 @@ from .object.domain import vmmDomain
NUM_COLS = 3 NUM_COLS = 3
(COL_LABEL, (COL_LABEL,
@ -228,10 +228,10 @@ Index: virt-manager-2.2.0/virtManager/migrate.py
class vmmMigrateDialog(vmmGObjectUI): class vmmMigrateDialog(vmmGObjectUI):
Index: virt-manager-2.2.0/virtManager/hoststorage.py Index: virt-manager-2.2.1/virtManager/hoststorage.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/hoststorage.py --- virt-manager-2.2.1.orig/virtManager/hoststorage.py
+++ virt-manager-2.2.0/virtManager/hoststorage.py +++ virt-manager-2.2.1/virtManager/hoststorage.py
@@ -32,13 +32,13 @@ VOL_NUM_COLUMNS = 7 @@ -32,13 +32,13 @@ VOL_NUM_COLUMNS = 7
VOL_COLUMN_SIZESTR, VOL_COLUMN_SIZESTR,
VOL_COLUMN_FORMAT, VOL_COLUMN_FORMAT,

19
virtman-show-suse-install-repos.patch
View File

@ -1,11 +1,11 @@
Enhancement that gets installation repos from zypper. Enhancement that gets installation repos from zypper.
These locations are then presented as potential installation These locations are then presented as potential installation
sources when creating a VM. sources when creating a VM.
Index: virt-manager-2.2.0/virtManager/createvm.py Index: virt-manager-2.2.1/virtManager/createvm.py
=================================================================== ===================================================================
--- virt-manager-2.2.0.orig/virtManager/createvm.py --- virt-manager-2.2.1.orig/virtManager/createvm.py
+++ virt-manager-2.2.0/virtManager/createvm.py +++ virt-manager-2.2.1/virtManager/createvm.py
@@ -99,6 +99,69 @@ def is_virt_bootstrap_installed(): @@ -99,6 +99,70 @@ def is_virt_bootstrap_installed():
return pkgutil.find_loader('virtBootstrap') is not None return pkgutil.find_loader('virtBootstrap') is not None
@ -56,10 +56,11 @@ Index: virt-manager-2.2.0/virtManager/createvm.py
+ if len(repo) >= uri_index: + if len(repo) >= uri_index:
+ str = repo[uri_index] + str = repo[uri_index]
+ if str.startswith('ftp://') or str.startswith('http://') or str.startswith('nfs://') or str.startswith('smb://'): + if str.startswith('ftp://') or str.startswith('http://') or str.startswith('nfs://') or str.startswith('smb://'):
+ zypper_output.append(str) + if str not in zypper_output:
+ if dom0_inst_source is not None and str == dom0_inst_source: + zypper_output.append(str)
+ index_dom0 = number_of_sources + if dom0_inst_source is not None and str == dom0_inst_source:
+ number_of_sources += 1 + index_dom0 = number_of_sources
+ number_of_sources += 1
+ +
+ if index_dom0 == -1 and dom0_inst_source: + if index_dom0 == -1 and dom0_inst_source:
+ index_dom0 = 0 + index_dom0 = 0
@ -75,7 +76,7 @@ Index: virt-manager-2.2.0/virtManager/createvm.py
############## ##############
# Main class # # Main class #
############## ##############
@@ -368,7 +431,13 @@ class vmmCreateVM(vmmGObjectUI): @@ -368,7 +432,13 @@ class vmmCreateVM(vmmGObjectUI):
self.widget("install-url-entry").set_text("") self.widget("install-url-entry").set_text("")
self.widget("install-url-options").set_expanded(False) self.widget("install-url-options").set_expanded(False)
urlmodel = self.widget("install-url-combo").get_model() urlmodel = self.widget("install-url-combo").get_model()