54 lines
2.3 KiB
Diff
54 lines
2.3 KiB
Diff
|
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)))
|