Merge pull request #653 from PyLearner/bug-fix

update pci_hotplug cfg to contain the serial opton when hotplug block

qemu/tests/cfg/pci_hotplug.cfg

@@ -148,7 +148,9 @@
             image_format_stg = qcow2
             reference_cmd = lspci
             find_pci_cmd = 'lspci'
-            pci_test_cmd = "echo PCI_NUM; yes | mke2fs `fdisk -l 2>&1 | awk '/\/dev\/[sv]d[a-z]* doesn/ {print $2}'` | sort | tail -1"
+            blk_extra_params_stg = "serial=TARGET_DISK0"
+            pci_test_cmd = "echo PCI_NUM; yes | mke2fs `fdisk -l 2>&1 | grep "Disk /dev/[vs]d[a-z]" | cut -d" " -f2 | cut -d: -f1 | tail -1`"
+
             Windows:
                 reference_cmd = wmic diskdrive list
                 find_pci_cmd = wmic diskdrive list

qemu/tests/pci_hotplug.py

@@ -114,6 +114,8 @@ def run(test, params, env):
         if not image_format:
             image_format = params.get("image_format", "qcow2")
         image_filename = find_image(pci_num)
+        data_image = params.get("images").split()[-1]
+        serial_id = params["blk_extra_params_%s" % data_image].split("=")[1]
 
         pci_model = params.get("pci_model")
         controller_model = None
@@ -142,13 +144,13 @@ def run(test, params, env):
 
         verify_supported_device(pci_model)
         if drive_cmd_type == "drive_add":
-            driver_add_cmd = ("%s auto file=%s,if=none,format=%s,id=%s" %
+            driver_add_cmd = ("%s auto file=%s,if=none,format=%s,id=%s,serial=%s" %
                               (drive_cmd_type, image_filename, image_format,
-                               pci_info[pci_num][0]))
+                               pci_info[pci_num][0], serial_id))
         elif drive_cmd_type == "__com.redhat_drive_add":
-            driver_add_cmd = ("%s file=%s,format=%s,id=%s" %
+            driver_add_cmd = ("%s file=%s,format=%s,id=%s,serial=%s" %
                               (drive_cmd_type, image_filename, image_format,
-                               pci_info[pci_num][0]))
+                               pci_info[pci_num][0], serial_id))
         # add block device to vm device container
         image_name = img_list[pci_num + 1]
         image_params = params.object_params(image_name)