setvcpus: Resolve test issues

This pull request replaces PR 1218 sent to virt-test prior to the split:

autotest/virt-test#1218

There has been no changes made since the last comments in that PR

libvirt/tests/cfg/virsh_cmd/domain/virsh_setvcpus.cfg

@@ -1,56 +1,63 @@
 - virsh.setvcpus:
     type = virsh_setvcpus
     setvcpus_command = "setvcpus"
-    setvcpus_xml_file = "vm.xml"
-    setvcpus_tmp_file = "tmp.xml"
     setvcpus_pre_vm_state = "null"
-    setvcpus_domain = "name"
+    setvcpus_vm_ref = "name"
     setvcpus_count = "1"
+    setvcpus_current = "0"
     setvcpus_extra_param = ""
     setvcpus_options = ""
     variants:
         - normal_test:
             status_error = "no"
             variants:
-                - id_option:
-                    setvcpus_domain = "id"
+                - guest_on:
                     variants:
-                        - option1:
-                            setvcpus_options = "--live"
-                        - option2:
-                            setvcpus_options = "--config"
-                        - option3:
-                            setvcpus_options = "--config --live"
-                        - option4:
-                            setvcpus_options = "--current"
-                - name_option:
-                - pause_option:
-                    setvcpus_pre_vm_state = "paused"
-                - uuid_option:
-                    setvcpus_domain = "uuid"
-                - shut_off_normal_option:
+                        -add:
+                            # less than setvcpus_count
+                            setvcpus_current = "1"
+                            setvcpus_count = "2"
+                        -del:
+                    variants:
+                        - id_option:
+                            setvcpus_vm_ref = "id"
+                            variants:
+                                - option_live:
+                                    setvcpus_options = "--live"
+                                - option_config:
+                                    setvcpus_options = "--config"
+                                - option_config_live:
+                                    setvcpus_options = "--config --live"
+                                - option_current:
+                                    setvcpus_options = "--current"
+                        - name_option:
+                        - pause_option:
+                            setvcpus_pre_vm_state = "paused"
+                        - uuid_option:
+                            setvcpus_vm_ref = "uuid"
+                - guest_off:
                     setvcpus_pre_vm_state = "shut off"
                     variants:
-                        - option1:
+                        - option_config:
                             setvcpus_options = "--config"
-                        - option2:
-                            setvcpus_domain = "uuid"
+                        - option_uuid_config:
+                            setvcpus_vm_ref = "uuid"
                             setvcpus_options = "--config"
-                        - option3:
+                        - option_current:
                             setvcpus_options = "--current"
-                        - option4:
+                        - option_maximum_config:
                             setvcpus_options = "--maximum --config"
                             setvcpus_count = "4"
                 - remote:
-                    setvcpus_vm_ref = "remote_name"
+                    setvcpus_vm_ref = "remote"
         - error_test:
             status_error = "yes"
             variants:
                 - no_option:
-                    setvcpus_domain = ""
+                    setvcpus_vm_ref = ""
                     setvcpus_count = ""
                 - unexcept_id_option:
-                    setvcpus_domain = "id"
+                    setvcpus_vm_ref = "id"
                     variants:
                         - hex_id_option:
                             setvcpus_hex_id = "yes"
@@ -59,26 +66,26 @@
                         - invalid_id_option:
                             setvcpus_invalid_id =  "9999"
                 - unexpected_domain_option:
-                    setvcpus_domain = "\#"
+                    setvcpus_vm_ref = "\#"
                 - invalid_uuid_option:
-                    setvcpus_domain = "uuid"
+                    setvcpus_vm_ref = "uuid"
                     setvcpus_invalid_uuid = "99999999-9999-9999-9999-999999999999"
                 - extra_option:
                     setvcpus_extra_param = "xyz"
                 - name_only_option:
                     setvcpus_count = ""
-                - invalid_vcpu_option1:
+                - invalid_vcpu_count_is_0:
                     setvcpus_count = "0"
-                - invalid_vcpu_option2:
+                - invalid_vcpu_count_is_3:
                     setvcpus_count = "3"
                 - shut_off_error_option:
                     setvcpus_pre_vm_state = "shut off"
                     variants:
                         - live_option:
-                            setvcpus_vm_ref = "--live"
+                            setvcpus_options = "--live"
                         - live_config_option:
-                            setvcpus_vm_ref = "--live --config"
+                            setvcpus_options = "--live --config"
                         - current_config_option:
-                            setvcpus_vm_ref = "--current --config"
-                - maxinum_option:
+                            setvcpus_options = "--current --config"
+                - maximum_option:
                     setvcpus_options = "--maximum --live"