Accepting request 78157 from Virtualization

Checkin for os12.1 Milestone 4

OBS-URL: https://build.opensuse.org/request/show/78157
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=57
This commit is contained in:
Sascha Peilicke 2011-08-08 13:19:35 +00:00 committed by Git OBS Bridge
commit e439eb9641
5 changed files with 66 additions and 2 deletions

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jul 20 09:02:38 MDT 2011 - carnold@novell.com
- Fix gconf_schemas_prereq in virt-manager.spec file
-------------------------------------------------------------------
Mon Jul 18 15:27:22 MDT 2011 - carnold@novell.com
- KVM: Add support for the qed file format
-------------------------------------------------------------------
Fri Jul 15 15:44:31 MDT 2011 - carnold@novell.com
- KVM now supports the eepro100. Add support in virt-manager for
this nic
virtman-eepro100.diff
-------------------------------------------------------------------
Fri Jul 8 15:15:31 MDT 2011 - carnold@novell.com
@ -127,6 +144,12 @@ Tue May 11 09:26:27 UTC 2010 - seife@opensuse.org
- fix virt-{clone,convert,image,install} by installing the python
libs into the proper directories
-------------------------------------------------------------------
Wed May 5 09:29:36 MDT 2010 - carnold@novell.com
- bnc#602775 - An icon lost in "virt-manager"
virtman-icon.diff
-------------------------------------------------------------------
Mon Apr 26 10:58:32 MDT 2010 - carnold@novell.com

View File

@ -1,5 +1,5 @@
#
# spec file for package virt-manager
# spec file for package virt-manager (Version 0.8.7)
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -54,6 +54,8 @@ Patch56: 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
Patch81: virtinst-cdrom.diff
Patch82: virtinst-storage-ocfs2.diff
ExclusiveArch: %{ix86} x86_64
@ -153,6 +155,8 @@ Authors:
%patch60 -p1
%patch61 -p1
#%patch62 -p1
%patch63 -p1
%patch64 -p1
pushd $RPM_BUILD_DIR/%{virtinst_name}
%patch81 -p1
%patch82 -p1

View File

@ -31,9 +31,10 @@ Index: virt-manager-0.8.7/src/virt-manager.desktop.in.in
@@ -1,9 +1,19 @@
[Desktop Entry]
_Name=Virtual Machine Manager
_Comment=Manage virtual machines
-_Comment=Manage virtual machines
-Icon=::ICONDIR::/::PACKAGE::-icon.svg
-Exec=::PACKAGE::
+_Comment=Manage Virtual Machines for Xen and KVM
+Version=1.0
+Icon=yast-vm-management
+Exec=/usr/bin/virt-manager

12
virtman-eepro100.diff Normal file
View File

@ -0,0 +1,12 @@
Index: virt-manager-0.8.7/src/virtManager/uihelpers.py
===================================================================
--- virt-manager-0.8.7.orig/src/virtManager/uihelpers.py
+++ virt-manager-0.8.7/src/virtManager/uihelpers.py
@@ -215,6 +215,7 @@ def populate_netmodel_combo(vm, combo):
if vm.is_hvm():
mod_list = ["rtl8139", "ne2k_pci", "pcnet", "e1000"]
if vm.get_hv_type() == "kvm":
+ mod_list.append("eepro100")
mod_list.append("virtio")
if vm.get_hv_type() == "xen":
mod_list.append("netfront")

24
virtman-qed.diff Normal file
View File

@ -0,0 +1,24 @@
Index: virt-manager-0.8.7/src/virtManager/uihelpers.py
===================================================================
--- virt-manager-0.8.7.orig/src/virtManager/uihelpers.py
+++ virt-manager-0.8.7/src/virtManager/uihelpers.py
@@ -280,13 +280,16 @@ def build_vnc_keymap_combo(vm, combo, no
#####################################
def build_storage_format_combo(vm, combo):
- ignore = vm
dev_model = gtk.ListStore(str)
combo.set_model(dev_model)
combo.set_text_column(0)
- for m in ["raw", "qcow2", "vmdk"]:
- dev_model.append([m])
+ if vm.get_connection().is_xen():
+ for m in ["raw", "qcow2", "vmdk"]:
+ dev_model.append([m])
+ else:
+ for m in ["raw", "qcow2", "qed", "vmdk"]:
+ dev_model.append([m])
combo.set_active(0)