block_performance_test:fix mq number count error

Signed-off-by: qingwangrh <[email protected]>

Author: qingwangrh

qemu/tests/block_performance_test.py

@@ -520,11 +520,8 @@ def check_default_mq():
         check_default_mq_cmd = params["check_default_mq_cmd"]
         dev = preprcess_fio_filename("stg2").replace("/dev", "")
         check_default_mq_cmd %= dev
-        output = session.cmd_output(check_default_mq_cmd)
-        logger.debug(output)
-        output = output.split("\n")[0]
-
-        default_mq_nums = len(re.split(r"[ ]+", output))
+        default_mq_nums = int(session.cmd_output(check_default_mq_cmd))
+        logger.debug(default_mq_nums)
         if default_mq_nums != int(params["vcpu_maxcpus"]):
             test.fail(
                 "Default num-queue value(%s) not equal vcpu nums(%s)"

qemu/tests/cfg/block_performance_test.cfg

@@ -118,7 +118,7 @@
             images += ${compare_images} ${extra_images}
             Linux:
                 guest_operation = check_default_mq
-                check_default_mq_cmd = "ls /sys/block/%s/mq/"
+                check_default_mq_cmd = "ls /sys/block/%s/mq/ -p|grep /|wc -l"
             virtio_blk:
                 blk_extra_params_stg0 += ",num-queues=1"
                 blk_extra_params_stg1 += ",num-queues=${vcpu_maxcpus}"