kvm: Allow to pick disk_cache and disk_aio freely

  Up to some extent we would like to set diskcache=none and diskaio=native

software/kvm/software.cfg

@@ -186,7 +186,7 @@ ignore-existing = true
 url = ${:_profile_base_location_}/template/template-kvm-run.in
 mode = 644
 filename = template-kvm-run.in
-md5sum = 4123fa5d59edaeb31f0e8b5efad605c7 
+md5sum = bc09717dd86063a558b125f43905b4a4
 download-only = true
 on-update = true
 

software/kvm/template/template-kvm-run.in

@@ -63,12 +63,11 @@ language_list = ['ar', 'da', 'de', 'de-ch', 'en-gb', 'en-us', 'es', 'et', 'fi',
 url_check_certificate = '{{ parameter_dict.get("hard-drive-url-check-certificate", "true") }}'.lower()
 auto_ballooning = '{{ parameter_dict.get("auto-ballooning") }}' in ('true', 'True', '1')
 vm_name = '{{ parameter_dict.get("name") }}'
-disk_cache = '{{ parameter_dict.get("disk-cache") }}'.strip()
+disk_cache = '{{ parameter_dict.get("disk-cache", "writeback") }}'.strip()
 disk_cache = disk_cache if disk_cache in ["none", "writeback", "unsafe", 
               "directsync", "writethrough"] else "writeback"
-disk_aio = '{{ parameter_dict.get("disk-aio") }}'.strip()
-disk_aio = disk_aio if disk_aio in ["threads", "native"] and \
-              disk_cache == "directsync" else "threads"
+disk_aio = '{{ parameter_dict.get("disk-aio", "threads") }}'.strip()
+disk_aio = disk_aio if disk_aio in ["threads", "native"] else "threads"
 smp_count = {{ parameter_dict.get("smp-count") }}
 smp_max_count = {{ parameter_dict.get("smp-max-count") }}
 machine_options = '{{ parameter_dict.get("machine-options", "") }}'.strip()