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

- Remove the virt-install sources from the virt-manager package.

Browse Source 
The virt-install applications are now found in python-virtinst.

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=87
This commit is contained in:
Charles Arnold 2012-02-03 20:08:14 +00:00 committed by Git OBS Bridge
parent d9d300204b
commit 3481d2d3d4
9 changed files with 56 additions and 515 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
virt-manager.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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

117
virt-manager.spec
View File

@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
%define gsysconfdir /etc
%define gconftool /usr/bin/gconftool-2
%define virtinst_maj 0
@ -33,96 +32,55 @@ Version: 0.9.1
Release: 0
Url: http://virt-manager.et.redhat.com
Source0: virt-manager-%{version}.tar.bz2
Source1: %{virtinst_name}.tar.bz2
# see https://bugzilla.redhat.com/show_bug.cgi?id=620216,
# https://bugzilla.novell.com/show_bug.cgi?id=641981
Patch50: virtman-desktop.diff
Patch51: virtman-vminstall.diff
Patch52: virtman-cdrom.diff
Patch53: virtman-kvm.diff
Patch54: virtman-help.diff
Patch55: virtman-keycombo.diff
Patch56: virtman-autoconnect.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-reverse-git-tooltip.patch
Patch150: virtinst-cdrom.diff
Patch151: virtinst-storage-ocfs2.diff
Patch152: virtinst-qed.diff
Patch66: virtman-slow-mouse.diff
ExclusiveArch: %{ix86} x86_64
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
#
#rpmlint BuildRequires: python
BuildRequires: gettext
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: python-devel
BuildRequires: scrollkeeper
#rpmlint BuildRequires: python-gtk
BuildRequires: python-gtk-devel
BuildRequires: python-gobject2-devel
BuildRequires: gconf2-devel
BuildRequires: desktop-file-utils
BuildRequires: gconf2-devel
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: scrollkeeper
BuildRequires: update-desktop-files
# virtinst BuildRequires
BuildRequires: libxml2-python
BuildRequires: python-urlgrabber
#BuildRequires: libvirt-python
#
# Requires: pygtk2 >= 1.99.12-6
Requires: python-gtk
# Requires: gnome-python2-gconf >= 1.99.11-7
Requires: python-gnome
# Absolutely require this version or newer
Requires: libvirt-python >= 0.7.0
Requires: vm-install >= 0.5.6
# Definitely does not work with earlier due to python API changes
# Requires: dbus-python >= 0.61
Requires: dbus-1-python
Requires: dbus-1-x11
#Requires: gnome-keyring >= 0.4.9
Requires: gnome-keyring
# Minimum we've tested with
# Although if you don't have this, comment it out and the app
# will work just fine - keyring functionality will simply be
# disabled
# Requires: gnome-python2-gnomekeyring >= 2.15.4
# Requires: gnome-python2-gnomevfs >= 2.15.4
Requires: libxml2-python >= 2.6.23
# Required to install Xen & QEMU guests
# Requires: python-virtinst >= 0.300.2
# Required for loading the glade UI
# Requires: pygtk2-libglade
# Required for our graphics which are currently SVG format
# Earlier vte had broken python binding module
# Requires: vte >= 0.12.2
%ifarch x86_64
Requires: vtemodule.so()(64bit)
%else
Requires: vtemodule.so
%endif
# For online help
Requires: scrollkeeper
# For console widget
# Requires: gtk-vnc-python
Requires: python-gtk-vnc
# Requires: librsvg added to avoid problems with minimal template
Requires: librsvg
Requires: netcat-openbsd
# Add requires for non Xen installations
Requires: python-urlgrabber
Requires: vm-install
#Requires: spice-gtk
Provides: python-virtinst
Requires: python-virtinst == %{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
%description
Virtual Machine Manager provides a graphical tool for administering
virtual machines.
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.
@ -134,51 +92,35 @@ Authors:
%prep
%setup -q
%setup -b 1
%patch50 -p1
%patch51 -p1
%patch52 -p1
%patch53 -p1
#%patch54 -p1
%patch54 -p1
%patch55 -p1
%patch56 -p1
%patch60 -p1
%patch61 -p1
#%patch62 -p1
%patch63 -p1
%patch64 -p1
%patch65 -p1
#%patch66 -p1
pushd $RPM_BUILD_DIR/%{virtinst_name}
%patch150 -p1
%patch151 -p1
%patch152 -p1
popd
# sed -i -e "s@sr\@Latn@sr\@latin@" configure
# mv po/sr@Latn.po po/sr@latin.po
%patch66 -p1
%build
# autoreconf -i
%configure --sysconfdir=%{gsysconfdir}
make %{?_smp_mflags}
pushd $RPM_BUILD_DIR/%{virtinst_name}
python setup.py build
popd
%install
make install DESTDIR=$RPM_BUILD_ROOT
pushd $RPM_BUILD_DIR/%{virtinst_name}
python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --install-lib=%{pysite}/
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
popd
# Unsupport languages:
rm -rf $RPM_BUILD_ROOT/usr/share/locale/or
%find_gconf_schemas
for lang_file in %{name} virtinst
do
%find_lang $lang_file single_lang_file.lang
done
cat %{name}.schemas_list single_lang_file.lang > %{name}.lst
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
@ -201,10 +143,6 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
%doc COPYING AUTHORS ChangeLog
%{_bindir}/%{name}
%{_bindir}/%{name}-tui
%{_bindir}/virt-clone
%{_bindir}/virt-convert
%{_bindir}/virt-image
%{_bindir}/virt-install
%{_libexecdir}/%{name}-launch
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*.glade
@ -225,24 +163,9 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
%{_datadir}/%{name}/virtManager/*.py
%{_datadir}/%{name}/virtManagerTui/*.py
%{_datadir}/%{name}/virtManagerTui/importblacklist/*.py
%dir %{pysite}/virtinst
%{pysite}/virtinst/*.py
%{pysite}/virtinst/*.pyc
%{_datadir}/applications/YaST2/%{name}.desktop
%{_datadir}/dbus-1/services/%{name}.service
%{_mandir}/man1/%{name}.1*
%{_mandir}/man1/virt-clone.1*
%{_mandir}/man1/virt-convert.1*
%{_mandir}/man1/virt-image.1*
%{_mandir}/man1/virt-install.1*
%{_mandir}/man5/virt-image.5*
%dir %{pysite}/virtconv
%{pysite}/virtconv/*.py
%{pysite}/virtconv/*.pyc
%dir %{pysite}/virtconv/parsers
%{pysite}/virtconv/parsers/*.py
%{pysite}/virtconv/parsers/*.pyc
%{pysite}/%{virtinst_name}-py2.?.egg-info
# FIXME: autobuild complains that these are unowned (not true...)
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/services

3
virtinst-0.600.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:958bae29dd07e194097a54d0a467f510ccf027c00a032f5db323b802583b742d
size 7986321

30
virtinst-cdrom.diff
View File

@ -1,30 +0,0 @@
Index: virtinst-0.600.1/virtinst/VirtualDisk.py
===================================================================
--- virtinst-0.600.1.orig/virtinst/VirtualDisk.py
+++ virtinst-0.600.1/virtinst/VirtualDisk.py
@@ -1735,7 +1735,7 @@ class VirtualDisk(VirtualDevice):
if maxnode > (26 * 26 * 26):
raise RuntimeError("maxnode value is too high")
- # Regular scanning
+ # Start cdrom at 'c' and skip 'c' for non-cdrom
for i in range(1, maxnode + 1):
gen_t = prefix
@@ -1761,8 +1761,14 @@ class VirtualDisk(VirtualDevice):
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:

96
virtinst-qed.diff
View File

@ -1,96 +0,0 @@
Index: virtinst-0.600.1/virtinst/VirtualDisk.py
===================================================================
--- virtinst-0.600.1.orig/virtinst/VirtualDisk.py
+++ virtinst-0.600.1/virtinst/VirtualDisk.py
@@ -295,10 +295,11 @@ class VirtualDisk(VirtualDevice):
DRIVER_TAP_RAW = "aio"
DRIVER_TAP_QCOW = "qcow"
+ DRIVER_TAP_QED = "qed"
DRIVER_TAP_VMDK = "vmdk"
DRIVER_TAP_VDISK = "vdisk"
driver_types = [DRIVER_TAP_RAW, DRIVER_TAP_QCOW,
- DRIVER_TAP_VMDK, DRIVER_TAP_VDISK]
+ DRIVER_TAP_QED, DRIVER_TAP_VMDK, DRIVER_TAP_VDISK]
CACHE_MODE_NONE = "none"
CACHE_MODE_WRITETHROUGH = "writethrough"
Index: virtinst-0.600.1/virtinst/ImageParser.py
===================================================================
--- virtinst-0.600.1.orig/virtinst/ImageParser.py
+++ virtinst-0.600.1/virtinst/ImageParser.py
@@ -200,6 +200,7 @@ class Disk:
FORMAT_ISO = "iso"
FORMAT_QCOW = "qcow"
FORMAT_QCOW2 = "qcow2"
+ FORMAT_QED = "qed"
FORMAT_VMDK = "vmdk"
USE_SYSTEM = "system"
@@ -227,7 +228,7 @@ class Disk:
csumtype = xpathString(d, "@type")
csumvalue = xpathString(d, "")
self.csum[csumtype] = csumvalue
- formats = [Disk.FORMAT_RAW, Disk.FORMAT_QCOW, Disk.FORMAT_QCOW2, Disk.FORMAT_VMDK, Disk.FORMAT_ISO]
+ formats = [Disk.FORMAT_RAW, Disk.FORMAT_QCOW, Disk.FORMAT_QCOW2, Disk.FORMAT_QED, Disk.FORMAT_VMDK, Disk.FORMAT_ISO]
validate(formats.count(self.format) > 0,
_("The format for disk %s must be one of %s") %
(self.file, ",".join(formats)))
Index: virtinst-0.600.1/virtconv/diskcfg.py
===================================================================
--- virtinst-0.600.1.orig/virtconv/diskcfg.py
+++ virtinst-0.600.1/virtconv/diskcfg.py
@@ -35,6 +35,7 @@ DISK_FORMAT_VDISK = 3
DISK_FORMAT_QCOW = 4
DISK_FORMAT_QCOW2 = 5
DISK_FORMAT_COW = 6
+DISK_FORMAT_QED = 7
DISK_TYPE_DISK = 0
DISK_TYPE_CDROM = 1
@@ -50,6 +51,7 @@ disk_suffixes = {
DISK_FORMAT_QCOW: ".qcow",
DISK_FORMAT_QCOW2: ".qcow2",
DISK_FORMAT_COW: ".cow",
+ DISK_FORMAT_QED: ".qed",
}
qemu_formats = {
@@ -59,6 +61,7 @@ qemu_formats = {
DISK_FORMAT_QCOW: "qcow",
DISK_FORMAT_QCOW2: "qcow2",
DISK_FORMAT_COW: "cow",
+ DISK_FORMAT_QED: "qed",
}
disk_format_names = {
@@ -69,6 +72,7 @@ disk_format_names = {
"qcow": DISK_FORMAT_QCOW,
"qcow2": DISK_FORMAT_QCOW2,
"cow": DISK_FORMAT_COW,
+ "qed": DISK_FORMAT_QED,
}
checksum_types = {
@@ -260,7 +264,8 @@ class disk(object):
out_format == DISK_FORMAT_VMDK or
out_format == DISK_FORMAT_QCOW or
out_format == DISK_FORMAT_QCOW2 or
- out_format == DISK_FORMAT_COW):
+ out_format == DISK_FORMAT_COW or
+ out_format == DISK_FORMAT_QED):
raise NotImplementedError(_("Cannot convert to disk format %s") %
output_format)
Index: virtinst-0.600.1/virtconv/parsers/virtimage.py
===================================================================
--- virtinst-0.600.1.orig/virtconv/parsers/virtimage.py
+++ virtinst-0.600.1/virtconv/parsers/virtimage.py
@@ -246,6 +246,7 @@ class virtimage_parser(formats.parser):
ImageParser.Disk.FORMAT_VMDK: diskcfg.DISK_FORMAT_VMDK,
ImageParser.Disk.FORMAT_QCOW: diskcfg.DISK_FORMAT_QCOW,
ImageParser.Disk.FORMAT_QCOW2: diskcfg.DISK_FORMAT_QCOW2,
+ ImageParser.Disk.FORMAT_QED: diskcfg.DISK_FORMAT_QED,
}
fmt = None

13
virtinst-storage-ocfs2.diff
View File

@ -1,13 +0,0 @@
Index: virtinst-0.600.1/virtinst/Storage.py
===================================================================
--- virtinst-0.600.1.orig/virtinst/Storage.py
+++ virtinst-0.600.1/virtinst/Storage.py
@@ -534,7 +534,7 @@ class FilesystemPool(StoragePool):
get_volume_class = staticmethod(get_volume_class)
formats = [ "auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf",
- "gfs", "gfs2", "vfat", "hfs+", "xfs" ]
+ "gfs", "gfs2", "vfat", "hfs+", "xfs", "ocfs2" ]
# Register applicable property methods from parent class
perms = property(StorageObject.get_perms, StorageObject.set_perms)

225
virtman-help.diff
View File

@ -1,225 +0,0 @@
Index: virt-manager-0.8.5/help/virt-manager/C/virt-manager.xml
===================================================================
--- virt-manager-0.8.5.orig/help/virt-manager/C/virt-manager.xml
+++ virt-manager-0.8.5/help/virt-manager/C/virt-manager.xml
@@ -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 &mdash; disk and network access, for
- example &mdash; 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 &quot;Finish&quot; 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 &quot;vm-install&quot;.</para>
</sect1>
</article>

51
virtman-reverse-git-tooltip.patch
View File

@ -1,51 +0,0 @@
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.0/src/virtManager/manager.py
===================================================================
--- virt-manager-0.9.0.orig/src/virtManager/manager.py
+++ virt-manager-0.9.0/src/virtManager/manager.py
@@ -726,9 +726,6 @@ class vmmManager(vmmGObjectUI):
def _build_vm_row(self, vm):
row = []
- desc = None
- if vm.get_description() is not None:
- desc = util.xml_escape(vm.get_description())
row.insert(ROW_HANDLE, vm)
row.insert(ROW_NAME, vm.get_name())
@@ -736,7 +733,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, desc)
+ 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)
@@ -872,10 +869,6 @@ class vmmManager(vmmGObjectUI):
if self.vm_row_key(vm) not in self.rows:
return
- desc = None
- if vm.get_description() is not None:
- desc = util.xml_escape(vm.get_description())
-
row = self.rows[self.vm_row_key(vm)]
row[ROW_NAME] = vm.get_name()
row[ROW_STATUS] = vm.run_status()
@@ -884,7 +877,7 @@ class vmmManager(vmmGObjectUI):
row[ROW_MARKUP] = self._build_vm_markup(row)
if config_changed:
- row[ROW_HINT] = desc
+ row[ROW_HINT] = vm.get_description()
model.row_changed(row.path, row.iter)

30
virtman-slow-mouse.diff Normal file
View File

@ -0,0 +1,30 @@
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.1/src/virtManager/manager.py
===================================================================
--- virt-manager-0.9.1.orig/src/virtManager/manager.py
+++ virt-manager-0.9.1/src/virtManager/manager.py
@@ -756,7 +756,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)
@@ -900,7 +900,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)