qemu_cpu.cfg: unify similar rules in a single one

Simplify the config file a little bit.
Signed-off-by: NEduardo Habkost <ehabkost@raisama.net>

qemu/tests/cfg/qemu_cpu.cfg

@@ -168,18 +168,12 @@
 
                     #KNOWN BUG: ignore brand string on those CPU models because
                     # they change depending on QEMU version:
-                    cpu.intel.qemu32:
-                        ignore_cpuid_leaves += " 0x80000002 0x80000003 0x80000004"
-                    cpu.amd.qemu64:
-                        ignore_cpuid_leaves += " 0x80000002 0x80000003 0x80000004"
-                    cpu.amd.athlon:
+                    cpu.intel.qemu32, cpu.amd.qemu64, cpu.amd.athlon:
                         ignore_cpuid_leaves += " 0x80000002 0x80000003 0x80000004"
 
                     #FIXED BUG: QEMU v1.1 and older have unstable host-dependent
                     # data on the KVM leaf, so we will ignore it by now:
-                    machine.upstream.pc_1_0:
-                        ignore_cpuid_leaves += " 0x40000001,0x00,eax"
-                    machine.upstream.pc_1_1:
+                    machine.upstream.pc_1_0, machine.upstream.pc_1_1:
                         ignore_cpuid_leaves += " 0x40000001,0x00,eax"
 
                     #FIXED BUG: QEMU v1.0 had broken feature aliases on
@@ -206,13 +200,7 @@
                         ignore_cpuid_leaves += " 0x40000001,0,eax"
 
                     # SEP bit depended on host kernel on 6.3 and older:
-                    machine.rhel.rhel630:
-                        ignore_cpuid_leaves += " 1,0,edx,11"
-                    machine.rhel.rhel620:
-                        ignore_cpuid_leaves += " 1,0,edx,11"
-                    machine.rhel.rhel610:
-                        ignore_cpuid_leaves += " 1,0,edx,11"
-                    machine.rhel.rhel600:
+                    machine.rhel.rhel630, machine.rhel.rhel620, machine.rhel.rhel610, machine.rhel.rhel600:
                         ignore_cpuid_leaves += " 1,0,edx,11"
 
                     # unsupported-bits behavior changed between some RHEL-6