From 5153879b1dd80ab8a16ff0b06319ac7d6eb9be82 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 11 Jul 2011 10:23:45 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/virt-manager revision 56.0 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=2003359caeb56eb2bfd96ab46dc2b803 --- virt-manager.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virt-manager.spec b/virt-manager.spec index 3bafd36e..d1d52e10 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,5 +1,5 @@ # -# spec file for package virt-manager (Version 0.8.7) +# spec file for package virt-manager # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,7 +30,7 @@ Name: virt-manager Summary: Virtual Machine Manager Version: 0.8.7 -Release: 1 +Release: 3 Group: System/Monitoring License: LGPLv2.1+ Url: http://virt-manager.et.redhat.com From 6ac959ff96498ef5180dfba71aaea8b4796ee893 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Fri, 5 Aug 2011 20:38:31 +0000 Subject: [PATCH 2/2] - Fix gconf_schemas_prereq in virt-manager.spec file - KVM: Add support for the qed file format - KVM now supports the eepro100. Add support in virt-manager for this nic virtman-eepro100.diff - bnc#602775 - An icon lost in "virt-manager" virtman-icon.diff OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=55 --- virt-manager.changes | 23 +++++++++++++++++++++++ virt-manager.spec | 6 +++++- virtman-desktop.diff | 3 ++- virtman-eepro100.diff | 12 ++++++++++++ virtman-qed.diff | 24 ++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 virtman-eepro100.diff create mode 100644 virtman-qed.diff diff --git a/virt-manager.changes b/virt-manager.changes index b45dd08e..0330c6d7 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -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 diff --git a/virt-manager.spec b/virt-manager.spec index d1d52e10..73b88531 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -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 diff --git a/virtman-desktop.diff b/virtman-desktop.diff index a93dea98..9c402058 100644 --- a/virtman-desktop.diff +++ b/virtman-desktop.diff @@ -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 diff --git a/virtman-eepro100.diff b/virtman-eepro100.diff new file mode 100644 index 00000000..32f87614 --- /dev/null +++ b/virtman-eepro100.diff @@ -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") diff --git a/virtman-qed.diff b/virtman-qed.diff new file mode 100644 index 00000000..8664a297 --- /dev/null +++ b/virtman-qed.diff @@ -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) +