ae026a575b
* Merged code with python-virtinst. virtinst is no longer public * Port from GTK2 to GTK3 (Daniel Berrange, Cole Robinson) * Port from gconf to gsettings * Port from autotools to python distutils * Remove virt-manager-tui * Remove HAL support * IPv6 and static route virtual network support (Gene Czarcinski) * virt-install: Add –cpu host-passthrough (Ken ICHIKAWA, Hu Tao) OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=129
96 lines
3.3 KiB
Diff
96 lines
3.3 KiB
Diff
Index: virt-manager-0.10.0/virtinst/VirtualDisk.py
|
|
===================================================================
|
|
--- virt-manager-0.10.0.orig/virtinst/VirtualDisk.py
|
|
+++ virt-manager-0.10.0/virtinst/VirtualDisk.py
|
|
@@ -306,10 +306,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: virt-manager-0.10.0/virtinst/ImageParser.py
|
|
===================================================================
|
|
--- virt-manager-0.10.0.orig/virtinst/ImageParser.py
|
|
+++ virt-manager-0.10.0/virtinst/ImageParser.py
|
|
@@ -208,6 +208,7 @@ class Disk:
|
|
FORMAT_ISO = "iso"
|
|
FORMAT_QCOW = "qcow"
|
|
FORMAT_QCOW2 = "qcow2"
|
|
+ FORMAT_QED = "qed"
|
|
FORMAT_VMDK = "vmdk"
|
|
FORMAT_VDI = "vdi"
|
|
|
|
@@ -239,6 +240,7 @@ class Disk:
|
|
formats = [Disk.FORMAT_RAW,
|
|
Disk.FORMAT_QCOW,
|
|
Disk.FORMAT_QCOW2,
|
|
+ Disk.FORMAT_QED,
|
|
Disk.FORMAT_VMDK,
|
|
Disk.FORMAT_ISO,
|
|
Disk.FORMAT_VDI]
|
|
Index: virt-manager-0.10.0/virtconv/diskcfg.py
|
|
===================================================================
|
|
--- virt-manager-0.10.0.orig/virtconv/diskcfg.py
|
|
+++ virt-manager-0.10.0/virtconv/diskcfg.py
|
|
@@ -36,6 +36,7 @@ DISK_FORMAT_QCOW = 4
|
|
DISK_FORMAT_QCOW2 = 5
|
|
DISK_FORMAT_COW = 6
|
|
DISK_FORMAT_VDI = 7
|
|
+DISK_FORMAT_QED = 8
|
|
|
|
DISK_TYPE_DISK = 0
|
|
DISK_TYPE_CDROM = 1
|
|
@@ -52,6 +53,7 @@ disk_suffixes = {
|
|
DISK_FORMAT_QCOW2: ".qcow2",
|
|
DISK_FORMAT_COW: ".cow",
|
|
DISK_FORMAT_VDI: ".vdi",
|
|
+ DISK_FORMAT_QED: ".qed",
|
|
}
|
|
|
|
qemu_formats = {
|
|
@@ -62,6 +64,7 @@ qemu_formats = {
|
|
DISK_FORMAT_QCOW2: "qcow2",
|
|
DISK_FORMAT_COW: "cow",
|
|
DISK_FORMAT_VDI: "vdi",
|
|
+ DISK_FORMAT_QED: "qed",
|
|
}
|
|
|
|
disk_format_names = {
|
|
@@ -73,6 +76,7 @@ disk_format_names = {
|
|
"qcow2": DISK_FORMAT_QCOW2,
|
|
"cow": DISK_FORMAT_COW,
|
|
"vdi": DISK_FORMAT_VDI,
|
|
+ "qed": DISK_FORMAT_QED,
|
|
}
|
|
|
|
checksum_types = {
|
|
@@ -268,7 +272,8 @@ class disk(object):
|
|
out_format == DISK_FORMAT_VMDK or
|
|
out_format == DISK_FORMAT_QCOW or
|
|
out_format == DISK_FORMAT_QCOW2 or
|
|
- out_format == DISK_FORMAT_COW):
|
|
+ out_format == DISK_FORMAT_COW or
|
|
+ out_format == DISK_FORMAT_QED):
|
|
raise NotImplementedError(_("Cannot convert to disk format %s") %
|
|
output_format)
|
|
|
|
Index: virt-manager-0.10.0/virtconv/parsers/virtimage.py
|
|
===================================================================
|
|
--- virt-manager-0.10.0.orig/virtconv/parsers/virtimage.py
|
|
+++ virt-manager-0.10.0/virtconv/parsers/virtimage.py
|
|
@@ -250,6 +250,7 @@ class virtimage_parser(formats.parser):
|
|
ImageParser.Disk.FORMAT_QCOW: diskcfg.DISK_FORMAT_QCOW,
|
|
ImageParser.Disk.FORMAT_QCOW2: diskcfg.DISK_FORMAT_QCOW2,
|
|
ImageParser.Disk.FORMAT_VDI: diskcfg.DISK_FORMAT_VDI,
|
|
+ ImageParser.Disk.FORMAT_QED: diskcfg.DISK_FORMAT_QED,
|
|
}
|
|
|
|
fmt = None
|