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

- bnc#888173 - KVM: Unable to install: no console output from

Browse Source 
virt-install
  virtman-s390x-default-to-vminstall.patch

- bnc#890350 - Can't create virtual networks through virt-manager
  53ad17e6-createnet-fix-a-small-pylint.patch

- Upstream bug fix
  53ce11d1-honor-untoggled-set-fixed-MAC-address.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=192
This commit is contained in:
Charles Arnold 2014-08-11 21:36:23 +00:00 committed by Git OBS Bridge
parent 92d0e93e9f
commit f511ebe400
8 changed files with 167 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
53ac1f8d-fix-show_err-typo.patch
View File

@ -11,7 +11,7 @@ Index: virt-manager-1.0.1/virtManager/createnet.py
===================================================================
--- virt-manager-1.0.1.orig/virtManager/createnet.py
+++ virt-manager-1.0.1/virtManager/createnet.py
@@ -752,7 +752,7 @@ class vmmCreateNetwork(vmmGObjectUI):
@@ -749,7 +749,7 @@ class vmmCreateNetwork(vmmGObjectUI):
try:
net = self._build_xmlobj()
except Exception, e:

25
53ad17e6-createnet-fix-a-small-pylint.patch Normal file
View File

@ -0,0 +1,25 @@
Subject: createnet: fix a small pylint
From: Chen Hanxiao chenhanxiao@cn.fujitsu.com Fri Jun 27 11:10:54 2014 +0800
Date: Fri Jun 27 09:06:14 2014 +0200:
Git: 658c9500a96a3d2ab862811f9827409c17c2232f
commit f109b1ed6fc93c1c74675d047affc0fe57ae7243
used a undefined variable 'PAGE_MAX'.
It looks like it should be in a developing series,
but should be fixed in upstream.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Index: virt-manager-1.0.1/virtManager/createnet.py
===================================================================
--- virt-manager-1.0.1.orig/virtManager/createnet.py
+++ virt-manager-1.0.1/virtManager/createnet.py
@@ -39,6 +39,8 @@ PAGE_IPV4,
PAGE_IPV6,
PAGE_MISC) = range(4)
+PAGE_MAX = PAGE_MISC
+
_green = Gdk.Color.parse("#c0ffc0")[1]
_red = Gdk.Color.parse("#ffc0c0")[1]
_black = Gdk.Color.parse("#000000")[1]

24
53ce11d1-honor-untoggled-set-fixed-MAC-address.patch Normal file
View File

@ -0,0 +1,24 @@
Subject: virt-manager, create: honor untoggled "Set a fixed MAC address"
From: Giuseppe Scrivano gscrivan@redhat.com Mon Jul 21 11:28:28 2014 +0200
Date: Tue Jul 22 09:25:05 2014 +0200:
Git: 312b349fceffec38dd04aa35d053b082fe698f3a
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1083461
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Index: virt-manager-1.0.1/virtManager/create.py
===================================================================
--- virt-manager-1.0.1.orig/virtManager/create.py
+++ virt-manager-1.0.1/virtManager/create.py
@@ -1674,7 +1674,9 @@ class vmmCreate(vmmGObjectUI):
if not self.validate_storage_page():
return False
- macaddr = self.widget("config-macaddr").get_text().strip()
+ macaddr = None
+ if self.widget("config-macaddr").get_sensitive():
+ macaddr = self.widget("config-macaddr").get_text().strip()
nettype = self.netlist.get_network_selection()[0]
if nettype is None:

19
virt-manager.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Mon Aug 11 15:27:41 MDT 2014 - carnold@suse.com
- bnc#888173 - KVM: Unable to install: no console output from
virt-install
virtman-s390x-default-to-vminstall.patch
-------------------------------------------------------------------
Tue Aug 5 06:33:38 UTC 2014 - cyliu@suse.com
- bnc#890350 - Can't create virtual networks through virt-manager
53ad17e6-createnet-fix-a-small-pylint.patch
-------------------------------------------------------------------
Tue Jul 25 16:36:11 MDT 2014 - carnold@suse.com
- Upstream bug fix
53ce11d1-honor-untoggled-set-fixed-MAC-address.patch
-------------------------------------------------------------------
Tue Jul 22 16:36:11 MDT 2014 - carnold@suse.com

25
virt-manager.spec
View File

@ -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"
@ -27,7 +28,7 @@
Name: virt-manager
Version: 1.0.1
Release: 10.5
Release: 0
Summary: Virtual Machine Manager
License: GPL-2.0+
Group: System/Monitoring
@ -75,14 +76,16 @@ Patch37: 5397b647-createnet-enable-specifying-29-subnet.patch
Patch38: 539e8cca-createpool-fix-creation-of-gluster-pools.patch
Patch39: 53a05e73-fix-edit-maxvcpus.patch
Patch40: 53a995cb-fix-usb-storage-removable-syntax.patch
Patch41: 53ac1f8d-createnet-validate-last-page-before-creating-network.patch
Patch42: 53ac1f8d-fix-show_err-typo.patch
Patch43: 53b39a13-dont-create-disk-images-world-readable-executable.patch
Patch44: 53b409bc-add-keep-alive-method-and-connection-check.patch
Patch45: 53b409bd-console-prevent-access-to-deleted-objects.patch
Patch46: 53b728c6-report-error-during-connection-bring-up.patch
Patch47: 53b728c6-connection-handle-unsupported-KeepAlive.patch
Patch48: 53bb1995-network-refresh-XML-definition-on-state-update.patch
Patch41: 53ac1f8d-fix-show_err-typo.patch
Patch42: 53ac1f8d-createnet-validate-last-page-before-creating-network.patch
Patch43: 53ad17e6-createnet-fix-a-small-pylint.patch
Patch44: 53b39a13-dont-create-disk-images-world-readable-executable.patch
Patch45: 53b409bc-add-keep-alive-method-and-connection-check.patch
Patch46: 53b409bd-console-prevent-access-to-deleted-objects.patch
Patch47: 53b728c6-report-error-during-connection-bring-up.patch
Patch48: 53b728c6-connection-handle-unsupported-KeepAlive.patch
Patch49: 53bb1995-network-refresh-XML-definition-on-state-update.patch
Patch50: 53ce11d1-honor-untoggled-set-fixed-MAC-address.patch
Patch70: virtman-desktop.patch
Patch71: virtman-cdrom.patch
Patch72: virtman-kvm.patch
@ -105,6 +108,7 @@ Patch91: virtman-default-lxc-uri.patch
Patch92: virtman-add-connect-default.patch
Patch93: virtman-dont-allow-grub.xen-to-be-deleted.patch
Patch94: virtman-check-for-empty-network-name.patch
Patch95: virtman-s390x-default-to-vminstall.patch
Patch151: virtinst-storage-ocfs2.patch
Patch152: virtinst-supported-disk-formats.patch
Patch153: virtinst-support-suse-distros.patch
@ -256,6 +260,8 @@ machine).
%patch46 -p1
%patch47 -p1
%patch48 -p1
%patch49 -p1
%patch50 -p1
%patch70 -p1
%patch71 -p1
%patch72 -p1
@ -278,6 +284,7 @@ machine).
%patch92 -p1
%patch93 -p1
%patch94 -p1
%patch95 -p1
%patch151 -p1
%patch152 -p1
%patch153 -p1

2
virtman-autoyast-support.patch
View File

@ -49,7 +49,7 @@ Index: virt-manager-1.0.1/virtManager/create.py
if extraargs:
self.guest.installer.extraargs = extraargs
@@ -1990,6 +2016,7 @@ class vmmCreate(vmmGObjectUI):
@@ -1992,6 +2018,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)

2
virtman-check-for-empty-network-name.patch
View File

@ -4,7 +4,7 @@ Index: virt-manager-1.0.1/virtManager/createnet.py
===================================================================
--- virt-manager-1.0.1.orig/virtManager/createnet.py
+++ virt-manager-1.0.1/virtManager/createnet.py
@@ -251,6 +251,8 @@ class vmmCreateNetwork(vmmGObjectUI):
@@ -253,6 +253,8 @@ class vmmCreateNetwork(vmmGObjectUI):
try:
net = self._build_xmlstub()
net.name = self.widget("net-name").get_text()

80
virtman-s390x-default-to-vminstall.patch Normal file
View File

@ -0,0 +1,80 @@
Index: virt-manager-1.0.1/virtManager/engine.py
===================================================================
--- virt-manager-1.0.1.orig/virtManager/engine.py
+++ virt-manager-1.0.1/virtManager/engine.py
@@ -30,6 +30,7 @@ import re
import Queue
import threading
import traceback
+import platform
from subprocess import *
import libvirt
@@ -854,7 +855,7 @@ class vmmEngine(vmmGObject):
obj.connect("action-clone-domain", self._do_show_clone)
obj.connect("action-show-domain", self._do_show_vm)
obj.connect("action-show-preferences", self._do_show_preferences)
- obj.connect("action-show-create", self._do_show_create)
+ obj.connect("action-show-create", self._do_show_create_virtinstall)
obj.connect("action-show-create-vminstall", self._do_show_create_vminstall)
obj.connect("action-show-about", self._do_show_about)
obj.connect("action-show-host", self._do_show_host)
@@ -900,7 +901,20 @@ class vmmEngine(vmmGObject):
self.windowCreate = None
def _do_show_create_vminstall(self, src, uri):
- self._do_show_create(src, uri, True)
+ # When pop-down menu is selected
+ if platform.machine() == "s390x":
+ # For s390, the pop-down is virt-install
+ self._do_show_create(src, uri, False)
+ else:
+ self._do_show_create(src, uri, True)
+
+ def _do_show_create_virtinstall(self, src, uri):
+ # When 'Create a new virtual machine' button is selected
+ if platform.machine() == "s390x":
+ # For s390, the button is vm-install
+ self._do_show_create(src, uri, True)
+ else:
+ self._do_show_create(src, uri, False)
def _do_show_create(self, src, uri, use_vminstall=False):
if uri is None:
@@ -984,7 +998,10 @@ class vmmEngine(vmmGObject):
def show_domain_creator(self, uri):
self.show_manager()
- self._do_show_create(self.get_manager(), uri)
+ if platform.machine() == "s390x":
+ self._do_show_create(self.get_manager(), uri, True)
+ else:
+ self._do_show_create(self.get_manager(), uri, False)
def show_domain_console(self, uri, uuid):
self.idle_add(self._show_vm_helper, self.get_manager(), uri, uuid,
Index: virt-manager-1.0.1/virtManager/vmmenu.py
===================================================================
--- virt-manager-1.0.1.orig/virtManager/vmmenu.py
+++ virt-manager-1.0.1/virtManager/vmmenu.py
@@ -23,6 +23,7 @@ from gi.repository import Gtk
# pylint: enable=E0611
from virtManager import config
+import platform
####################################################################
# Build toolbar new button menu (manager and details toolbar) #
@@ -35,8 +36,10 @@ def build_new_button_menu(widget, vminst
widget.set_menu(menu)
vminstallimg = Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.MENU)
-
- vminstall = Gtk.ImageMenuItem.new_with_mnemonic(_("_Vm-install"))
+ if platform.machine() == "s390x":
+ vminstall = Gtk.ImageMenuItem.new_with_mnemonic(_("_Virt-install"))
+ else:
+ vminstall = Gtk.ImageMenuItem.new_with_mnemonic(_("_Vm-install"))
vminstall.set_image(vminstallimg)
vminstall.show()
vminstall.connect("activate", vminstall_cb)