Add qcow2 format to export options

disk.py

@@ -38,7 +38,6 @@ class Disk(object):
     TYPES = ['snapshot', 'normal']
     TYPES = ['snapshot', 'normal']
     FORMATS = ['qcow2', 'raw', 'iso']
     FORMATS = ['qcow2', 'raw', 'iso']
     CREATE_FORMATS = ['qcow2', 'raw']
     CREATE_FORMATS = ['qcow2', 'raw']
-    EXPORT_FORMATS = ['vdi', 'vpc', 'vmdk']
 
 
     def __init__(self, dir, name, format, type, size,
     def __init__(self, dir, name, format, type, size,
                  base_name, actual_size=0):
                  base_name, actual_size=0):
@@ -267,13 +266,11 @@ class Disk(object):
                                 "iso files are allowed. Image from: %s" % url)
                                 "iso files are allowed. Image from: %s" % url)
 
 
     def export(self, format):
     def export(self, format):
-        if format not in self.EXPORT_FORMATS:
-            raise Exception('Invalid export format: %s' % format)
-
         format_dict = {
         format_dict = {
+            'vmdk': 'vmdk',
+            'qcow2': 'qcow2',
             'vdi': 'vdi',
             'vdi': 'vdi',
             'vpc': 'vhd',
             'vpc': 'vhd',
-            'vmdk': 'vmdk',
         }
         }
         cmdline = ['qemu-img',
         cmdline = ['qemu-img',
                    'convert',
                    'convert',