qemu_disk_img: Update the letter of winutils to WIN_UTILS in cmd

Signed-off-by: NPing Li <pingl@redhat.com>

qemu/tests/cfg/qemu_disk_img.cfg

@@ -13,9 +13,9 @@
     md5sum_bin = "md5sum"
     Windows:
         x86_64:
-            sync_bin = X:\Sync\sync64.exe /accepteula
+            sync_bin = WIN_UTILS:\Sync\sync64.exe /accepteula
         i386, i686:
-            sync_bin = X:\Sync\sync.exe /accepteula
+            sync_bin = WIN_UTILS:\Sync\sync.exe /accepteula
     force_create_image = no
     backup_image_before_testing = yes
     restore_image_before_testing = yes

qemu/tests/qemu_disk_img.py

@@ -106,9 +106,7 @@ class QemuImgTest(qemu_storage.QemuImg):
         self.__create_file(dst)
         session = self.vm.wait_for_login(timeout=login_timeout)
         logging.info("sync guest data")
-        if "X:" in cmd:
-            vol = utils_misc.get_winutils_vol(session)
-            cmd = cmd.replace("X:", "%s:" % vol)
+        cmd = utils_misc.set_winutils_letter(session, cmd)
         status, output = session.cmd_status_output(cmd)
         if status != 0:
             logging.error("Execute '%s' with failures('%s') " % (cmd, output))