Merge pull request #2308 from YongxueHong/bug-1771912

block_hotplug: Fix failed to insert scsi device into specified HBA

qemu/tests/block_hotplug.py

@@ -175,9 +175,8 @@ def run(test, params, env):
     vm.verify_alive()
 
     for iteration in range(int(params.get("repeat_times", 3))):
-        data_imgs_devs = {img: create_block_devices(img) for img in data_imgs}
-        for index, img in enumerate(data_imgs_devs):
-            data_devs = data_imgs_devs[img]
+        for index, img in enumerate(data_imgs):
+            data_devs = create_block_devices(img)
             if need_plug:
                 new_disk = plug_block_devices('hotplug', data_devs).pop()
 

qemu/tests/cfg/block_hotplug.cfg

@@ -128,4 +128,10 @@
         - block_scsi:
             drive_format_stg0 = scsi-hd
             drive_format_stg1 = scsi-hd
+                q35, arm64-pci:
+                    drive_bus_stg0 = 0
+                    drive_bus_stg1 = 1
+                    virtio_scsi:
+                        drive_bus_stg0 = 1
+                        drive_bus_stg1 = 2
             get_disk_pattern = "^/dev/sd[a-z]*$"