support for creating scsi disks for virt-convert, for scsi disk run '…

…virt-convert -D vmdkscsi ...', be aware, that qemu-img must be patched with http://tinyurl.com/ct339c
bobmcwhirter · Jan 30, 2009 · fe276e7 · fe276e7
1 parent ce510d4
commit fe276e7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/python-virtinst/virt-convert b/lib/python-virtinst/virt-convert
@@ -235,7 +235,10 @@ def main():
                 format = "vdisk"
 
             elif options.output_format == "vmx":
-                format = "vmdk"
+                if diskcfg.disk_format_names[format] == diskcfg.DISK_FORMAT_VMDK_SCSI:
+                    format = "vmdkscsi"
+                else:
+                    format = "vmdk"
             if not format:
                 format = "raw"
 

diff --git a/lib/python-virtinst/virtconv/diskcfg.py b/lib/python-virtinst/virtconv/diskcfg.py
@@ -29,6 +29,7 @@
 DISK_FORMAT_RAW = 1
 DISK_FORMAT_VMDK = 2
 DISK_FORMAT_VDISK = 3
+DISK_FORMAT_VMDK_SCSI = 4
 
 DISK_TYPE_DISK = 0
 DISK_TYPE_CDROM = 1
@@ -40,19 +41,22 @@
 disk_suffixes = {
     DISK_FORMAT_RAW: ".raw",
     DISK_FORMAT_VMDK: ".vmdk",
+    DISK_FORMAT_VMDK_SCSI: ".vmdk",
     DISK_FORMAT_VDISK: ".vdisk",
 }
 
 qemu_formats = {
     DISK_FORMAT_RAW: "raw",
     DISK_FORMAT_VMDK: "vmdk",
+    DISK_FORMAT_VMDK_SCSI: "vmdkscsi",
     DISK_FORMAT_VDISK: "vdisk",
 }
 
 disk_format_names = {
     "none": DISK_FORMAT_NONE,
     "raw": DISK_FORMAT_RAW,
     "vmdk": DISK_FORMAT_VMDK,
+    "vmdkscsi": DISK_FORMAT_VMDK_SCSI,
     "vdisk": DISK_FORMAT_VDISK,
 }
 
@@ -236,6 +240,7 @@ def convert(self, indir, outdir, output_format):
         if not (out_format == DISK_FORMAT_NONE or
             out_format == DISK_FORMAT_VDISK or
             out_format == DISK_FORMAT_RAW or
+            out_format == DISK_FORMAT_VMDK_SCSI or
             out_format == DISK_FORMAT_VMDK):
             raise NotImplementedError("Cannot convert to disk format %s" %
                 output_format)