4ad8024558
* SPICE support (requires spice-gtk) (Marc-André Lureau)
* Option to configure CPU model
* Option to configure CPU topology
* Save and migration cancellation (Wen Congyang)
* Save and migration progress reporting
* Option to enable bios boot menu
* Option to configure direct kernel/initrd boot
- Update to virtinst 0.500.5
* New virt-install --cpu option for configuring CPU
model/features
* virt-install --vcpus option can not specify topology and
maxvcpus
* New virt-install --graphics option to unify --vnc, --sdl,
spice config
* New virt-install --print-xml option to skip install and print
XML
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=48
85 lines
3.8 KiB
Diff
85 lines
3.8 KiB
Diff
Index: virt-manager-0.8.6/src/virtManager/engine.py
|
|
===================================================================
|
|
--- virt-manager-0.8.6.orig/src/virtManager/engine.py
|
|
+++ virt-manager-0.8.6/src/virtManager/engine.py
|
|
@@ -41,7 +41,6 @@ from virtManager.manager import vmmManag
|
|
from virtManager.migrate import vmmMigrateDialog
|
|
from virtManager.details import vmmDetails
|
|
from virtManager.asyncjob import vmmAsyncJob
|
|
-from virtManager.create import vmmCreate
|
|
from virtManager.host import vmmHost
|
|
from virtManager.error import vmmErrorDialog
|
|
from virtManager.systray import vmmSystray
|
|
@@ -702,12 +701,45 @@ class vmmEngine(vmmGObject):
|
|
self.windowCreate = obj
|
|
return self.windowCreate
|
|
|
|
+ def _vmmcreate_closing(self,signal,key):
|
|
+ self.windowCreate = None
|
|
+
|
|
def _do_show_create(self, src, uri):
|
|
- try:
|
|
- self._get_create_dialog().show(uri)
|
|
- except Exception, e:
|
|
- src.err.show_err(_("Error launching manager: %s") % str(e),
|
|
- "".join(traceback.format_exc()))
|
|
+ conn = self._lookup_connection(uri)
|
|
+ do_remote = conn.is_remote()
|
|
+ if self.windowCreate == None or do_remote != self.remote_install:
|
|
+ try:
|
|
+ if do_remote:
|
|
+ from virtManager.create import vmmCreate
|
|
+ create = vmmCreate(self)
|
|
+ create.connect("action-show-console", self._do_show_console)
|
|
+ create.connect("action-show-help", self._do_show_help)
|
|
+ create.connect("vmmcreate-closing", self._vmmcreate_closing)
|
|
+ self.remote_install = True
|
|
+ self.windowCreate = create
|
|
+ self.windowCreate.show(uri)
|
|
+ else:
|
|
+ from vminstall.gtk.interface import VMCreate as vmmCreate
|
|
+ create = vmmCreate(virtman=True,key=0)
|
|
+ create.connect("action-show-console", self._do_show_console)
|
|
+ create.connect("vmmcreate-closing", self._vmmcreate_closing)
|
|
+ self.remote_install = False
|
|
+ self.windowCreate = create
|
|
+ self.windowCreate.show()
|
|
+ except Exception, e:
|
|
+ src.err.show_err(_("Error launching manager: %s") % str(e),
|
|
+ "".join(traceback.format_exc()))
|
|
+ else:
|
|
+ if do_remote:
|
|
+ self.windowCreate.show(uri)
|
|
+ else:
|
|
+ message_box = gtk.MessageDialog(None,
|
|
+ gtk.DIALOG_MODAL,
|
|
+ gtk.MESSAGE_WARNING,
|
|
+ gtk.BUTTONS_OK,
|
|
+ _("A new installation is already in progress.\n\nUse the YaST \"Create Virtual Machines\" utility for concurrent installations."))
|
|
+ message_box.run()
|
|
+ message_box.destroy()
|
|
|
|
def _do_show_migrate(self, src, uri, uuid):
|
|
try:
|
|
Index: virt-manager-0.8.6/src/virtManager/create.py
|
|
===================================================================
|
|
--- virt-manager-0.8.6.orig/src/virtManager/create.py
|
|
+++ virt-manager-0.8.6/src/virtManager/create.py
|
|
@@ -63,6 +63,8 @@ class vmmCreate(vmmGObjectUI):
|
|
gobject.TYPE_NONE, (str, str)),
|
|
"action-show-help": (gobject.SIGNAL_RUN_FIRST,
|
|
gobject.TYPE_NONE, [str]),
|
|
+ "vmmcreate-closing": (gobject.SIGNAL_RUN_FIRST,
|
|
+ gobject.TYPE_NONE, (int,)),
|
|
}
|
|
|
|
def __init__(self, engine):
|
|
@@ -148,6 +150,7 @@ class vmmCreate(vmmGObjectUI):
|
|
self.topwin.present()
|
|
|
|
def close(self, ignore1=None, ignore2=None):
|
|
+ self.emit('vmmcreate-closing', 0)
|
|
self.topwin.hide()
|
|
self.remove_timers()
|
|
|