Merge pull request #2231 from wangxianxian/slof_scsiid

slof_user_interface: Add two cases for slof

qemu/tests/cfg/slof_user_interface.cfg

@@ -18,59 +18,87 @@
     only ppc64le ppc64
     only Linux
     # Select one drive format since just test slof user interface.
-    only virtio_scsi
-    no spapr_vscsi
     variants:
         - send_f12:
-            virtio_scsi_pci_addr_image1 =  0xe
-            bus_extra_params_image1 = 'addr=${virtio_scsi_pci_addr_image1}'
-            images += " stg0 stg1"
-            drive_pci_addr_stg0 = 8
-            drive_format_stg0 = virtio
-            image_name_stg0 = images/stg0
-            image_size_stg0 = 25G
-            remove_image_stg0 = yes
-            force_create_image_stg0 = yes
-            spapr_vscsi_reg =  0x71000001
-            scsi_hba_stg1 = spapr-vscsi
-            bus_extra_params_stg1 = 'reg=${spapr_vscsi_reg}'
-            image_name_stg1 = images/stg1
-            image_size_stg1 = 25G
-            remove_image_stg1 = yes
-            force_create_image_stg1 = yes
+            send_keys = 'f12'
+            start_f12 = 'Select boot device'
+            end_f12 = ' net : '
+            start_select = 'Trying to load'
+            end_select = 'Successfully loaded'
             cdroms = 'cd1'
             cdrom_cd1 = /tmp/new.iso
             pre_command_noncritical = no
             pre_command = 'dd if=/dev/urandom of=/tmp/new bs=10M count=1 &&'
             pre_command += ' mkisofs -o /tmp/new.iso /tmp/new'
             post_command = "rm -rf /tmp/new.iso /tmp/new"
-            virtio_scsi_pci_addr_cd1 =  0xb
-            drive_bus_cd1 = 1
-            bus_extra_params_cd1 = 'addr=${virtio_scsi_pci_addr_cd1}'
-            virtio_net:
-                nic_pci_addr_nic1 = 0xa
-                menu_option5 = "net pci ethernet ${nic_pci_addr_nic1}"
-            spapr-vlan:
-                spapr_vlan_reg = 0x71000003
-                nic_extra_params_nic1 = 'reg=${spapr_vlan_reg}'
-                menu_option5 = "net vdevice l-lan ${spapr_vlan_reg}"
-            send_keys = 'f12'
-            start_f12 = 'Select boot device'
-            end_f12 = ' net : '
-            start_select = 'Trying to load'
-            end_select = 'Successfully loaded'
-            boot_dev_num = 5
-            menu_option1 = "cdrom pci scsi ${virtio_scsi_pci_addr_cd1}"
-            menu_option2 = "disk pci scsi ${drive_pci_addr_stg0}"
-            menu_option3 = "disk pci scsi ${virtio_scsi_pci_addr_image1}"
-            menu_option4 = "disk vdevice v-scsi ${spapr_vscsi_reg}"
-            bootable_index = 3
+            nic_pci_addr_nic1 = 0xa
+            variants:
+                - @default:
+                    only virtio_scsi
+                    virtio_scsi_pci_addr_image1 =  0xe
+                    bus_extra_params_image1 = 'addr=${virtio_scsi_pci_addr_image1}'
+                    images += " stg0 stg1"
+                    drive_pci_addr_stg0 = 8
+                    drive_format_stg0 = virtio
+                    image_name_stg0 = images/stg0
+                    image_size_stg0 = 25G
+                    remove_image_stg0 = yes
+                    force_create_image_stg0 = yes
+                    spapr_vscsi_reg =  0x71000001
+                    scsi_hba_stg1 = spapr-vscsi
+                    bus_extra_params_stg1 = 'reg=${spapr_vscsi_reg}'
+                    image_name_stg1 = images/stg1
+                    image_size_stg1 = 25G
+                    remove_image_stg1 = yes
+                    force_create_image_stg1 = yes
+                    virtio_scsi_pci_addr_cd1 =  0xb
+                    drive_bus_cd1 = 1
+                    bus_extra_params_cd1 = 'addr=${virtio_scsi_pci_addr_cd1}'
+                    virtio_net:
+                        menu_option5 = "net pci ethernet ${nic_pci_addr_nic1}"
+                    spapr-vlan:
+                        spapr_vlan_reg = 0x71000003
+                        nic_extra_params_nic1 = 'reg=${spapr_vlan_reg}'
+                        menu_option5 = "net vdevice l-lan ${spapr_vlan_reg}"
+                    boot_dev_num = 5
+                    menu_option1 = "cdrom pci scsi ${virtio_scsi_pci_addr_cd1}"
+                    menu_option2 = "disk pci scsi ${drive_pci_addr_stg0}"
+                    menu_option3 = "disk pci scsi ${virtio_scsi_pci_addr_image1}"
+                    menu_option4 = "disk vdevice v-scsi ${spapr_vscsi_reg}"
+                    bootable_index = 3
+                - with_vscsi_cdrom:
+                    only spapr_vscsi
+                    only virtio_net
+                    spapr_vscsi_reg =  0x71000001
+                    bus_extra_params_image1 = 'reg=${spapr_vscsi_reg}'
+                    drive_bus_cd1 = 0
+                    drive_port_cd1 = 1
+                    boot_dev_num = 3
+                    menu_option1 = "cdrom vdevice v-scsi ${spapr_vscsi_reg}"
+                    menu_option2 = "disk vdevice v-scsi ${spapr_vscsi_reg}"
+                    menu_option3 = "net pci ethernet ${nic_pci_addr_nic1}"
+                    bootable_index = 2
+                    variants:
+                        - with_scsi_id:
+                            variants:
+                                - with_id_0:
+                                    drive_unit_cd1 = 0
+                                - with_id_63:
+                                    drive_unit_cd1 = 63
+                        - with_channel_id:
+                            variants:
+                                - with_id_0:
+                                    blk_extra_params_cd1 = channel=0
+                                - with_id_7:
+                                    blk_extra_params_cd1 = channel=7
         - send_boot:
+            only virtio_scsi
             send_keys = 'boot'
             bootindex_image1 = 0
             start_boot = 'Trying to load'
             end_boot = 'Successfully loaded'
         - send_reset_all:
+            only virtio_scsi
             send_keys = 'reset-all'
             start_reset_all = '0 >'
             end_reset_all = 'Successfully loaded'