diff --git a/f30975c3-drop-cow-support.patch b/f30975c3-drop-cow-support.patch new file mode 100644 index 00000000..bc15d1d3 --- /dev/null +++ b/f30975c3-drop-cow-support.patch @@ -0,0 +1,39 @@ +Reference: bsc#947288 +Subject: storage: remove cow as supported format +From: Charles Arnold carnold@suse.com Tue Sep 29 11:25:34 2015 -0600 +Date: Tue Sep 29 16:33:16 2015 -0400: +Git: f30975c3f8e2c009d778f143633c37c5656207f5 + +Support for this format was removed about a year ago from +qemu with this commit, + +commit 550830f9351291c585c963204ad9127998b1c1ce +Author: Stefan Hajnoczi +Date: Tue Sep 16 15:24:24 2014 +0100 + + block: delete cow block driver + +Signed-off-by: Charles Arnold + +Index: virt-manager-1.2.1/virtinst/storage.py +=================================================================== +--- virt-manager-1.2.1.orig/virtinst/storage.py ++++ virt-manager-1.2.1/virtinst/storage.py +@@ -542,7 +542,7 @@ class StorageVolume(_StorageObject): + """ + Base class for building and installing libvirt storage volume xml + """ +- ALL_FORMATS = ["raw", "bochs", "cloop", "cow", "dmg", "iso", "qcow", ++ ALL_FORMATS = ["raw", "bochs", "cloop", "dmg", "iso", "qcow", + "qcow2", "qed", "vmdk", "vpc", "fat", "vhd", "vdi"] + + @staticmethod +@@ -743,7 +743,7 @@ class StorageVolume(_StorageObject): + + def list_create_formats(self): + if self._supports_format(): +- return ["raw", "cow", "qcow", "qcow2", "qed", "vmdk", "vpc", "vdi"] ++ return ["raw", "qcow", "qcow2", "qed", "vmdk", "vpc", "vdi"] + return None + + diff --git a/virt-manager.changes b/virt-manager.changes index caa3fb0a..1af7a2e8 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -3,7 +3,7 @@ Fri Sep 25 15:24:23 MDT 2015 - carnold@suse.com - bsc#947288 - qemu-img doesn't support anymore creating cow format image - virtinst-drop-cow-support.patch + f30975c3-drop-cow-support.patch ------------------------------------------------------------------- Wed Sep 23 10:25:33 MDT 2015 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index 148eef5b..e4b1da63 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -51,6 +51,7 @@ Patch11: 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch Patch12: 360fe110-add-s390x-arch-support.patch Patch13: 590f5a52-urlfetcher-Clear-cached-ftp-connection-on-cleanupLoc.patch Patch14: 601a82cb-fix-console_type-if-xen.patch +Patch15: f30975c3-drop-cow-support.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -90,7 +91,6 @@ Patch160: virtinst-xen-drive-type.patch Patch161: virtinst-xenbus-disk-index-fix.patch Patch162: virtinst-refresh_before_fetch_pool.patch Patch163: virtinst-replace-unar-with-other-archivers.patch -Patch164: virtinst-drop-cow-support.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -187,6 +187,7 @@ machine). %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 # SUSE Only %patch70 -p1 %patch71 -p1 @@ -226,7 +227,6 @@ machine). %patch161 -p1 %patch162 -p1 %patch163 -p1 -%patch164 -p1 %build %if %{qemu_user} diff --git a/virtinst-drop-cow-support.patch b/virtinst-drop-cow-support.patch deleted file mode 100644 index ae2016f2..00000000 --- a/virtinst-drop-cow-support.patch +++ /dev/null @@ -1,22 +0,0 @@ -Reference: bsc#947288 -Qemu no longer supports cow ---- virt-manager-1.2.1/virtinst/storage.py.orig 2015-09-25 15:20:31.450493388 -0600 -+++ virt-manager-1.2.1/virtinst/storage.py 2015-09-25 15:21:26.413011491 -0600 -@@ -542,7 +542,7 @@ class StorageVolume(_StorageObject): - """ - Base class for building and installing libvirt storage volume xml - """ -- ALL_FORMATS = ["raw", "bochs", "cloop", "cow", "dmg", "iso", "qcow", -+ ALL_FORMATS = ["raw", "bochs", "cloop", "dmg", "iso", "qcow", - "qcow2", "qed", "vmdk", "vpc", "fat", "vhd", "vdi"] - - @staticmethod -@@ -748,7 +748,7 @@ class StorageVolume(_StorageObject): - - def list_create_formats(self): - if self._supports_format(): -- return ["raw", "cow", "qcow", "qcow2", "qed", "vmdk", "vpc", "vdi"] -+ return ["raw", "qcow", "qcow2", "qed", "vmdk", "vpc", "vdi"] - return None - -