Accepting request 127862 from Virtualization
Update to virt-manager 0.9.3 OBS-URL: https://build.opensuse.org/request/show/127862 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=75
This commit is contained in:
commit
a09856c9f8
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:7d740bb8307be8fe8b466a4a690bf38f901ba7ca0cd164608469c49c668480d4
|
|
||||||
size 1131634
|
|
3
virt-manager-0.9.3.tar.bz2
Normal file
3
virt-manager-0.9.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:9936059ac6b6d1d8a8dfe4bccd23696dcdeaa42a9953914fbd316c077ec5d953
|
||||||
|
size 945613
|
@ -1,3 +1,18 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
Fri Apr 27 17:03:48 UTC 2012 - reddwarf@opensuse.org
|
||||||
|
|
||||||
|
@ -15,12 +15,11 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define gsysconfdir /etc
|
%define gsysconfdir /etc
|
||||||
%define gconftool /usr/bin/gconftool-2
|
%define gconftool /usr/bin/gconftool-2
|
||||||
%define virtinst_maj 0
|
%define virtinst_maj 0
|
||||||
%define virtinst_min 600
|
%define virtinst_min 600
|
||||||
%define virtinst_rel 1
|
%define virtinst_rel 2
|
||||||
%define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
|
%define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
|
||||||
|
|
||||||
%define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()")
|
%define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()")
|
||||||
@ -29,7 +28,7 @@ Name: virt-manager
|
|||||||
Summary: Virtual Machine Manager
|
Summary: Virtual Machine Manager
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
Group: System/Monitoring
|
Group: System/Monitoring
|
||||||
Version: 0.9.1
|
Version: 0.9.3
|
||||||
Release: 0
|
Release: 0
|
||||||
Url: http://virt-manager.et.redhat.com
|
Url: http://virt-manager.et.redhat.com
|
||||||
Source0: virt-manager-%{version}.tar.bz2
|
Source0: virt-manager-%{version}.tar.bz2
|
||||||
@ -53,6 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: gconf2-devel
|
BuildRequires: gconf2-devel
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
|
BuildRequires: hicolor-icon-theme
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
BuildRequires: scrollkeeper
|
BuildRequires: scrollkeeper
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
@ -61,7 +61,6 @@ Requires: dbus-1-x11
|
|||||||
Requires: gnome-keyring
|
Requires: gnome-keyring
|
||||||
Requires: libvirt-python >= 0.7.0
|
Requires: libvirt-python >= 0.7.0
|
||||||
Requires: libxml2-python >= 2.6.23
|
Requires: libxml2-python >= 2.6.23
|
||||||
Requires: python-gconf
|
|
||||||
Requires: vm-install >= 0.5.6
|
Requires: vm-install >= 0.5.6
|
||||||
%ifarch x86_64
|
%ifarch x86_64
|
||||||
Requires: vtemodule.so()(64bit)
|
Requires: vtemodule.so()(64bit)
|
||||||
@ -70,11 +69,9 @@ Requires: vtemodule.so
|
|||||||
%endif
|
%endif
|
||||||
Requires: librsvg
|
Requires: librsvg
|
||||||
Requires: netcat-openbsd
|
Requires: netcat-openbsd
|
||||||
|
Requires: scrollkeeper
|
||||||
Requires: python-gtk-vnc
|
Requires: python-gtk-vnc
|
||||||
Requires: python-urlgrabber
|
Requires: python-urlgrabber
|
||||||
Requires: scrollkeeper
|
|
||||||
Requires: vm-install
|
|
||||||
#Requires: spice-gtk
|
|
||||||
Requires: python-gconf
|
Requires: python-gconf
|
||||||
Requires: python-gobject2
|
Requires: python-gobject2
|
||||||
Requires: python-gtk
|
Requires: python-gtk
|
||||||
@ -138,8 +135,19 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
|
|||||||
%pre -f %{name}.schemas_pre
|
%pre -f %{name}.schemas_pre
|
||||||
|
|
||||||
%post
|
%post
|
||||||
|
%if 0%{?suse_version} < 1140
|
||||||
%run_suseconfig -m glib2
|
%run_suseconfig -m glib2
|
||||||
%run_suseconfig -m gtk2
|
%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
|
%preun -f %{name}.schemas_preun
|
||||||
|
|
||||||
@ -152,7 +160,7 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
|
|||||||
%{_bindir}/%{name}-tui
|
%{_bindir}/%{name}-tui
|
||||||
%{_libexecdir}/%{name}-launch
|
%{_libexecdir}/%{name}-launch
|
||||||
%dir %{_datadir}/%{name}
|
%dir %{_datadir}/%{name}
|
||||||
%{_datadir}/%{name}/*.glade
|
#%{_datadir}/%{name}/*.glade
|
||||||
%dir %{_datadir}/%{name}/pixmaps
|
%dir %{_datadir}/%{name}/pixmaps
|
||||||
%dir %{_datadir}/%{name}/icons
|
%dir %{_datadir}/%{name}/icons
|
||||||
%dir %{_datadir}/%{name}/icons/hicolor/
|
%dir %{_datadir}/%{name}/icons/hicolor/
|
||||||
@ -164,6 +172,7 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
|
|||||||
%{_datadir}/%{name}/icons/hicolor/*/*/*.png
|
%{_datadir}/%{name}/icons/hicolor/*/*/*.png
|
||||||
%{_datadir}/icons/hicolor/*/*/*.png
|
%{_datadir}/icons/hicolor/*/*/*.png
|
||||||
%{_datadir}/%{name}/*.py
|
%{_datadir}/%{name}/*.py
|
||||||
|
%{_datadir}/%{name}/*.ui
|
||||||
%dir %{_datadir}/%{name}/virtManager
|
%dir %{_datadir}/%{name}/virtManager
|
||||||
%dir %{_datadir}/%{name}/virtManagerTui
|
%dir %{_datadir}/%{name}/virtManagerTui
|
||||||
%dir %{_datadir}/%{name}/virtManagerTui/importblacklist
|
%dir %{_datadir}/%{name}/virtManagerTui/importblacklist
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
Index: virt-manager-0.9.1/src/virtManager/engine.py
|
Index: virt-manager-0.9.3/src/virtManager/engine.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virtManager/engine.py
|
--- virt-manager-0.9.3.orig/src/virtManager/engine.py
|
||||||
+++ virt-manager-0.9.1/src/virtManager/engine.py
|
+++ virt-manager-0.9.3/src/virtManager/engine.py
|
||||||
@@ -361,7 +361,7 @@ class vmmEngine(vmmGObject):
|
@@ -214,7 +214,7 @@ class vmmEngine(vmmGObject):
|
||||||
conn = self.add_conn(uri)
|
conn = self.add_conn(uri)
|
||||||
|
|
||||||
if autoconnect is not None:
|
if autoconnect is not None:
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
Index: virt-manager-0.9.1/src/virtManager/details.py
|
Index: virt-manager-0.9.3/src/virtManager/details.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virtManager/details.py
|
--- virt-manager-0.9.3.orig/src/virtManager/details.py
|
||||||
+++ virt-manager-0.9.1/src/virtManager/details.py
|
+++ virt-manager-0.9.3/src/virtManager/details.py
|
||||||
@@ -2102,11 +2102,9 @@ class vmmDetails(vmmGObjectUI):
|
@@ -2129,11 +2129,9 @@ class vmmDetails(vmmGObjectUI):
|
||||||
|
|
||||||
return self._change_config_helper(df, da, hf, ha)
|
return self._change_config_helper(df, da, hf, ha)
|
||||||
|
|
||||||
@ -17,7 +17,7 @@ Index: virt-manager-0.9.1/src/virtManager/details.py
|
|||||||
if self.editted(EDIT_AUTOSTART):
|
if self.editted(EDIT_AUTOSTART):
|
||||||
auto = self.widget("config-autostart")
|
auto = self.widget("config-autostart")
|
||||||
try:
|
try:
|
||||||
@@ -2116,6 +2114,11 @@ class vmmDetails(vmmGObjectUI):
|
@@ -2143,6 +2141,11 @@ class vmmDetails(vmmGObjectUI):
|
||||||
(_("Error changing autostart value: %s") % str(e)))
|
(_("Error changing autostart value: %s") % str(e)))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@ -29,7 +29,7 @@ Index: virt-manager-0.9.1/src/virtManager/details.py
|
|||||||
if self.editted(EDIT_BOOTORDER):
|
if self.editted(EDIT_BOOTORDER):
|
||||||
bootdevs = self.get_config_boot_devs()
|
bootdevs = self.get_config_boot_devs()
|
||||||
add_define(self.vm.set_boot_device, bootdevs)
|
add_define(self.vm.set_boot_device, bootdevs)
|
||||||
@@ -2465,6 +2468,8 @@ class vmmDetails(vmmGObjectUI):
|
@@ -2499,6 +2502,8 @@ class vmmDetails(vmmGObjectUI):
|
||||||
buttons=gtk.BUTTONS_OK,
|
buttons=gtk.BUTTONS_OK,
|
||||||
dialog_type=dtype)
|
dialog_type=dtype)
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
Index: virt-manager-0.9.1/src/virtManager/addhardware.py
|
Index: virt-manager-0.9.3/src/virtManager/addhardware.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virtManager/addhardware.py
|
--- virt-manager-0.9.3.orig/src/virtManager/addhardware.py
|
||||||
+++ virt-manager-0.9.1/src/virtManager/addhardware.py
|
+++ virt-manager-0.9.3/src/virtManager/addhardware.py
|
||||||
@@ -528,6 +528,7 @@ class vmmAddHardware(vmmGObjectUI):
|
@@ -540,6 +540,7 @@ class vmmAddHardware(vmmGObjectUI):
|
||||||
add_dev("sata", virtinst.VirtualDisk.DEVICE_DISK, "SATA disk")
|
add_dev("sata", virtinst.VirtualDisk.DEVICE_DISK, "SATA disk")
|
||||||
add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio disk")
|
add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio disk")
|
||||||
if self.conn.is_xen():
|
if self.conn.is_xen():
|
||||||
|
@ -1,33 +1,33 @@
|
|||||||
Index: virt-manager-0.9.1/src/Makefile.am
|
Index: virt-manager-0.9.3/src/Makefile.am
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/Makefile.am
|
--- virt-manager-0.9.3.orig/src/Makefile.am
|
||||||
+++ virt-manager-0.9.1/src/Makefile.am
|
+++ virt-manager-0.9.3/src/Makefile.am
|
||||||
@@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch
|
@@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch
|
||||||
gladedir = $(pkgdatadir)
|
gladedir = $(pkgdatadir)
|
||||||
glade_DATA = $(wildcard $(srcdir)/*.glade)
|
glade_DATA = $(wildcard $(srcdir)/*.ui)
|
||||||
|
|
||||||
-desktopdir = $(datadir)/applications
|
-desktopdir = $(datadir)/applications
|
||||||
+desktopdir = $(datadir)/applications/YaST2/
|
+desktopdir = $(datadir)/applications/YaST2/
|
||||||
desktop_DATA_IN = $(PACKAGE).desktop.in.in
|
desktop_DATA_IN = $(PACKAGE).desktop.in.in
|
||||||
desktop_DATA = $(PACKAGE).desktop
|
desktop_DATA = $(PACKAGE).desktop
|
||||||
|
|
||||||
Index: virt-manager-0.9.1/src/Makefile.in
|
Index: virt-manager-0.9.3/src/Makefile.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/Makefile.in
|
--- virt-manager-0.9.3.orig/src/Makefile.in
|
||||||
+++ virt-manager-0.9.1/src/Makefile.in
|
+++ virt-manager-0.9.3/src/Makefile.in
|
||||||
@@ -255,7 +255,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
|
@@ -266,7 +266,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
|
||||||
libexec_SCRIPTS = $(PACKAGE)-launch
|
libexec_SCRIPTS = $(PACKAGE)-launch
|
||||||
gladedir = $(pkgdatadir)
|
gladedir = $(pkgdatadir)
|
||||||
glade_DATA = $(wildcard $(srcdir)/*.glade)
|
glade_DATA = $(wildcard $(srcdir)/*.ui)
|
||||||
-desktopdir = $(datadir)/applications
|
-desktopdir = $(datadir)/applications
|
||||||
+desktopdir = $(datadir)/applications/YaST2/
|
+desktopdir = $(datadir)/applications/YaST2/
|
||||||
desktop_DATA_IN = $(PACKAGE).desktop.in.in
|
desktop_DATA_IN = $(PACKAGE).desktop.in.in
|
||||||
desktop_DATA = $(PACKAGE).desktop
|
desktop_DATA = $(PACKAGE).desktop
|
||||||
dbusdir = $(datadir)/dbus-1/services
|
dbusdir = $(datadir)/dbus-1/services
|
||||||
Index: virt-manager-0.9.1/src/virt-manager.desktop.in.in
|
Index: virt-manager-0.9.3/src/virt-manager.desktop.in.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virt-manager.desktop.in.in
|
--- virt-manager-0.9.3.orig/src/virt-manager.desktop.in.in
|
||||||
+++ virt-manager-0.9.1/src/virt-manager.desktop.in.in
|
+++ virt-manager-0.9.3/src/virt-manager.desktop.in.in
|
||||||
@@ -1,8 +1,19 @@
|
@@ -1,8 +1,19 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
_Name=Virtual Machine Manager
|
_Name=Virtual Machine Manager
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
Index: virt-manager-0.9.1/src/virtManager/addhardware.py
|
Index: virt-manager-0.9.3/src/virtManager/addhardware.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virtManager/addhardware.py
|
--- virt-manager-0.9.3.orig/src/virtManager/addhardware.py
|
||||||
+++ virt-manager-0.9.1/src/virtManager/addhardware.py
|
+++ virt-manager-0.9.3/src/virtManager/addhardware.py
|
||||||
@@ -1140,6 +1140,18 @@ class vmmAddHardware(vmmGObjectUI):
|
@@ -1152,6 +1152,18 @@ class vmmAddHardware(vmmGObjectUI):
|
||||||
self._dev.get_xml_config()
|
self._dev.get_xml_config()
|
||||||
logging.debug("Adding device:\n" + self._dev.get_xml_config())
|
logging.debug("Adding device:\n" + self._dev.get_xml_config())
|
||||||
|
|
||||||
@ -21,11 +21,11 @@ Index: virt-manager-0.9.1/src/virtManager/addhardware.py
|
|||||||
# Hotplug device
|
# Hotplug device
|
||||||
attach_err = False
|
attach_err = False
|
||||||
try:
|
try:
|
||||||
Index: virt-manager-0.9.1/src/virtManager/details.py
|
Index: virt-manager-0.9.3/src/virtManager/details.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virtManager/details.py
|
--- virt-manager-0.9.3.orig/src/virtManager/details.py
|
||||||
+++ virt-manager-0.9.1/src/virtManager/details.py
|
+++ virt-manager-0.9.3/src/virtManager/details.py
|
||||||
@@ -2351,6 +2351,17 @@ class vmmDetails(vmmGObjectUI):
|
@@ -2385,6 +2385,17 @@ class vmmDetails(vmmGObjectUI):
|
||||||
text1=(_("Are you sure you want to remove this device?"))):
|
text1=(_("Are you sure you want to remove this device?"))):
|
||||||
return
|
return
|
||||||
|
|
||||||
@ -43,10 +43,10 @@ Index: virt-manager-0.9.1/src/virtManager/details.py
|
|||||||
# Define the change
|
# Define the change
|
||||||
try:
|
try:
|
||||||
self.vm.remove_device(dev_id_info)
|
self.vm.remove_device(dev_id_info)
|
||||||
Index: virt-manager-0.9.1/src/virtManager/domain.py
|
Index: virt-manager-0.9.3/src/virtManager/domain.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virtManager/domain.py
|
--- virt-manager-0.9.3.orig/src/virtManager/domain.py
|
||||||
+++ virt-manager-0.9.1/src/virtManager/domain.py
|
+++ virt-manager-0.9.3/src/virtManager/domain.py
|
||||||
@@ -757,6 +757,10 @@ class vmmDomain(vmmLibvirtObject):
|
@@ -757,6 +757,10 @@ class vmmDomain(vmmLibvirtObject):
|
||||||
devxml = devobj.get_xml_config()
|
devxml = devobj.get_xml_config()
|
||||||
self._backend.attachDevice(devxml)
|
self._backend.attachDevice(devxml)
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
Index: virt-manager-0.9.1/src/virtManager/uihelpers.py
|
Index: virt-manager-0.9.3/src/virtManager/uihelpers.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virtManager/uihelpers.py
|
--- virt-manager-0.9.3.orig/src/virtManager/uihelpers.py
|
||||||
+++ virt-manager-0.9.1/src/virtManager/uihelpers.py
|
+++ virt-manager-0.9.3/src/virtManager/uihelpers.py
|
||||||
@@ -309,6 +309,7 @@ def populate_netmodel_combo(vm, combo):
|
@@ -309,6 +309,7 @@ def populate_netmodel_combo(vm, combo):
|
||||||
if vm.is_hvm():
|
if vm.is_hvm():
|
||||||
mod_list = ["rtl8139", "ne2k_pci", "pcnet", "e1000"]
|
mod_list = ["rtl8139", "ne2k_pci", "pcnet", "e1000"]
|
||||||
if vm.get_hv_type() in ["kvm", "qemu", "test"]:
|
if vm.get_hv_type() in ["kvm", "qemu", "test"]:
|
||||||
+ mod_list.append("eepro100")
|
+ mod_list.append("eepro100")
|
||||||
mod_list.append("virtio")
|
mod_list.append("virtio")
|
||||||
if vm.get_hv_type() in ["xen", "test"]:
|
if (vm.get_hv_type() == "kvm" and
|
||||||
mod_list.append("netfront")
|
vm.get_machtype() == "pseries"):
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
Index: virt-manager-0.9.1/src/virtManager/uihelpers.py
|
Index: virt-manager-0.9.3/src/virtManager/uihelpers.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virtManager/uihelpers.py
|
--- virt-manager-0.9.3.orig/src/virtManager/uihelpers.py
|
||||||
+++ virt-manager-0.9.1/src/virtManager/uihelpers.py
|
+++ virt-manager-0.9.3/src/virtManager/uihelpers.py
|
||||||
@@ -953,6 +953,16 @@ def build_keycombo_menu(cb):
|
@@ -963,6 +963,16 @@ def build_keycombo_menu(cb):
|
||||||
make_item("Ctrl+Alt+_Backspace", ["Control_L", "Alt_L", "BackSpace"])
|
make_item("Ctrl+Alt+_Backspace", ["Control_L", "Alt_L", "BackSpace"])
|
||||||
make_item("Ctrl+Alt+_Delete", ["Control_L", "Alt_L", "Delete"])
|
make_item("Ctrl+Alt+_Delete", ["Control_L", "Alt_L", "Delete"])
|
||||||
menu.add(gtk.SeparatorMenuItem())
|
menu.add(gtk.SeparatorMenuItem())
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
Index: virt-manager-0.9.1/src/virtManager/engine.py
|
Index: virt-manager-0.9.3/src/virtManager/engine.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virtManager/engine.py
|
--- virt-manager-0.9.3.orig/src/virtManager/engine.py
|
||||||
+++ virt-manager-0.9.1/src/virtManager/engine.py
|
+++ virt-manager-0.9.3/src/virtManager/engine.py
|
||||||
@@ -59,6 +59,7 @@ def default_uri():
|
@@ -57,6 +57,7 @@ def default_uri():
|
||||||
os.path.exists("/usr/bin/qemu") or
|
os.path.exists("/usr/bin/qemu") or
|
||||||
os.path.exists("/usr/bin/qemu-kvm") or
|
os.path.exists("/usr/bin/qemu-kvm") or
|
||||||
os.path.exists("/usr/bin/kvm") or
|
os.path.exists("/usr/bin/kvm") or
|
||||||
|
@ -1,14 +1,15 @@
|
|||||||
Index: virt-manager-0.9.1/src/virtManager/uihelpers.py
|
Index: virt-manager-0.9.3/src/virtManager/uihelpers.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virtManager/uihelpers.py
|
--- virt-manager-0.9.3.orig/src/virtManager/uihelpers.py
|
||||||
+++ virt-manager-0.9.1/src/virtManager/uihelpers.py
|
+++ virt-manager-0.9.3/src/virtManager/uihelpers.py
|
||||||
@@ -395,12 +395,12 @@ def build_storage_format_combo(vm, combo
|
@@ -398,13 +398,12 @@ def build_storage_format_combo(vm, combo
|
||||||
combo.set_model(dev_model)
|
combo.set_model(dev_model)
|
||||||
combo.set_text_column(0)
|
combo.set_text_column(0)
|
||||||
|
|
||||||
- formats = ["raw", "qcow2"]
|
- formats = ["raw", "qcow2", "qed"]
|
||||||
- if vm.rhel6_defaults():
|
- if vm.rhel6_defaults():
|
||||||
- formats.append("vmdk")
|
- formats.append("vmdk")
|
||||||
|
- formats.append("vdi")
|
||||||
-
|
-
|
||||||
- for m in formats:
|
- for m in formats:
|
||||||
- dev_model.append([m])
|
- dev_model.append([m])
|
||||||
@ -16,7 +17,7 @@ Index: virt-manager-0.9.1/src/virtManager/uihelpers.py
|
|||||||
+ for m in ["raw", "qcow2", "vmdk"]:
|
+ for m in ["raw", "qcow2", "vmdk"]:
|
||||||
+ dev_model.append([m])
|
+ dev_model.append([m])
|
||||||
+ else:
|
+ else:
|
||||||
+ for m in ["raw", "qcow2", "qed", "vmdk"]:
|
+ for m in ["raw", "qcow2", "qed", "vmdk", "vdi"]:
|
||||||
+ dev_model.append([m])
|
+ dev_model.append([m])
|
||||||
|
|
||||||
combo.set_active(0)
|
combo.set_active(0)
|
||||||
|
@ -6,11 +6,11 @@ From: Cole Robinson crobinso@redhat.com Mon Sep 26 11:05:55 2011 -0400
|
|||||||
Date: Mon Sep 26 11:07:52 2011 -0400:
|
Date: Mon Sep 26 11:07:52 2011 -0400:
|
||||||
Git: 0a7640c593a54a6a3f558583d82f8b27c7a7d1d1
|
Git: 0a7640c593a54a6a3f558583d82f8b27c7a7d1d1
|
||||||
|
|
||||||
Index: virt-manager-0.9.1/src/virtManager/manager.py
|
Index: virt-manager-0.9.3/src/virtManager/manager.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virtManager/manager.py
|
--- virt-manager-0.9.3.orig/src/virtManager/manager.py
|
||||||
+++ virt-manager-0.9.1/src/virtManager/manager.py
|
+++ virt-manager-0.9.3/src/virtManager/manager.py
|
||||||
@@ -756,7 +756,7 @@ class vmmManager(vmmGObjectUI):
|
@@ -777,7 +777,7 @@ class vmmManager(vmmGObjectUI):
|
||||||
row.insert(ROW_STATUS, vm.run_status())
|
row.insert(ROW_STATUS, vm.run_status())
|
||||||
row.insert(ROW_STATUS_ICON, vm.run_status_icon_name())
|
row.insert(ROW_STATUS_ICON, vm.run_status_icon_name())
|
||||||
row.insert(ROW_KEY, vm.get_uuid())
|
row.insert(ROW_KEY, vm.get_uuid())
|
||||||
@ -19,7 +19,7 @@ Index: virt-manager-0.9.1/src/virtManager/manager.py
|
|||||||
row.insert(ROW_IS_CONN, False)
|
row.insert(ROW_IS_CONN, False)
|
||||||
row.insert(ROW_IS_CONN_CONNECTED, True)
|
row.insert(ROW_IS_CONN_CONNECTED, True)
|
||||||
row.insert(ROW_IS_VM, True)
|
row.insert(ROW_IS_VM, True)
|
||||||
@@ -900,7 +900,7 @@ class vmmManager(vmmGObjectUI):
|
@@ -921,7 +921,7 @@ class vmmManager(vmmGObjectUI):
|
||||||
row[ROW_MARKUP] = self._build_vm_markup(row)
|
row[ROW_MARKUP] = self._build_vm_markup(row)
|
||||||
|
|
||||||
if config_changed:
|
if config_changed:
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
Index: virt-manager-0.9.1/src/virtManager/domain.py
|
Index: virt-manager-0.9.3/src/virtManager/domain.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virtManager/domain.py
|
--- virt-manager-0.9.3.orig/src/virtManager/domain.py
|
||||||
+++ virt-manager-0.9.1/src/virtManager/domain.py
|
+++ virt-manager-0.9.3/src/virtManager/domain.py
|
||||||
@@ -1603,7 +1603,14 @@ class vmmDomain(vmmLibvirtObject):
|
@@ -1584,7 +1584,14 @@ class vmmDomain(vmmLibvirtObject):
|
||||||
# Invalidate cached values
|
# Invalidate cached values
|
||||||
self._invalidate_xml()
|
self._invalidate_xml()
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
Index: virt-manager-0.9.1/src/virtManager/engine.py
|
Index: virt-manager-0.9.3/src/virtManager/engine.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virtManager/engine.py
|
--- virt-manager-0.9.3.orig/src/virtManager/engine.py
|
||||||
+++ virt-manager-0.9.1/src/virtManager/engine.py
|
+++ virt-manager-0.9.3/src/virtManager/engine.py
|
||||||
@@ -41,7 +41,6 @@ from virtManager.manager import vmmManag
|
@@ -42,7 +42,6 @@ from virtManager.manager import vmmManag
|
||||||
from virtManager.migrate import vmmMigrateDialog
|
from virtManager.migrate import vmmMigrateDialog
|
||||||
from virtManager.details import vmmDetails
|
from virtManager.details import vmmDetails
|
||||||
from virtManager.asyncjob import vmmAsyncJob
|
from virtManager.asyncjob import vmmAsyncJob
|
||||||
@ -10,7 +10,7 @@ Index: virt-manager-0.9.1/src/virtManager/engine.py
|
|||||||
from virtManager.host import vmmHost
|
from virtManager.host import vmmHost
|
||||||
from virtManager.error import vmmErrorDialog
|
from virtManager.error import vmmErrorDialog
|
||||||
from virtManager.systray import vmmSystray
|
from virtManager.systray import vmmSystray
|
||||||
@@ -818,11 +817,47 @@ class vmmEngine(vmmGObject):
|
@@ -671,11 +670,47 @@ class vmmEngine(vmmGObject):
|
||||||
self.windowCreate = obj
|
self.windowCreate = obj
|
||||||
return self.windowCreate
|
return self.windowCreate
|
||||||
|
|
||||||
@ -62,11 +62,11 @@ Index: virt-manager-0.9.1/src/virtManager/engine.py
|
|||||||
|
|
||||||
def _do_show_migrate(self, src, uri, uuid):
|
def _do_show_migrate(self, src, uri, uuid):
|
||||||
try:
|
try:
|
||||||
Index: virt-manager-0.9.1/src/virtManager/create.py
|
Index: virt-manager-0.9.3/src/virtManager/create.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- virt-manager-0.9.1.orig/src/virtManager/create.py
|
--- virt-manager-0.9.3.orig/src/virtManager/create.py
|
||||||
+++ virt-manager-0.9.1/src/virtManager/create.py
|
+++ virt-manager-0.9.3/src/virtManager/create.py
|
||||||
@@ -156,6 +156,7 @@ class vmmCreate(vmmGObjectUI):
|
@@ -176,6 +176,7 @@ class vmmCreate(vmmGObjectUI):
|
||||||
|
|
||||||
def close(self, ignore1=None, ignore2=None):
|
def close(self, ignore1=None, ignore2=None):
|
||||||
logging.debug("Closing new vm wizard")
|
logging.debug("Closing new vm wizard")
|
||||||
@ -74,7 +74,7 @@ Index: virt-manager-0.9.1/src/virtManager/create.py
|
|||||||
self.topwin.hide()
|
self.topwin.hide()
|
||||||
self.remove_timers()
|
self.remove_timers()
|
||||||
|
|
||||||
@@ -2134,3 +2135,4 @@ class vmmCreate(vmmGObjectUI):
|
@@ -2152,3 +2153,4 @@ class vmmCreate(vmmGObjectUI):
|
||||||
vmmGObjectUI.type_register(vmmCreate)
|
vmmGObjectUI.type_register(vmmCreate)
|
||||||
vmmCreate.signal_new(vmmCreate, "action-show-vm", [str, str])
|
vmmCreate.signal_new(vmmCreate, "action-show-vm", [str, str])
|
||||||
vmmCreate.signal_new(vmmCreate, "action-show-help", [str])
|
vmmCreate.signal_new(vmmCreate, "action-show-help", [str])
|
||||||
|
Loading…
Reference in New Issue
Block a user