Hello community,
here is the log from the commit of package virt-manager for openSUSE:12.2 checked in at 2012-07-23 12:10:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/virt-manager (Old)
and /work/SRC/openSUSE:12.2/.virt-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager", Maintainer is "CARNOLD@suse.com"
Changes:
--------
New Changes file:
--- /dev/null 2012-07-06 19:40:38.919402255 +0200
+++ /work/SRC/openSUSE:12.2/.virt-manager.new/virt-manager.changes 2012-07-23 12:10:04.000000000 +0200
@@ -0,0 +1,899 @@
+-------------------------------------------------------------------
+Fri Jul 13 11:20:18 MDT 2012 - carnold@novell.com
+
+- Update to virt-manager 0.9.3
+ * Convert to gtkbuilder: UI can now be editted with modern glade tool
+ * virt-manager no longer runs on RHEL5, but can manage a remote RHEL5 host
+ * Option to configure spapr net and disk devices for pseries (Li Zhang)
+ * Many bug fixes and improvements
+
+-------------------------------------------------------------------
+Mon Jun 25 11:52:50 MDT 2012 - carnold@novell.com
+
+- bnc#768660 - virt-manager complains about missing SuSEconfig.gtk2
+ virt-manager.spec
+
+-------------------------------------------------------------------
+Fri Apr 27 17:03:48 UTC 2012 - reddwarf@opensuse.org
+
+- Recommend python-SpiceClientGtk
+
+-------------------------------------------------------------------
+Thu Mar 29 22:19:44 UTC 2012 - berendt@b1-systems.de
+
+- added missing requirements python-gobject, python-gtk,
+ python-gconf and xorg-x11-fonts
+
+-------------------------------------------------------------------
+Mon Mar 5 08:26:17 MST 2012 - carnold@novell.com
+
+- Previous commit should just be Requires: python-gconf
+
+-------------------------------------------------------------------
+Wed Feb 22 13:55:44 MST 2012 - carnold@novell.com
+
+- bnc#732617 - virt-manager does not start when python-virtinst is
+ installed
+
+-------------------------------------------------------------------
+Thu Feb 16 06:42:21 MST 2012 - carnold@novell.com
+
+- bnc#745221 - virt-manager should require python-gconf
+ Requires: python2-gconf >= 1.99.11-7
+
+-------------------------------------------------------------------
+Fri Feb 3 12:54:27 MST 2012 - carnold@novell.com
+
+- Remove the virt-install sources from the virt-manager package.
+ The virt-install applications are now found in python-virtinst.
+
+-------------------------------------------------------------------
+Fri Feb 3 05:49:34 MST 2012 - carnold@novell.com
+
+- Update to virt-manager 0.9.1
+ * Support for adding usb redirection devices (Marc-André Lureau)
+ * Option to switch usb controller to support usb2.0 (Marc-André Lureau)
+ * Option to specify machine type for non-x86 guests (Li Zhang)
+ * Support for filesystem device type and write policy (Deepak C Shetty)
+ * Many bug fixes!
+- Update to virtinst 0.600.1
+ * virt-install: --redir option for usb redirection (Marc-André Lureau)
+ * virt-install: Advanced --controller support for usb2 (Marc-André Lureau)
+ * Many bug fixes and minor improvments.
+
+-------------------------------------------------------------------
+Thu Jan 5 14:51:48 MST 2012 - carnold@novell.com
+
+- Two spec file changes. Update version of libvirt required.
+ Added a Provides on python-virtinst.
+
+-------------------------------------------------------------------
+Thu Jan 5 10:55:44 MST 2012 - carnold@novell.com
+
+- console: Fix hang when reconnecting to remote VNC console
+ virtman-git-reconnect.diff
+- KVM: Enable support for SATA bus option
+ virtman-git-sata-support.diff
+ virtinst-git-sata-support.diff
+
+-------------------------------------------------------------------
+Mon Dec 5 11:38:54 MST 2011 - carnold@novell.com
+
+- bnc#731218 - Xen guest consoles started from the virt manager
+ have slow mouse response in the guest
+ virtman-reverse-git-tooltip.patch
+
+-------------------------------------------------------------------
+Mon Nov 7 16:27:15 MST 2011 - carnold@novell.com
+
+- bnc#727662 - Error polling connection 'qemu:///system' with guest
+ init 0
+ virtman-update-backend.diff
+
+-------------------------------------------------------------------
+Fri Nov 4 16:16:51 MDT 2011 - carnold@novell.com
+
+- Update to latest upstream git version for various bug fixes
+ virtmanager: a712a7b32e6d7b7d9d53561b3ed2078190191560
+ virtinst: 15d4901a3c8b855838931976e023158b8cda1c37
+
+-------------------------------------------------------------------
+Fri Oct 28 10:19:43 MDT 2011 - carnold@novell.com
+
+- Upstream bug fixes
+ virtinst-git-mac-prefix.diff
+ virtman-git-error-reporting.diff
+ virtman-git-explicit-python.diff
+
+-------------------------------------------------------------------
+Wed Oct 12 11:50:03 MDT 2011 - carnold@novell.com
+
+- Fix broken define in virtinst-qed.diff
+
+-------------------------------------------------------------------
+Wed Oct 5 15:54:30 MDT 2011 - carnold@novell.com
+
+- Enforce dependency on vm-install version 0.5.6
+
+-------------------------------------------------------------------
+Thu Sep 29 13:16:35 MDT 2011 - carnold@novell.com
+
+- bnc#722524 - [SLES11SP2Beta6] virt-manager fails to change the
+ device model for the NICs from default to virtio (kvm)
+- bnc#683667 - On KVM, virt-manager incorrectly writed duplicated
+ device information into guest's configuration file
+ (/etc/libvirt/qemu/DOMNAME.xml)
+ virt-manager version 0.9.0
+
+-------------------------------------------------------------------
+Tue Sep 27 12:01:53 MDT 2011 - carnold@novell.com
+
+- Fix broken vminstall patch
+ virtman-vminstall.diff
+
+-------------------------------------------------------------------
+Wed Sep 21 11:29:17 MDT 2011 - carnold@novell.com
+
+- KVM: Add missing qed support to virtinst
+
+-------------------------------------------------------------------
+Wed Sep 21 09:40:09 MDT 2011 - carnold@novell.com
+
+- Upstream bug fixes
+ virtman-netstats-fix.diff
+ virtman-finish-button-fix.diff
+ virtman-shutoff-fix.diff
+ virtman-set-has-window-fix.diff
+ virtman-grep-fix.diff
+ virtman-no-cd-present-fix.diff
+ virtman-resize-menu-fix.diff
+ virtman-vcpu-count-fix.diff
+ virtman-storage-pool-fix.diff
+ virtman-domain-name-fix.diff
+ virtman-unapplied-changes-fix.diff
+ virtman-details-fix.diff
+ virtman-delete-fix.diff
+ virtman-collidelist-fix.diff
+ virtman-char-device-mode-fix.diff
+ virtinst-hv-version-fix.diff
+ virtinst-initrd-inject-fix.diff
+ virtinst-initrd-inject2-fix.diff
+ virtinst-no-volume-fix.diff
+ virtinst-prompts-fix.diff
+ virtinst-cpu-model-name-fix.diff
+ virtinst-xml-clear-fix.diff
+ virtinst-remote-storage-fix.diff
+ virtinst-error-message-fix.diff
+ virtinst-typo-fix.diff
+ virtinst-cdrom.diff
+ virtinst-storage-ocfs2.diff
+
+-------------------------------------------------------------------
+Tue Sep 20 09:05:19 MDT 2011 - carnold@novell.com
+
+- bnc#718861 - [SLES11SP2beta5] virt-manager unable to boot
+ Windows2008 guest with virtio disk and network device (kvm)
+- Update to virt-manager 0.9.0
+ * Use a hiding toolbar for fullscreen mode
+ * Use libguestfs to show guest packagelist and more (Richard W.M. Jones)
+ * Basic 'New VM' wizard support for LXC guests
+ * Remote serial console access (with latest libvirt)
+ * Remote URL guest installs (with latest libvirt)
+ * Add Hardware: Support <filesystem> devices
+ * Add Hardware: Support <smartcard> devices (Marc-André Lureau)
+ * Enable direct interface selection for qemu/kvm (Gerhard Stenzel)
+ * Allow viewing and changing disk serial number
+- Update to virtinst 0.600.0
+ * virt-install: Various improvements to enable LXC/container guests:
+ * New --filesystem option for <filesystem> devices
+ * New --init option for container <init> path
+ * New --container option (similar to --paravirt or --hvm)
+ * virt-install: Make --location remotely (with latest libvirt)
+ * virt-install: New --smartcard option for <smartcard> devices
+ * (Marc-André Lureau)
+ * virt-install: New --numatune option for building guest <numatune> XML
+ * virt-install: option to set --disk error_policy=
+ * virt-install: option to set --disk serial=
+
++++ 702 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.2/.virt-manager.new/virt-manager.changes
Old:
----
_link
New:
----
virt-manager-0.9.3.tar.bz2
virt-manager.changes
virt-manager.spec
virtman-autoconnect.diff
virtman-autorestart.diff
virtman-cdrom.diff
virtman-desktop.diff
virtman-device-flags.diff
virtman-eepro100.diff
virtman-keycombo.diff
virtman-kvm.diff
virtman-qed.diff
virtman-slow-mouse.diff
virtman-storage-pool.diff
virtman-update-backend.diff
virtman-vminstall.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-manager.spec ++++++
#
# spec file for package virt-manager
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define gsysconfdir /etc
%define gconftool /usr/bin/gconftool-2
%define virtinst_maj 0
%define virtinst_min 600
%define virtinst_rel 2
%define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
%define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()")
Name: virt-manager
Summary: Virtual Machine Manager
License: GPL-2.0+
Group: System/Monitoring
Version: 0.9.3
Release: 0
Url: http://virt-manager.et.redhat.com
Source0: virt-manager-%{version}.tar.bz2
Patch50: virtman-desktop.diff
Patch51: virtman-vminstall.diff
Patch52: virtman-cdrom.diff
Patch53: virtman-kvm.diff
Patch54: virtman-keycombo.diff
Patch55: virtman-autoconnect.diff
Patch60: virtman-device-flags.diff
Patch61: virtman-autorestart.diff
Patch62: virtman-storage-pool.diff
Patch63: virtman-eepro100.diff
Patch64: virtman-qed.diff
Patch65: virtman-update-backend.diff
Patch66: virtman-slow-mouse.diff
ExclusiveArch: %{ix86} x86_64
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
#
BuildRequires: desktop-file-utils
BuildRequires: gconf2-devel
BuildRequires: gettext
BuildRequires: hicolor-icon-theme
BuildRequires: intltool
BuildRequires: scrollkeeper
BuildRequires: update-desktop-files
Requires: dbus-1-python
Requires: dbus-1-x11
Requires: gnome-keyring
Requires: libvirt-python >= 0.7.0
Requires: libxml2-python >= 2.6.23
Requires: vm-install >= 0.5.6
%ifarch x86_64
Requires: vtemodule.so()(64bit)
%else
Requires: vtemodule.so
%endif
Requires: librsvg
Requires: netcat-openbsd
Requires: scrollkeeper
Requires: python-gtk-vnc
Requires: python-urlgrabber
Requires: python-gconf
Requires: python-gobject2
Requires: python-gtk
Requires: python-virtinst == %{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
Requires: xorg-x11-fonts
Recommends: python-SpiceClientGtk
%description
Virtual Machine Manager provides a graphical tool for administering virtual
machines for KVM, Xen, and QEmu. Start, stop, add or remove virtual devices,
connect to a graphical or serial console, and see resource usage statistics
for existing VMs on local or remote machines. Uses libvirt as the backend
management API.
Authors:
--------
Daniel Berrange
Hugh O. Brock
Jeremy Katz
%prep
%setup -q
%patch50 -p1
%patch51 -p1
%patch52 -p1
%patch53 -p1
%patch54 -p1
%patch55 -p1
%patch60 -p1
%patch61 -p1
#%patch62 -p1
%patch63 -p1
%patch64 -p1
%patch65 -p1
%patch66 -p1
%build
# autoreconf -i
%configure --sysconfdir=%{gsysconfdir}
make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
# Unsupport languages:
rm -rf $RPM_BUILD_ROOT/usr/share/locale/or
%find_gconf_schemas
for lang_file in %{name}
do
%find_lang $lang_file single_lang_file.lang
done
cat %{name}.schemas_list single_lang_file.lang > %{name}.lst
sed -i '\^/usr/share/gnome/help/^d' %{name}.lst
%suse_update_desktop_file %{name} X-SuSE-YaST-Virtualization
sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;/' $RPM_BUILD_ROOT/%{_datadir}/applications/YaST2/%{name}.desktop
%clean
# rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
%post
%if 0%{?suse_version} < 1140
%run_suseconfig -m glib2
%run_suseconfig -m gtk2
%else
%desktop_database_post
%icon_theme_cache_post
%endif
%postun
%if 0%{?suse_version} > 1130
%desktop_database_postun
%icon_theme_cache_postun
%endif
%preun -f %{name}.schemas_preun
%posttrans -f %{name}.schemas_posttrans
%files -f %{name}.lst
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog
%{_bindir}/%{name}
%{_bindir}/%{name}-tui
%{_libexecdir}/%{name}-launch
%dir %{_datadir}/%{name}
#%{_datadir}/%{name}/*.glade
%dir %{_datadir}/%{name}/pixmaps
%dir %{_datadir}/%{name}/icons
%dir %{_datadir}/%{name}/icons/hicolor/
%dir %{_datadir}/%{name}/icons/hicolor/*/
%dir %{_datadir}/%{name}/icons/hicolor/*/*/
%dir %{_datadir}/icons/hicolor/
%dir %{_datadir}/icons/hicolor/*/
%dir %{_datadir}/icons/hicolor/*/*/
%{_datadir}/%{name}/icons/hicolor/*/*/*.png
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/%{name}/*.py
%{_datadir}/%{name}/*.ui
%dir %{_datadir}/%{name}/virtManager
%dir %{_datadir}/%{name}/virtManagerTui
%dir %{_datadir}/%{name}/virtManagerTui/importblacklist
%{_datadir}/%{name}/virtManager/*.py
%{_datadir}/%{name}/virtManagerTui/*.py
%{_datadir}/%{name}/virtManagerTui/importblacklist/*.py
%{_datadir}/applications/YaST2/%{name}.desktop
%{_datadir}/dbus-1/services/%{name}.service
%{_mandir}/man1/%{name}.1*
# FIXME: autobuild complains that these are unowned (not true...)
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/services
%dir %{_datadir}/applications/YaST2
%changelog
++++++ virtman-autoconnect.diff ++++++
Index: virt-manager-0.9.3/src/virtManager/engine.py
===================================================================
--- virt-manager-0.9.3.orig/src/virtManager/engine.py
+++ virt-manager-0.9.3/src/virtManager/engine.py
@@ -214,7 +214,7 @@ class vmmEngine(vmmGObject):
conn = self.add_conn(uri)
if autoconnect is not None:
- conn.set_autoconnect(bool(autoconnect))
+ self.connect_to_uri(uri)
self.show_manager()
if do_start:
++++++ virtman-autorestart.diff ++++++
Index: virt-manager-0.9.3/src/virtManager/details.py
===================================================================
--- virt-manager-0.9.3.orig/src/virtManager/details.py
+++ virt-manager-0.9.3/src/virtManager/details.py
@@ -2129,11 +2129,9 @@ class vmmDetails(vmmGObjectUI):
return self._change_config_helper(df, da, hf, ha)
- # Boot device / Autostart
- def config_boot_options_apply(self):
- df, da, add_define, hf, ha, add_hotplug = self.make_apply_data()
- ignore = add_hotplug
-
+ # Autostart - See bnc#624250 - L3: virt-manager doesn't update
+ # "Autostart" setting in vm configuration correctly
+ def update_on_xend_start(self):
if self.editted(EDIT_AUTOSTART):
auto = self.widget("config-autostart")
try:
@@ -2143,6 +2141,11 @@ class vmmDetails(vmmGObjectUI):
(_("Error changing autostart value: %s") % str(e)))
return False
+ # Boot device
+ def config_boot_options_apply(self):
+ df, da, add_define, hf, ha, add_hotplug = self.make_apply_data()
+ ignore = add_hotplug
+
if self.editted(EDIT_BOOTORDER):
bootdevs = self.get_config_boot_devs()
add_define(self.vm.set_boot_device, bootdevs)
@@ -2499,6 +2502,8 @@ class vmmDetails(vmmGObjectUI):
buttons=gtk.BUTTONS_OK,
dialog_type=dtype)
+ self.update_on_xend_start()
+
return True
########################
++++++ virtman-cdrom.diff ++++++
Index: virt-manager-0.9.3/src/virtManager/addhardware.py
===================================================================
--- virt-manager-0.9.3.orig/src/virtManager/addhardware.py
+++ virt-manager-0.9.3/src/virtManager/addhardware.py
@@ -540,6 +540,7 @@ class vmmAddHardware(vmmGObjectUI):
add_dev("sata", virtinst.VirtualDisk.DEVICE_DISK, "SATA disk")
add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio disk")
if self.conn.is_xen():
+ add_dev("xen", virtinst.VirtualDisk.DEVICE_CDROM, "Virtual disk (read only)")
add_dev("xen", virtinst.VirtualDisk.DEVICE_DISK, "Virtual disk")
def populate_input_model(self, model):
++++++ virtman-desktop.diff ++++++
Index: virt-manager-0.9.3/src/Makefile.am
===================================================================
--- virt-manager-0.9.3.orig/src/Makefile.am
+++ virt-manager-0.9.3/src/Makefile.am
@@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir)
glade_DATA = $(wildcard $(srcdir)/*.ui)
-desktopdir = $(datadir)/applications
+desktopdir = $(datadir)/applications/YaST2/
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
Index: virt-manager-0.9.3/src/Makefile.in
===================================================================
--- virt-manager-0.9.3.orig/src/Makefile.in
+++ virt-manager-0.9.3/src/Makefile.in
@@ -266,7 +266,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir)
glade_DATA = $(wildcard $(srcdir)/*.ui)
-desktopdir = $(datadir)/applications
+desktopdir = $(datadir)/applications/YaST2/
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
dbusdir = $(datadir)/dbus-1/services
Index: virt-manager-0.9.3/src/virt-manager.desktop.in.in
===================================================================
--- virt-manager-0.9.3.orig/src/virt-manager.desktop.in.in
+++ virt-manager-0.9.3/src/virt-manager.desktop.in.in
@@ -1,8 +1,19 @@
[Desktop Entry]
_Name=Virtual Machine Manager
-_Comment=Manage virtual machines
-Icon=::PACKAGE::
-Exec=::PACKAGE::
+_Comment=Manage Virtual Machines for Xen and KVM
+Version=1.0
+Icon=yast-vm-management
+Exec=/usr/bin/virt-manager
Type=Application
Terminal=false
-Categories=System;
+Encoding=UTF-8
+Categories=Qt;X-SuSE-YaST;
+X-KDE-ModuleType=Library
+X-KDE-RootOnly=true
+X-KDE-HasReadOnlyMode=false
+X-SuSE-YaST-Call=/usr/bin/virt-manager
+X-SuSE-YaST-Group=Virtualization
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
++++++ virtman-device-flags.diff ++++++
Index: virt-manager-0.9.3/src/virtManager/addhardware.py
===================================================================
--- virt-manager-0.9.3.orig/src/virtManager/addhardware.py
+++ virt-manager-0.9.3/src/virtManager/addhardware.py
@@ -1152,6 +1152,18 @@ class vmmAddHardware(vmmGObjectUI):
self._dev.get_xml_config()
logging.debug("Adding device:\n" + self._dev.get_xml_config())
+ # If vm is active, Try to hotplug the device and modify persistent
+ # config in one go
+ if self.vm.is_active():
+ try:
+ self.vm.attach_device_flags(self._dev, 3)
+ return (False, None)
+ except Exception, e:
+ logging.debug("Could not hotplug device and modify persistent "
+ "config at the same time: %s" % str(e))
+ logging.debug("Trying the operations seperately ...")
+
+ # Try hotplug then modify persistent config
# Hotplug device
attach_err = False
try:
Index: virt-manager-0.9.3/src/virtManager/details.py
===================================================================
--- virt-manager-0.9.3.orig/src/virtManager/details.py
+++ virt-manager-0.9.3/src/virtManager/details.py
@@ -2385,6 +2385,17 @@ class vmmDetails(vmmGObjectUI):
text1=(_("Are you sure you want to remove this device?"))):
return
+ # If vm is running, try to hot remove the device and modify
+ # persistent config in one go
+ if self.vm.is_active():
+ try:
+ self.vm.detach_device_flags(dev_type, dev_id_info, 3)
+ return
+ except Exception, e:
+ logging.debug("Could not hot remove device and modify "
+ "persistent config at the same time: %s" % str(e))
+ logging.debug("Trying the operations seperately ...")
+
# Define the change
try:
self.vm.remove_device(dev_id_info)
Index: virt-manager-0.9.3/src/virtManager/domain.py
===================================================================
--- virt-manager-0.9.3.orig/src/virtManager/domain.py
+++ virt-manager-0.9.3/src/virtManager/domain.py
@@ -757,6 +757,10 @@ class vmmDomain(vmmLibvirtObject):
devxml = devobj.get_xml_config()
self._backend.attachDevice(devxml)
+ def attach_device_flags(self, devobj, flags):
+ xml = devobj.get_xml_config()
+ self._backend.attachDeviceFlags(xml, flags)
+
def detach_device(self, devobj):
"""
Hotunplug device from running guest
@@ -775,6 +779,10 @@ class vmmDomain(vmmLibvirtObject):
xml = devobj.get_xml_config()
self._backend.updateDeviceFlags(xml, flags)
+ def detach_device_flags(self, devtype, dev_id_info, flags):
+ xml = self._get_device_xml(devtype, dev_id_info)
+ self._backend.detachDeviceFlags(xml, flags)
+
def hotplug_vcpus(self, vcpus):
vcpus = int(vcpus)
if vcpus != self.vcpu_count():
++++++ virtman-eepro100.diff ++++++
Index: virt-manager-0.9.3/src/virtManager/uihelpers.py
===================================================================
--- virt-manager-0.9.3.orig/src/virtManager/uihelpers.py
+++ virt-manager-0.9.3/src/virtManager/uihelpers.py
@@ -309,6 +309,7 @@ def populate_netmodel_combo(vm, combo):
if vm.is_hvm():
mod_list = ["rtl8139", "ne2k_pci", "pcnet", "e1000"]
if vm.get_hv_type() in ["kvm", "qemu", "test"]:
+ mod_list.append("eepro100")
mod_list.append("virtio")
if (vm.get_hv_type() == "kvm" and
vm.get_machtype() == "pseries"):
++++++ virtman-keycombo.diff ++++++
Index: virt-manager-0.9.3/src/virtManager/uihelpers.py
===================================================================
--- virt-manager-0.9.3.orig/src/virtManager/uihelpers.py
+++ virt-manager-0.9.3/src/virtManager/uihelpers.py
@@ -963,6 +963,16 @@ def build_keycombo_menu(cb):
make_item("Ctrl+Alt+_Backspace", ["Control_L", "Alt_L", "BackSpace"])
make_item("Ctrl+Alt+_Delete", ["Control_L", "Alt_L", "Delete"])
menu.add(gtk.SeparatorMenuItem())
+ make_item("Ctrl+Scroll+Scroll", ["Control_L", "Scroll" + "Scroll"])
+ make_item("Alt+F_10", ["Alt_L", "F10"])
+ make_item("Alt+Tab", ["Alt_L", "Tab"])
+ make_item("Alt+Escape", ["Alt_L", "Escape"])
+ make_item("Ctrl+Escape", ["Control_L", "Escape"])
+ make_item("Ctrl+Alt+Escape", ["Control_L", "Alt_L", "Escape"])
+ make_item("Alt+Shift+Shift+Escape", ["Alt_R", "Shift_R", "Shift_L", "Escape"])
+ make_item("F_8", ["F8"])
+ make_item("F_10", ["F10"])
+ menu.add(gtk.SeparatorMenuItem())
for i in range(1, 13):
make_item("Ctrl+Alt+F_%d" % i, ["Control_L", "Alt_L", "F%d" % i])
++++++ virtman-kvm.diff ++++++
Index: virt-manager-0.9.3/src/virtManager/engine.py
===================================================================
--- virt-manager-0.9.3.orig/src/virtManager/engine.py
+++ virt-manager-0.9.3/src/virtManager/engine.py
@@ -57,6 +57,7 @@ def default_uri():
os.path.exists("/usr/bin/qemu") or
os.path.exists("/usr/bin/qemu-kvm") or
os.path.exists("/usr/bin/kvm") or
+ os.path.exists("/dev/kvm") or
os.path.exists("/usr/libexec/qemu-kvm")):
tryuri = "qemu:///system"
++++++ virtman-qed.diff ++++++
Index: virt-manager-0.9.3/src/virtManager/uihelpers.py
===================================================================
--- virt-manager-0.9.3.orig/src/virtManager/uihelpers.py
+++ virt-manager-0.9.3/src/virtManager/uihelpers.py
@@ -398,13 +398,12 @@ def build_storage_format_combo(vm, combo
combo.set_model(dev_model)
combo.set_text_column(0)
- formats = ["raw", "qcow2", "qed"]
- if vm.rhel6_defaults():
- formats.append("vmdk")
- formats.append("vdi")
-
- for m in formats:
- dev_model.append([m])
+ if vm.conn.is_xen():
+ for m in ["raw", "qcow2", "vmdk"]:
+ dev_model.append([m])
+ else:
+ for m in ["raw", "qcow2", "qed", "vmdk", "vdi"]:
+ dev_model.append([m])
combo.set_active(0)
++++++ virtman-slow-mouse.diff ++++++
This patch reverses the commit described below. The commit causes a serious
mouse tracking slowdown. See bnc#731218.
Subject: manager: Properly show vm desc in tooltip w/ special xml characters
From: Cole Robinson crobinso@redhat.com Mon Sep 26 11:05:55 2011 -0400
Date: Mon Sep 26 11:07:52 2011 -0400:
Git: 0a7640c593a54a6a3f558583d82f8b27c7a7d1d1
Index: virt-manager-0.9.3/src/virtManager/manager.py
===================================================================
--- virt-manager-0.9.3.orig/src/virtManager/manager.py
+++ virt-manager-0.9.3/src/virtManager/manager.py
@@ -777,7 +777,7 @@ class vmmManager(vmmGObjectUI):
row.insert(ROW_STATUS, vm.run_status())
row.insert(ROW_STATUS_ICON, vm.run_status_icon_name())
row.insert(ROW_KEY, vm.get_uuid())
- row.insert(ROW_HINT, util.xml_escape(vm.get_description()))
+ row.insert(ROW_HINT, vm.get_description())
row.insert(ROW_IS_CONN, False)
row.insert(ROW_IS_CONN_CONNECTED, True)
row.insert(ROW_IS_VM, True)
@@ -921,7 +921,7 @@ class vmmManager(vmmGObjectUI):
row[ROW_MARKUP] = self._build_vm_markup(row)
if config_changed:
- row[ROW_HINT] = util.xml_escape(vm.get_description())
+ row[ROW_HINT] = vm.get_description()
model.row_changed(row.path, row.iter)
++++++ virtman-storage-pool.diff ++++++
When connecting to a xen host, create default dir storage pool
in /var/lib/xen/images instead of /var/lib/libvirt/images.
Index: virt-manager-0.8.5/src/virtManager/connection.py
===================================================================
--- virt-manager-0.8.5.orig/src/virtManager/connection.py
+++ virt-manager-0.8.5/src/virtManager/connection.py
@@ -1144,7 +1144,8 @@ class vmmConnection(gobject.GObject):
else:
# Try to create the default storage pool
try:
- util.build_default_pool(self.vmm)
+ util.build_default_pool(self.vmm, \
+ self.config.get_default_image_dir(self))
except Exception, e:
logging.debug("Building default pool failed: %s" % str(e))
Index: virt-manager-0.8.5/src/virtManager/util.py
===================================================================
--- virt-manager-0.8.5.orig/src/virtManager/util.py
+++ virt-manager-0.8.5/src/virtManager/util.py
@@ -31,9 +31,8 @@ import virtManager
import virtinst
DEFAULT_POOL_NAME = "default"
-DEFAULT_POOL_PATH = "/var/lib/libvirt/images"
-def build_default_pool(conn):
+def build_default_pool(conn, path):
"""
Helper to build the 'default' storage pool
"""
@@ -54,15 +53,15 @@ def build_default_pool(conn):
try:
logging.debug("Attempting to build default pool with target '%s'" %
- DEFAULT_POOL_PATH)
+ path)
defpool = virtinst.Storage.DirectoryPool(conn=conn,
name=DEFAULT_POOL_NAME,
- target_path=DEFAULT_POOL_PATH)
+ target_path=path)
newpool = defpool.install(build=True, create=True)
newpool.setAutostart(True)
except Exception, e:
raise RuntimeError(_("Couldn't create default storage pool '%s': %s") %
- (DEFAULT_POOL_PATH, str(e)))
+ (path, str(e)))
def get_ideal_path_info(conn, config, name):
path = get_default_dir(conn, config)
++++++ virtman-update-backend.diff ++++++
Index: virt-manager-0.9.3/src/virtManager/domain.py
===================================================================
--- virt-manager-0.9.3.orig/src/virtManager/domain.py
+++ virt-manager-0.9.3/src/virtManager/domain.py
@@ -1584,7 +1584,14 @@ class vmmDomain(vmmLibvirtObject):
# Invalidate cached values
self._invalidate_xml()
- info = self._backend.info()
+ try:
+ info = self._backend.info()
+ except:
+ self._backend = self.conn.vmm.lookupByName(self.get_name())
+ info = self._backend.info()
+ if info[0] == libvirt.VIR_DOMAIN_NOSTATE:
+ self._backend = self.conn.vmm.lookupByName(self.get_name())
+ info = self._backend.info()
expected = self.config.get_stats_history_length()
current = len(self.record)
if current > expected:
++++++ virtman-vminstall.diff ++++++
Index: virt-manager-0.9.3/src/virtManager/engine.py
===================================================================
--- virt-manager-0.9.3.orig/src/virtManager/engine.py
+++ virt-manager-0.9.3/src/virtManager/engine.py
@@ -42,7 +42,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
@@ -671,11 +670,47 @@ 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(src.topwin, uri)
- except Exception, e:
- src.err.show_err(_("Error launching manager: %s") % str(e))
+ if uri is None:
+ uri = default_uri()
+ conn = self._lookup_conn(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-vm", self._do_show_vm)
+ 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(src.topwin, uri)
+ else:
+ from vminstall.gtk.interface import VMCreate as vmmCreate
+ create = vmmCreate(virtman=True,key=0)
+ create.connect("action-show-vm", self._do_show_vm)
+ create.connect("vmmcreate-closing", self._vmmcreate_closing)
+ self.remote_install = False
+ self.windowCreate = create
+ self.windowCreate.show(src.topwin)
+ except Exception, e:
+ src.err.show_err(_("Error launching manager: %s") % str(e),
+ "".join(traceback.format_exc()))
+ else:
+ if do_remote:
+ self.windowCreate.show(src.topwin, 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.9.3/src/virtManager/create.py
===================================================================
--- virt-manager-0.9.3.orig/src/virtManager/create.py
+++ virt-manager-0.9.3/src/virtManager/create.py
@@ -176,6 +176,7 @@ class vmmCreate(vmmGObjectUI):
def close(self, ignore1=None, ignore2=None):
logging.debug("Closing new vm wizard")
+ self.emit('vmmcreate-closing', 0)
self.topwin.hide()
self.remove_timers()
@@ -2152,3 +2153,4 @@ class vmmCreate(vmmGObjectUI):
vmmGObjectUI.type_register(vmmCreate)
vmmCreate.signal_new(vmmCreate, "action-show-vm", [str, str])
vmmCreate.signal_new(vmmCreate, "action-show-help", [str])
+vmmCreate.signal_new(vmmCreate, "vmmcreate-closing", [str])
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
