commit virt-manager for openSUSE:Factory
Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at Mon May 4 18:36:12 CEST 2009. -------- --- virt-manager/virt-manager.changes 2009-03-02 01:54:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/virt-manager/virt-manager.changes 2009-05-01 03:23:29.628509000 +0200 @@ -1,0 +2,15 @@ +Thu Apr 30 09:46:58 MDT 2009 - dpmerrill@novell.com + +- Add dbus-1-x11 dependency for minimal installations + +------------------------------------------------------------------- +Tue Apr 21 15:00:49 MDT 2009 - dpmerrill@novell.com + +- Update to virt-manager-0.7.0 and virtinst-0.400.3 + Improved KVM support + Added support for libvirt storage/network pools + Details and Console windows are combined + Added scaling for VM console window + Simple VM migration support + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- virtinst-0.300.2.tar.gz virtinst-vif.diff virt-manager-0.5.3.tar.gz virtman-dbus-query.diff virtman-detect.diff virtman-hardware.diff virtman-misc.diff virtman-timewatch.diff virtman-vif.diff virtman-xen-uri.diff New: ---- virtinst-0.400.3.tar.gz virtinst-cdrom.diff virt-manager-0.7.0.tar.gz virtman-bridge.diff virtman-cdrom.diff virtman-help.diff virtman-kvm.diff virtman-manager.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.i30599/_old 2009-05-04 18:35:41.000000000 +0200 +++ /var/tmp/diff_new_pack.i30599/_new 2009-05-04 18:35:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package virt-manager (Version 0.5.3) +# spec file for package virt-manager (Version 0.7.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,11 +22,11 @@ %define gsysconfdir /etc %define gconftool /usr/bin/gconftool-2 %define virtinst_maj 0 -%define virtinst_min 300 -%define virtinst_rel 2 +%define virtinst_min 400 +%define virtinst_rel 3 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} -Version: 0.5.3 -Release: 67 +Version: 0.7.0 +Release: 1 Summary: Virtual Machine Manager Group: System/Monitoring License: LGPL v2.1 or later @@ -36,18 +36,15 @@ Source0: virt-manager-%{version}.tar.gz Source1: %{virtinst_name}.tar.gz Patch0: virtman-desktop.diff -Patch1: virtman-dbus-query.diff -Patch2: virtman-xen-uri.diff +Patch1: virtman-vminstall.diff +Patch2: virtman-netcat.diff Patch3: virtman-pointer.diff -Patch4: virtman-detect.diff -Patch5: virtman-timewatch.diff -Patch6: virtman-vminstall.diff -Patch7: virtman-vif.diff -Patch8: virtman-hardware.diff -Patch9: virtman-netcat.diff -Patch50: virtinst-vif.diff -Patch100: virtman-misc.diff -# These two are just the oldest version tested +Patch4: virtman-cdrom.diff +Patch5: virtman-kvm.diff +Patch6: virtman-bridge.diff +Patch7: virtman-manager.diff +Patch8: virtman-help.diff +Patch51: virtinst-cdrom.diff # Requires: pygtk2 >= 1.99.12-6 Requires: python-gtk # Requires: gnome-python2-gconf >= 1.99.11-7 @@ -58,7 +55,7 @@ # Definitely does not work with earlier due to python API changes # Requires: dbus-python >= 0.61 Requires: dbus-1-python -# Might work with earlier, but this is what we've tested +Requires: dbus-1-x11 #Requires: gnome-keyring >= 0.4.9 Requires: gnome-keyring # Minimum we've tested with @@ -67,7 +64,6 @@ # disabled # Requires: gnome-python2-gnomekeyring >= 2.15.4 # Requires: gnome-python2-gnomevfs >= 2.15.4 -# Minimum we've tested with Requires: libxml2-python >= 2.6.23 # Required to install Xen & QEMU guests # Requires: python-virtinst >= 0.300.2 @@ -82,20 +78,22 @@ # For console widget # Requires: gtk-vnc-python Requires: python-gtk-vnc +# Requires: librsvg added to avoid problems with minimal template Requires: librsvg Requires: netcat # Add requires for non Xen installations Requires: python-urlgrabber -BuildRequires: python +Requires: vm-install +#rpmlint BuildRequires: python BuildRequires: gtk2-devel BuildRequires: python-devel BuildRequires: gettext BuildRequires: scrollkeeper BuildRequires: intltool -BuildRequires: python-gtk +#rpmlint BuildRequires: python-gtk BuildRequires: python-gtk-devel BuildRequires: python-gobject2-devel -BuildRequires: gconf2 +BuildRequires: gconf2-devel BuildRequires: desktop-file-utils BuildRequires: update-desktop-files # virtinst BuildRequires @@ -128,13 +126,11 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 -%patch100 -p1 pushd $RPM_BUILD_DIR/%{virtinst_name} -%patch50 -p1 +%patch51 -p1 popd -sed -i -e "s@sr\@Latn@sr\@latin@" configure -mv po/sr@Latn.po po/sr@latin.po +# sed -i -e "s@sr\@Latn@sr\@latin@" configure +# mv po/sr@Latn.po po/sr@latin.po %build # autoreconf -i @@ -148,17 +144,24 @@ make install DESTDIR=$RPM_BUILD_ROOT pushd $RPM_BUILD_DIR/%{virtinst_name} python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --install-lib=%{_datadir}/virt-manager -# remove unsued files rm -f $RPM_BUILD_ROOT/usr/bin/virt-clone rm -f $RPM_BUILD_ROOT/usr/bin/virt-image rm -f $RPM_BUILD_ROOT/usr/bin/virt-install +rm -f $RPM_BUILD_ROOT/usr/bin/virt-convert rm -f $RPM_BUILD_ROOT/usr/share/locale/ja/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/pl/LC_MESSAGES/virtinst.mo +rm -f $RPM_BUILD_ROOT/usr/share/locale/fr/LC_MESSAGES/virtinst.mo +rm -f $RPM_BUILD_ROOT/usr/share/locale/it/LC_MESSAGES/virtinst.mo +rm -f $RPM_BUILD_ROOT/usr/share/locale/sr/LC_MESSAGES/virtinst.mo +rm -f $RPM_BUILD_ROOT/usr/share/locale/pt_BR/LC_MESSAGES/virtinst.mo +rm -f $RPM_BUILD_ROOT/usr/share/locale/sr@latin/LC_MESSAGES/virtinst.mo +rm -f $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-clone.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-image.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-install.1 +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-convert.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/virt-image.5 -rm -f $RPM_BUILD_ROOT/usr/share/virt-manager/virtinst-0.300.2-py2.?.egg-info +# rm -f $RPM_BUILD_ROOT/usr/share/virt-manager/virtinst-0.400.3-py2.?.egg-info popd rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la @@ -171,9 +174,9 @@ %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 # Nuking these because old version didnt have any -rm -rf $RPM_BUILD_ROOT/usr/share/gnome +# rm -rf $RPM_BUILD_ROOT/usr/share/gnome # Also fixing the %{name}.lang file forcibly. -sed -i '\^/usr/share/gnome/help/^d' %{name}.lang +# sed -i '\^/usr/share/gnome/help/^d' %{name}.lang %clean # rm -rf $RPM_BUILD_ROOT @@ -188,10 +191,10 @@ %doc COPYING AUTHORS ChangeLog # %dir %attr(775,root,root) /etc/gconf # %dir %attr(775,root,root) /etc/gconf/schemas -%{gsysconfdir}/gconf/schemas/%{name}.schemas +%config %{gsysconfdir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} %{_libexecdir}/%{name}-launch -%{_libdir}/%{name} +%{_libdir}/%{name}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.glade %dir %{_datadir}/%{name}/pixmaps @@ -207,20 +210,41 @@ # %dir %attr(775,root,root) %{_datadir}/locale/or/LC_MESSAGES # %{_datadir}/locale/or/LC_MESSAGES/* %{_datadir}/omf/%{name} -# %dir %attr(775,root,root) %{_datadir}/gnome -# %{_datadir}/gnome/help +%dir %attr(775,root,root) %{_datadir}/gnome +%{_datadir}/gnome/help %{_datadir}/applications/YaST2/%{name}.desktop %{_datadir}/dbus-1/services/%{name}.service %{_datadir}/man/man1/%{name}.1* +# new files for virt-manager-0.7.0 +%dir %{_datadir}/%{name}/virtconv +%{_datadir}/%{name}/virtconv/*.py +%{_datadir}/%{name}/virtconv/*.pyc +%dir %{_datadir}/%{name}/virtconv/parsers +%{_datadir}/%{name}/virtconv/parsers/*.py +%{_datadir}/%{name}/virtconv/parsers/*.pyc +%{_datadir}/%{name}/virtinst-0.400.3-py2.6.egg-info +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/* +%doc %{_datadir}/gnome/help/%{name}/C/figures/*.png +%doc %{_datadir}/gnome/help/%{name}/C/*.xml # FIXME: autobuild complains that these are unowned (not true...) %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/services %dir %{_datadir}/applications/YaST2 %changelog -* Mon Mar 02 2009 ro@suse.de +* Thu Apr 30 2009 dpmerrill@novell.com +- Add dbus-1-x11 dependency for minimal installations +* Tue Apr 21 2009 dpmerrill@novell.com +- Update to virt-manager-0.7.0 and virtinst-0.400.3 + Improved KVM support + Added support for libvirt storage/network pools + Details and Console windows are combined + Added scaling for VM console window + Simple VM migration support +* Sun Mar 01 2009 ro@suse.de - move sr@Latn to sr@latin -* Thu Dec 04 2008 dpmerrill@suse.de +* Wed Dec 03 2008 dpmerrill@suse.de - Remove ia64 from build architectures (bnc#455989) * Tue Nov 11 2008 dpmerrill@novell.com - Add Requires python-urlgrabber for non Xen installations @@ -234,7 +258,7 @@ * Fri May 16 2008 ro@suse.de - move python install to install section in specfile - fix build without root privileges -* Wed Apr 30 2008 dpmerrill@novell.com +* Tue Apr 29 2008 dpmerrill@novell.com - Corrected gconf calls in spec file to fix build errors * Tue Apr 29 2008 dpmerrill@novell.com - Added needsrootforbuild to spec file to fix build errors @@ -254,7 +278,7 @@ - Changed vnc settings to prevent screen-saver lockup (bnc#253264) - Added read-only option in Details->Hardware for adding cdroms to prevent libvirt exceptions. (bnc#368204) (bnc#361990) -* Sat Apr 05 2008 dpmerrill@novell.com +* Fri Apr 04 2008 dpmerrill@novell.com - Removed Virtual Network tab from host details page (bnc#364514) * Wed Apr 02 2008 dpmerrill@novell.com - Fixed adding a virtual network to a vm (bnc#302663) @@ -265,11 +289,11 @@ - Added virtman-timewatch to minimize window after - inactivity to work around memory leaks in GTK and DBus - bnc#287366 (L3) -* Fri Feb 15 2008 dpmerrill@novell.com +* Thu Feb 14 2008 dpmerrill@novell.com - Changed virtman-xen-uri to correct the case where no - connection param is passed in and uri is None - bnc#362013 -* Wed Feb 13 2008 dpmerrill@novell.com +* Tue Feb 12 2008 dpmerrill@novell.com - Changed virtman-desktop and virtman-xen-uri to correct invalid - parms being passed in from YaST - now sends "-c xen:///" - bnc#361334 @@ -280,7 +304,7 @@ * Mon Feb 11 2008 dpmerrill@novell.com - Added virtman-pointer to set vnc to show only one pointer - bnc#359799 -* Mon Feb 04 2008 dpmerrill@novell.com +* Sun Feb 03 2008 dpmerrill@novell.com - Added virtman-vminstall for connecting to vm-install - and changed virtman-xen-uri.diff to force "xen:///" - bnc#358400 @@ -343,12 +367,12 @@ * Mon Mar 12 2007 ccoffing@novell.com - Update virt-manager to match changes in vm-install's disk class, due to bug #247849. -* Sat Mar 10 2007 ccoffing@novell.com +* Fri Mar 09 2007 ccoffing@novell.com - Make Ctrl+Alt release the mouse cursor (#252998). * Thu Mar 08 2007 ccoffing@novell.com - Add release to "Requires: xen-tools", to prevent mixing with pre-beta 5. (#238986, #252495) -* Sat Mar 03 2007 ccoffing@novell.com +* Fri Mar 02 2007 ccoffing@novell.com - Disable gtk-menu-bar-accel when VM has focus, to allow VM to get F10 key. (#240001) * Tue Feb 27 2007 ccoffing@novell.com @@ -374,12 +398,12 @@ * Mon Jan 22 2007 ccoffing@novell.com - Fix desktop file, so icon shows in YaST. (#237046) - Clean up macros in spec file. -* Sat Jan 20 2007 ccoffing@novell.com +* Fri Jan 19 2007 ccoffing@novell.com - Use temporary icon until real ones arrive. - Update to changeset 371 to fix VNC issues. * Wed Jan 17 2007 ccoffing@novell.com - Fix BuildRequires and paths to work with both SLES10 and STABLE. -* Sat Jan 13 2007 ccoffing@novell.com +* Fri Jan 12 2007 ccoffing@novell.com - Fix sysconfdir path. - Add desktop file. * Thu Jan 11 2007 ccoffing@novell.com ++++++ virtinst-0.300.2.tar.gz -> virtinst-0.400.3.tar.gz ++++++ ++++ 50123 lines of diff (skipped) ++++++ virtinst-cdrom.diff ++++++ diff -Nuar virtinst-0.400.3.orig//virtinst/VirtualDisk.py virtinst-0.400.3//virtinst/VirtualDisk.py --- virtinst-0.400.3.orig//virtinst/VirtualDisk.py 2009-03-09 21:32:15.000000000 -0600 +++ virtinst-0.400.3//virtinst/VirtualDisk.py 2009-04-21 10:58:25.000000000 -0600 @@ -846,14 +846,18 @@ return self.target raise ValueError(_("IDE CDROM must use 'hdc', but target in use.")) - # Regular scanning + # Start cdrom at 'c' and skip 'c' for non-cdrom for i in range(maxnode): gen_t = "%s%c" % (prefix, ord('a') + i) - if gen_t in except_targets: - continue if gen_t not in skip_targets: - self.target = gen_t - return self.target + if self.device != self.DEVICE_CDROM: + if i != ord('c') - ord('a'): + self.target = gen_t + return self.target + else: + if i >= ord('c') - ord('a'): + self.target = gen_t + return self.target # Check except_targets for any options for t in except_targets: ++++++ virt-manager-0.5.3.tar.gz -> virt-manager-0.7.0.tar.gz ++++++ ++++ 296785 lines of diff (skipped) ++++++ virtman-bridge.diff ++++++ diff -Nuar virt-manager-0.7.0.orig//src/virtManager/addhardware.py virt-manager-0.7.0//src/virtManager/addhardware.py --- virt-manager-0.7.0.orig//src/virtManager/addhardware.py 2009-04-21 14:53:08.000000000 -0600 +++ virt-manager-0.7.0//src/virtManager/addhardware.py 2009-04-21 14:56:20.000000000 -0600 @@ -481,7 +481,10 @@ net = self.get_config_network() if net[0] == "bridge": self.window.get_widget("summary-net-type").set_text(_("Shared physical device")) - self.window.get_widget("summary-net-target").set_text(net[1]) + if net[1] != None: + self.window.get_widget("summary-net-target").set_text(net[1]) + else: + self.window.get_widget("summary-net-target").set_text(_("Default")) elif net[0] == "network": self.window.get_widget("summary-net-type").set_text(_("Virtual network")) self.window.get_widget("summary-net-target").set_text(net[1]) ++++++ virtman-cdrom.diff ++++++ diff -Nuar virt-manager-0.7.0.orig//src/virtManager/addhardware.py virt-manager-0.7.0//src/virtManager/addhardware.py --- virt-manager-0.7.0.orig//src/virtManager/addhardware.py 2009-03-09 21:38:37.000000000 -0600 +++ virt-manager-0.7.0//src/virtManager/addhardware.py 2009-04-21 10:07:18.000000000 -0600 @@ -1021,6 +1021,8 @@ model.append(["virtio", virtinst.VirtualDisk.DEVICE_DISK, gtk.STOCK_HARDDISK, "Virtio Disk"]) if self.vm.get_connection().get_type().lower() == "xen": + model.append(["xen", virtinst.VirtualDisk.DEVICE_CDROM, + gtk.STOCK_CDROM, "Virtual disk (read only)"]) model.append(["xen", virtinst.VirtualDisk.DEVICE_DISK, gtk.STOCK_HARDDISK, "Virtual disk"]) ++++++ virtman-desktop.diff ++++++ --- /var/tmp/diff_new_pack.i30599/_old 2009-05-04 18:35:45.000000000 +0200 +++ /var/tmp/diff_new_pack.i30599/_new 2009-05-04 18:35:45.000000000 +0200 @@ -1,37 +1,37 @@ -diff -Nuar virt-manager-0.5.3.orig/src/Makefile.am virt-manager-0.5.3/src/Makefile.am ---- virt-manager-0.5.3.orig/src/Makefile.am 2008-01-10 18:17:51.000000000 -0700 -+++ virt-manager-0.5.3/src/Makefile.am 2008-04-29 11:07:08.000000000 -0600 +diff -Nuar virt-manager-0.7.0.orig//src/Makefile.am virt-manager-0.7.0//src/Makefile.am +--- virt-manager-0.7.0.orig//src/Makefile.am 2009-03-09 21:38:37.000000000 -0600 ++++ virt-manager-0.7.0//src/Makefile.am 2009-04-16 16:31:18.000000000 -0600 @@ -14,7 +14,7 @@ gladedir = $(pkgdatadir) glade_DATA = $(wildcard $(srcdir)/*.glade) -desktopdir = $(datadir)/applications +desktopdir = $(datadir)/applications/YaST2/ - desktop_SOURCES = $(PACKAGE).desktop.in.in + desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop -diff -Nuar virt-manager-0.5.3.orig/src/Makefile.in virt-manager-0.5.3/src/Makefile.in ---- virt-manager-0.5.3.orig/src/Makefile.in 2008-01-10 18:18:06.000000000 -0700 -+++ virt-manager-0.5.3/src/Makefile.in 2008-04-29 11:12:12.000000000 -0600 -@@ -246,7 +246,7 @@ +diff -Nuar virt-manager-0.7.0.orig//src/Makefile.in virt-manager-0.7.0//src/Makefile.in +--- virt-manager-0.7.0.orig//src/Makefile.in 2009-03-09 21:39:01.000000000 -0600 ++++ virt-manager-0.7.0//src/Makefile.in 2009-04-16 16:31:47.000000000 -0600 +@@ -248,7 +248,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) glade_DATA = $(wildcard $(srcdir)/*.glade) -desktopdir = $(datadir)/applications +desktopdir = $(datadir)/applications/YaST2/ - desktop_SOURCES = $(PACKAGE).desktop.in.in + desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop dbusdir = $(datadir)/dbus-1/services -diff -Nuar virt-manager-0.5.3.orig/src/virt-manager.desktop.in.in virt-manager-0.5.3/src/virt-manager.desktop.in.in ---- virt-manager-0.5.3.orig/src/virt-manager.desktop.in.in 2008-01-10 18:17:51.000000000 -0700 -+++ virt-manager-0.5.3/src/virt-manager.desktop.in.in 2008-04-29 11:11:24.000000000 -0600 +diff -Nuar virt-manager-0.7.0.orig//src/virt-manager.desktop.in.in virt-manager-0.7.0//src/virt-manager.desktop.in.in +--- virt-manager-0.7.0.orig//src/virt-manager.desktop.in.in 2009-03-09 21:38:37.000000000 -0600 ++++ virt-manager-0.7.0//src/virt-manager.desktop.in.in 2009-04-16 16:35:46.000000000 -0600 @@ -1,9 +1,16 @@ [Desktop Entry] -+Version=1.0 _Name=Virtual Machine Manager _Comment=Manage virtual machines -Icon=::ICONDIR::/::PACKAGE::-icon.svg -Exec=::PACKAGE:: ++Version=1.0 +Icon=yast-vm-management +Exec=/usr/bin/virt-manager -c xen:/// Type=Application ++++++ virtman-help.diff ++++++ diff -Nuar virt-manager-0.7.0.orig//help/virt-manager/C/virt-manager.xml virt-manager-0.7.0//help/virt-manager/C/virt-manager.xml --- virt-manager-0.7.0.orig//help/virt-manager/C/virt-manager.xml 2009-03-09 21:38:36.000000000 -0600 +++ virt-manager-0.7.0//help/virt-manager/C/virt-manager.xml 2009-04-24 17:02:36.000000000 -0600 @@ -821,218 +821,9 @@ <title>The Create Wizard</title> <para>The Create Wizard helps you gather the information necessary to create new virtual machines. All the information in each screen is retained and can - be backed-up-to and modified until you click <guibutton>Finish</guibutton> + be backed-up-to and modified until you click <guibutton>OK</guibutton> on the last screen.</para> - <sect2 id="virt-manager-system-name"> - <title>The System Name screen</title> - <para>Choose a name for your virtual system. The name must be non-blank, - alphanumeric (plus underscores), contain at least one letter, and be less - than 50 characters.</para> - </sect2> - - <sect2 id="virt-manager-virt-method"> - <title>The Virtualization Method screen</title> - <para>Choose a virtualization method for your new system. The choices - are:</para> - <variablelist> - <varlistentry><term>Paravirtualized</term> <listitem><para>A - paravirtualized system typically performs better than a fully virtualized - system because certain operations — disk and network access, for - example — have direct access to the hardware. However a - paravirtualized VM requires a specially modified kernel. If you - choose paravirtualized, you must make sure this specially modified kernel - is available for the operating system you wish to install.</para> - </listitem> - </varlistentry> - <varlistentry><term>Fully Virtualized</term> - <listitem> - <para>A fully virtualized system simulates all the hardware for the VM, - permitting no direct access. It allows for a greater range of operating - systems, but generally will not perform as well as a paravirtualized - system. Note that for some hypervisor types, full virtualization requires - hardware support. In addition if your hardware allows it, you can - enable hardware acceleration for your fully virtualized guest (this - item will be grayed out unless your hardware is acceleration-capable).</para> - </listitem> - </varlistentry> - </variablelist> - </sect2> - - <sect2 id="virt-manager-installation-media"> - <title>The Installation Media screens</title> - <para>The Installation Media screens let you specify where the physical or - virtual install media for your VM are located, so that the installer can - find them. There are two screens, one for each type of virtual - machine.</para> - <sect3 id="virt-manager-installation-media-paravirt"> - <title>Paravirtualized installation media</title> - <figure id="virt-manager-FIG-paravirt-media"> - <title>Choose Install Media for Paravirtualized VMs</title> - <screenshot> - <mediaobject> - <imageobject> - <imagedata fileref="figures/vm-paravirt-media.png" format="PNG"/> - </imageobject> - <textobject> <phrase>Shows the paravirtualized VM media choice window.</phrase> - </textobject> - </mediaobject> - </screenshot> - </figure> - <para>A paravirtualized VM requires an install tree that follows the - pattern of the Fedora install tree (e.g. <ulink type="http" - url="http://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/"> - this tree</ulink>). The <guilabel>Install Media URL</guilabel> box lets - you enter a URL for a tree like this. When you then go to install the - guest, the installer will check to see if the URL you entered is - readable, and if so download the paravirtualized install kernel and - initrd that it will need to start the install. You can use the following - URL types:</para> - <variablelist> - <varlistentry><term>http:</term> - <listitem><para>e.g. <userinput>http://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/</userinput></para> - </listitem> - </varlistentry> - <varlistentry><term>ftp:</term> - <listitem><para>e.g. <userinput>ftp://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/</userinput></para> - </listitem> - </varlistentry> - <varlistentry><term>nfs:</term> - <listitem><para>e.g. <userinput>nfs:myfileserver:/images/linux/core/6/i386/os/</userinput></para> - </listitem> - </varlistentry> - <varlistentry><term>local file:</term> - <listitem><para>e.g. <userinput>/tmp/paravirttrees/fedora/os</userinput> - </para> - </listitem> - </varlistentry> - </variablelist> - <para>You can specify a kickstart URL for your paravirtualized VM in - exactly the same way as the install tree described - above. <application>&app;</application> will remember the last 5 URLs you - enter in these windows, so if you are installing multiple VMs you will - not have to type the URLs more than once. - </para> - </sect3> - <sect3 id="virt-manager-installation-media-full-virt"> - <title>Fully Virtualized Installation Media</title> - <figure id="virt-manager-FIG-full-virt-media"> - <title>Choose Install Media for Fully Virtualized VMs</title> - <screenshot> - <mediaobject> - <imageobject> - <imagedata fileref="figures/vm-full-virt-media.png" format="PNG"/> - </imageobject> - <textobject> <phrase>Shows the fully virtualized VM media choice window.</phrase> - </textobject> - </mediaobject> - </screenshot> - </figure> - <para>A fully virtualized VM requires the standard installation media that - the same non-virtualized OS would require: either an actual CD or DVD, or - a corresponding ISO image. On the Installation Media screen for a fully - virtualized VM, you can therefore choose the path to your CD or DVD from - the pull-down list, or you can enter or browse to the path of the ISO - image you have saved in your local filesystem.</para> - <para>For fully virtualized VMs, <application>&app;</application> also - asks for the operating system type and variant you are installing. The - installer uses this to set the <parameter>acpi</parameter> and - <parameter>apic</parameter> flags according to the OS type (other - parameters may be added to this list in the future).</para> - </sect3> - </sect2> - - <sect2 id="virt-manager-storage-space"> - <title>Assigning Storage Space</title> - <figure id="virt-manager-FIG-assign-storage"> - <title>Assign Storage</title> - <screenshot> - <mediaobject> - <imageobject> - <imagedata fileref="figures/vm-assign-storage.png" format="PNG"/> - </imageobject> - <textobject> <phrase>Shows the Assigning Storage window.</phrase> - </textobject> - </mediaobject> - </screenshot> - </figure> - - <para>Designate the primary storage device for your VM. You may choose an - existing physical or LVM partition in the <guilabel>Partition</guilabel> - box; or, you may choose to use a file on the local filesystem. If you - choose to use a file that does not already exist, you may specify the size - of the file in megabytes. If you choose an existing file, that file's size - will not change. If you use a file for your primary storage device, you - may also choose whether to allocate the entire file - at creation time, or whether to allow it to grow to its maximum over - time.</para> - <warning> - <title>Sparse files can be dangerous</title> - <para>You may be tempted not to allocate your entire file when your VM is - created; filling a 5- to 10-GB file with 0s can take quite a while, and - you will avoid this wait by not allocating the entire file and instead using a - "sparse" file. However, be aware that this will slow down your VM's disk - performance significantly, as the underlying OS must keep allocating more - storage space as your VM runs. In addition, if the disk your sparse file - is on runs out of space, your VM may crash and lose data. You may - therefore only want to use a sparse file when testing, where guest - creation speed could be at a premium.</para> - </warning> - </sect2> - - <sect2 id="virt-manager-memory-and-cpu"> - <title>Allocate Memory And CPU</title> - <figure id="virt-manager-FIG-mem-cpu"> - <title>Set Memory and CPU</title> - <screenshot> - <mediaobject> - <imageobject> - <imagedata fileref="figures/vm-create-mem-cpu.png" format="PNG"/> - </imageobject> - <textobject> <phrase>Shows the VM Memory and CPU choice window.</phrase> - </textobject> - </mediaobject> - </screenshot> - </figure> - <para>The <guilabel>Memory</guilabel> section of this screen lets you set - two parameters, <guilabel>VM Max Memory</guilabel> and <guilabel>VM - Startup Memory</guilabel>. These settings work as follows:</para> - <variablelist> - <varlistentry><term>VM Max Memory</term> <listitem><para><guilabel>VM Max - Memory</guilabel> sets the maximum memory your VM can have unless you - reboot it with a higher setting. For paravirtualized VMs, the maximum - memory is a boot-time kernel setting; for fully virtualized VMs, the - maximum memory appears to the VM to be the amount of physical memory - available.</para> - </listitem> - </varlistentry> - <varlistentry><term>VM Startup Memory</term> - <listitem><para>For paravirtualized VMs, <guilabel>VM Startup - Memory</guilabel> sets the amount of memory to start the VM with. The - VM's available memory can then be changed from <application>&app;</application> - while the VM is running. For fully virtualized guests, this setting has - no effect.</para> - </listitem> - </varlistentry> - </variablelist> - <para>The virtual CPU section of this screen lets you set the number of - vCPUs your VM starts up with. For paravirtualized guests, this number can - be changed while the guest is running (although never to more than the VM - started with). For fully virtualized guests, this number can only be - changed while the guest is not running.</para> - </sect2> - - <sect2 id="virt-manager-validation"> - <title>Validation</title> - <para>The Validation screen lets you verify the setup for your new - system. If you need to, you can back up and - make changes. Clicking "Finish" will begin creating your virtual - machine. If you have the <application>&app;</application> preferences set - to automatically open consoles, a <link - linkend="virt-manager-console-window">Console window</link> will pop up - as soon as the installer has downloaded the necessary images and booted - the VM's installer. - </para> - </sect2> + <para>For further details, see documentation for "vm-install".</para> </sect1> </article> ++++++ virtman-kvm.diff ++++++ diff -Nuar virt-manager-0.7.0.orig//src/virt-manager.py.in virt-manager-0.7.0//src/virt-manager.py.in --- virt-manager-0.7.0.orig//src/virt-manager.py.in 2009-03-09 21:38:37.000000000 -0600 +++ virt-manager-0.7.0//src/virt-manager.py.in 2009-04-21 14:24:51.000000000 -0600 @@ -192,7 +192,8 @@ tryuri = "xen:///" elif (os.path.exists("/usr/bin/qemu") or os.path.exists("/usr/bin/qemu-kvm") or - os.path.exists("/usr/bin/kvm")): + os.path.exists("/usr/bin/kvm") or + os.path.exists("/dev/kvm") ): tryuri = "qemu:///system" return tryuri ++++++ virtman-manager.diff ++++++ diff -Nuar virt-manager-0.7.0.orig//src/virtManager/manager.py virt-manager-0.7.0//src/virtManager/manager.py --- virt-manager-0.7.0.orig//src/virtManager/manager.py 2009-03-09 21:38:37.000000000 -0600 +++ virt-manager-0.7.0//src/virtManager/manager.py 2009-04-24 15:14:21.000000000 -0600 @@ -656,6 +656,15 @@ vmlist = self.window.get_widget("vm-list") selection = vmlist.get_selection() active = selection.get_selected() + if active[1] == None and active[0] != None: + # in some cases on vhost, the connection is not being selected at startup. + # when creating new vms, if current_connection() returns None, several + # functions will fail, so if the user hasn't selected a connection, default + # to the first connection in the list. + first = active[0].get_iter_first() + if first != None: + selection.select_iter( first ) + active = selection.get_selected() if active[1] != None: parent = active[0].iter_parent(active[1]) # return the connection of the currently selected vm, or the @@ -810,7 +819,14 @@ return False def new_vm(self, ignore=None): - self.emit("action-show-create", self.current_connection_uri()) + conn = self.current_connection() + if conn.get_state() == vmmConnection.STATE_ACTIVE: + self.emit("action-show-create", self.current_connection_uri()) + else: + message_box = gtk.MessageDialog( None, gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, + _("Must select an active connection before creating a Virtual Machine") ) + message_box.run() + message_box.destroy() def delete_vm(self, ignore=None): conn = self.current_connection() ++++++ virtman-netcat.diff ++++++ --- /var/tmp/diff_new_pack.i30599/_old 2009-05-04 18:35:45.000000000 +0200 +++ /var/tmp/diff_new_pack.i30599/_new 2009-05-04 18:35:45.000000000 +0200 @@ -1,12 +1,12 @@ -diff -Nuar virt-manager-0.5.3.orig/src/virtManager/console.py virt-manager-0.5.3/src/virtManager/console.py ---- virt-manager-0.5.3.orig/src/virtManager/console.py 2008-11-11 16:06:50.000000000 -0700 -+++ virt-manager-0.5.3/src/virtManager/console.py 2008-11-11 16:07:14.000000000 -0700 -@@ -407,7 +407,7 @@ - os.close(1) - os.dup(fds[1].fileno()) - os.dup(fds[1].fileno()) -- os.execlp("ssh", "ssh", "-p", "22", "-l", "root", server, "nc", vncaddr, str(vncport)) -+ os.execlp("ssh", "ssh", "-p", "22", "-l", "root", server, "netcat", vncaddr, str(vncport)) +diff -Nuar virt-manager-0.7.0.orig//src/virtManager/details.py virt-manager-0.7.0//src/virtManager/details.py +--- virt-manager-0.7.0.orig//src/virtManager/details.py 2009-03-09 21:38:37.000000000 -0600 ++++ virt-manager-0.7.0//src/virtManager/details.py 2009-04-20 10:13:49.000000000 -0600 +@@ -1233,7 +1233,7 @@ + argv = ["ssh", "ssh", "-p", sshport] + if username: + argv += ['-l', username] +- argv += [ server, "nc", vncaddr, str(vncport) ] ++ argv += [ server, "netcat", vncaddr, str(vncport) ] + os.execlp(*argv) os._exit(1) else: - fds[1].close() ++++++ virtman-pointer.diff ++++++ --- /var/tmp/diff_new_pack.i30599/_old 2009-05-04 18:35:45.000000000 +0200 +++ /var/tmp/diff_new_pack.i30599/_new 2009-05-04 18:35:45.000000000 +0200 @@ -1,24 +1,18 @@ -diff -Nuar virt-manager-0.5.3.orig/src/virtManager/console.py virt-manager-0.5.3/src/virtManager/console.py ---- virt-manager-0.5.3.orig/src/virtManager/console.py 2008-01-10 18:17:51.000000000 -0700 -+++ virt-manager-0.5.3/src/virtManager/console.py 2008-04-09 11:02:33.000000000 -0600 -@@ -78,13 +78,13 @@ - self.window.get_widget("console-vnc-align").add(self.vncViewer) +diff -Nuar virt-manager-0.7.0.orig//src/virtManager/details.py virt-manager-0.7.0//src/virtManager/details.py +--- virt-manager-0.7.0.orig//src/virtManager/details.py 2009-04-20 10:21:46.000000000 -0600 ++++ virt-manager-0.7.0//src/virtManager/details.py 2009-04-20 10:27:37.000000000 -0600 +@@ -218,10 +218,10 @@ + self.window.get_widget("console-vnc-viewport").add(self.vncViewer) self.vncViewer.realize() self.vncTunnel = None - if self.config.get_console_keygrab() == 2: - self.vncViewer.set_keyboard_grab(True) -- self.vncViewer.set_pointer_grab(True) - else: - self.vncViewer.set_keyboard_grab(False) -- self.vncViewer.set_pointer_grab(False) -- self.vncViewer.set_pointer_local(True) -+ # change to always set grab flags as False -+ # setting them to true raises the error of Dom0 screen-saver losing the pointer -+ # if the pointer is over DomU when screen saver activates ++ # Always set grab flags to False. Setting them to True introduces a bug where Dom0 ScreenSaver ++ # loses the pointer if the pointer is over Dom0 when the ScreenSaver activates. ++ # This patch can be removed when testing shows the bug (Gtk?) is fixed. + self.vncViewer.set_keyboard_grab(False) -+ self.vncViewer.set_pointer_grab(False) -+ # comment set_pointer_local to prevent 2 pointers in vnc viewer -+ # self.vncViewer.set_pointer_local(True) + self.vncViewer.set_pointer_grab(True) - self.vncViewer.connect("vnc-pointer-grab", self.notify_grabbed) - self.vncViewer.connect("vnc-pointer-ungrab", self.notify_ungrabbed) + self.scale_type = self.config.get_console_scaling() ++++++ virtman-vminstall.diff ++++++ --- /var/tmp/diff_new_pack.i30599/_old 2009-05-04 18:35:45.000000000 +0200 +++ /var/tmp/diff_new_pack.i30599/_new 2009-05-04 18:35:45.000000000 +0200 @@ -1,45 +1,41 @@ -diff -Nuar virt-manager-0.5.3.orig/src/virtManager/engine.py virt-manager-0.5.3/src/virtManager/engine.py ---- virt-manager-0.5.3.orig/src/virtManager/engine.py 2008-03-12 15:21:57.000000000 -0600 -+++ virt-manager-0.5.3/src/virtManager/engine.py 2008-03-12 17:43:02.000000000 -0600 -@@ -34,7 +34,7 @@ +diff -Nuar virt-manager-0.7.0.orig//src/virtManager/engine.py virt-manager-0.7.0//src/virtManager/engine.py +--- virt-manager-0.7.0.orig//src/virtManager/engine.py 2009-03-09 21:38:37.000000000 -0600 ++++ virt-manager-0.7.0//src/virtManager/engine.py 2009-04-17 11:48:12.000000000 -0600 +@@ -33,7 +33,8 @@ + from virtManager.manager import vmmManager from virtManager.details import vmmDetails - from virtManager.console import vmmConsole from virtManager.asyncjob import vmmAsyncJob -from virtManager.create import vmmCreate ++#from virtManager.create import vmmCreate +from vminstall.gtk.interface import VMCreate as vmmCreate - from virtManager.serialcon import vmmSerialConsole from virtManager.host import vmmHost from virtManager.error import vmmErrorDialog -@@ -311,16 +311,25 @@ - def show_manager(self): - self.get_manager().show() + import virtManager.util as util +@@ -341,13 +342,24 @@ + return False + return True -- def show_create(self, uri): -- con = self.get_connection(uri) + def _vmmcreate_closing(self,signal,key): -+ self.windowCreate= None; - -- if self.connections[uri]["windowCreate"] == None: -- create = vmmCreate(self.get_config(), con) -+ def show_create(self, uri): -+ if self.windowCreate == None: ++ self.windowCreate = None ++ + def show_create(self, uri): + if self.windowCreate == None: +- create = vmmCreate(self.get_config(), self) + create = vmmCreate(virtman=True,key=0) create.connect("action-show-console", self._do_show_console) - create.connect("action-show-terminal", self._do_show_terminal) - create.connect("action-show-help", self._do_show_help) -- self.connections[uri]["windowCreate"] = create -- self.connections[uri]["windowCreate"].show() + create.connect("vmmcreate-closing", self._vmmcreate_closing) -+ self.windowCreate = create + self.windowCreate = create +- self.windowCreate.show(uri) + self.windowCreate.show() + 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.")) ++ 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 add_connection(self, uri, readOnly=None): + def add_connection(self, uri, readOnly=None, autoconnect=False): conn = vmmConnection(self.get_config(), uri, readOnly) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de