cpuid: Add pc-*-1.6 to pc-*-2.3 machine-types

Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>

qemu/deps/cpuid/cpuid_dumps/scripts/dump-cpus-from-qemu

@@ -61,6 +61,10 @@ DUMP_DIR="$2"
 [ -z "$QEMU_MACHINES_TO_DUMP" ] && QEMU_MACHINES_TO_DUMP='
     pc-i440fx-rhel7.0.0
     pc-q35-rhel7.0.0
+    pc-q35-2.3
+    pc-i440fx-2.3
+    pc-q35-2.2
+    pc-i440fx-2.2
     pc-q35-2.1
     pc-q35-2.0
     pc-q35-1.7

qemu/deps/cpuid/cpuid_dumps/scripts/machines-versions

@@ -20,6 +20,10 @@ pc-i440fx-2.0 v2.0.0
 pc-q35-2.0 v2.0.0
 pc-i440fx-2.1 v2.1.0
 pc-q35-2.1 v2.1.0
+pc-i440fx-2.2 v2.2.0
+pc-q35-2.2 v2.2.0
+pc-i440fx-2.3 v2.3.0
+pc-q35-2.3 v2.3.0
 rhel6.0.0 RHEL-6.0
 rhel6.1.0 RHEL-6.1
 rhel6.2.0 RHEL-6.2

qemu/tests/cfg/qemu_cpu.cfg

@@ -209,6 +209,30 @@
                                     machine_type_to_check = "pc-q35-1.5"
                                 - pc_i440fx_1_5:
                                     machine_type_to_check = "pc-i440fx-1.5"
+                                - pc_q35_1_6:
+                                    machine_type_to_check = "pc-q35-1.6"
+                                - pc_i440fx_1_6:
+                                    machine_type_to_check = "pc-i440fx-1.6"
+                                - pc_q35_1_7:
+                                    machine_type_to_check = "pc-q35-1.7"
+                                - pc_i440fx_1_7:
+                                    machine_type_to_check = "pc-i440fx-1.7"
+                                - pc_q35_2_0:
+                                    machine_type_to_check = "pc-q35-2.0"
+                                - pc_i440fx_2_0:
+                                    machine_type_to_check = "pc-i440fx-2.0"
+                                - pc_q35_2_1:
+                                    machine_type_to_check = "pc-q35-2.1"
+                                - pc_i440fx_2_1:
+                                    machine_type_to_check = "pc-i440fx-2.1"
+                                - pc_q35_2_2:
+                                    machine_type_to_check = "pc-q35-2.2"
+                                - pc_i440fx_2_2:
+                                    machine_type_to_check = "pc-i440fx-2.2"
+                                - pc_q35_2_3:
+                                    machine_type_to_check = "pc-q35-2.3"
+                                - pc_i440fx_2_3:
+                                    machine_type_to_check = "pc-i440fx-2.3"
 
                     test_type = "check_cpuid_dump"
                     no cpu_model_unset