diff --git a/virt-manager.changes b/virt-manager.changes index e8425b33..4c553ba8 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 21 11:29:17 MDT 2011 - carnold@novell.com + +- KVM: Add missing qed support to virtinst + ------------------------------------------------------------------- Wed Sep 21 09:40:09 MDT 2011 - carnold@novell.com diff --git a/virt-manager.spec b/virt-manager.spec index 16b5e554..be5cc936 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -77,6 +77,7 @@ Patch108: virtinst-error-message-fix.diff Patch109: virtinst-typo-fix.diff Patch110: virtinst-cdrom.diff Patch111: virtinst-storage-ocfs2.diff +Patch112: virtinst-qed.diff ExclusiveArch: %{ix86} x86_64 BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -198,6 +199,7 @@ pushd $RPM_BUILD_DIR/%{virtinst_name} %patch109 -p1 %patch110 -p1 %patch111 -p1 +%patch112 -p1 popd # sed -i -e "s@sr\@Latn@sr\@latin@" configure # mv po/sr@Latn.po po/sr@latin.po diff --git a/virtinst-qed.diff b/virtinst-qed.diff new file mode 100644 index 00000000..670b50bb --- /dev/null +++ b/virtinst-qed.diff @@ -0,0 +1,53 @@ +Index: virtinst-0.600.0/virtinst/Storage.py +=================================================================== +--- virtinst-0.600.0.orig/virtinst/Storage.py ++++ virtinst-0.600.0/virtinst/Storage.py +@@ -1291,8 +1291,8 @@ class FileVolume(StorageVolume): + _file_type = VIR_STORAGE_VOL_FILE + + formats = ["raw", "bochs", "cloop", "cow", "dmg", "iso", "qcow", +- "qcow2", "vmdk", "vpc"] +- create_formats = ["raw", "cow", "qcow", "qcow2", "vmdk", "vpc"] ++ "qcow2", "qed", "vmdk", "vpc"] ++ create_formats = ["raw", "cow", "qcow", "qcow2", "qed", "vmdk", "vpc"] + + # Register applicable property methods from parent class + perms = property(StorageObject.get_perms, StorageObject.set_perms) +Index: virtinst-0.600.0/virtinst/VirtualDisk.py +=================================================================== +--- virtinst-0.600.0.orig/virtinst/VirtualDisk.py ++++ virtinst-0.600.0/virtinst/VirtualDisk.py +@@ -292,10 +292,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.0/virtinst/ImageParser.py +=================================================================== +--- virtinst-0.600.0.orig/virtinst/ImageParser.py ++++ virtinst-0.600.0/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)))