Merge pull request #2287 from YongxueHong/for-nvme-fio

fio: Support nvme storage backend

qemu/tests/cfg/fio_linux.cfg

@@ -17,6 +17,10 @@
     fio_options += '${fio_default_options} --rw=randrw'
     s390x:
         fio_install_timeout = 600
+    nvme_direct:
+        fio_filename = '/home/test'
+        boot_drive_stg0 = no
+        force_create_image_stg0 = no
     variants:
         - aio_native:
             image_aio_stg0 = native

qemu/tests/cfg/fio_windows.cfg

@@ -9,6 +9,10 @@
     disk_index = 1
     disk_letter = I
     fio_file_name = "C\:\\fio_system_disk_test:I\:\\fio_data_disk_test"
+    nvme_direct:
+        fio_file_name = "C\:\\fio_system_disk_test
+        boot_drive_disk1 = no
+        force_create_image_disk1 = no
     fio_log_file = "C:\fio_log.txt"
     cmd_timeout = 300
     variants:

qemu/tests/fio_linux.py

@@ -40,6 +40,10 @@ def run(test, params, env):
                 test.error("Failed to get '%s' drive path" % data_image)
             yield drive_path[5:]
 
+    def _run_fio_test(target):
+        for option in params['fio_options'].split(';'):
+            fio.run('--filename=%s %s' % (target, option))
+
     data_images = params["images"].split()[1:]
     info = []
     for image in data_images:
@@ -53,9 +57,11 @@ def run(test, params, env):
     session = vm.wait_for_login(timeout=float(params.get("login_timeout", 240)))
     fio = generate_instance(params, vm, 'fio')
     try:
-        for did in _get_data_disks():
-            for option in params['fio_options'].split(';'):
-                fio.run('--filename=%s %s' % (did, option))
+        if params.get('image_backend') == 'nvme_direct':
+            _run_fio_test(params.get('fio_filename'))
+        else:
+            for did in _get_data_disks():
+                _run_fio_test(did)
     finally:
         fio.clean()
         session.close()

qemu/tests/fio_windows.py

@@ -33,9 +33,10 @@ def run(test, params, env):
     vm.verify_alive()
     session = vm.wait_for_login(timeout=timeout)
 
-    error_context.context("Format disk", logging.info)
-    utils_misc.format_windows_disk(session, params["disk_index"],
-                                   mountpoint=params["disk_letter"])
+    if not params.get('image_backend') == 'nvme_direct':
+        error_context.context("Format disk", logging.info)
+        utils_misc.format_windows_disk(session, params["disk_index"],
+                                       mountpoint=params["disk_letter"])
     try:
         installed = session.cmd_status(check_installed_cmd) == 0
         if not installed: