From 53549271d3565e5f5ada6b6e4460980d9591ef47 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Fri, 18 Sep 2015 12:55:57 -0300
Subject: [PATCH] cpuid: Make lists of CPU models and machines multi-line

Makes it easier to change and to solve git conflicts.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 .../cpuid_dumps/scripts/dump-cpus-from-qemu   | 85 ++++++++++++++++++-
 1 file changed, 82 insertions(+), 3 deletions(-)

diff --git a/qemu/deps/cpuid/cpuid_dumps/scripts/dump-cpus-from-qemu b/qemu/deps/cpuid/cpuid_dumps/scripts/dump-cpus-from-qemu
index 37a6a321..9bd451a4 100755
--- a/qemu/deps/cpuid/cpuid_dumps/scripts/dump-cpus-from-qemu
+++ b/qemu/deps/cpuid/cpuid_dumps/scripts/dump-cpus-from-qemu
@@ -5,10 +5,89 @@ set -x
 QEMU_BIN="$1"
 DUMP_DIR="$2"
 
-[ -z "$QEMU_CPUS_TO_DUMP" ] && QEMU_CPUS_TO_DUMP="486 486,+apic athlon Conroe core2duo core2duo,-monitor coreduo coreduo,-monitor cpu64-rhel5 cpu64-rhel5,-svm cpu64-rhel5,-abm,-sse4a,-svm cpu64-rhel6 cpu64-rhel6,-s cpu64-rhel6,-abm,-sse4a,-svm Haswell kvm32 kvm64 n270 n270,-monitor Nehalem Opteron_G1 Opteron_G1,-svm Opteron_G2 Opteron_G2,-svm Opteron_G3 Opteron_G3,-svm Opteron_G3,-svm,-monitor Opteron_G4 Opteron_G4,-svm Opteron_G5 Opteron_G5,-svm Penryn pentium pentium,+apic pentium2 pentium2,+apic pentium3 pentium3,+apic phenom phenom,-svm,-monitor qemu32 qemu64 qemu64,-svm qemu64,-abm,-sse4a qemu64,-abm,-sse4a,-svm qemu64 SandyBridge Westmere"
-
-[ -z "$QEMU_MACHINES_TO_DUMP" ] && QEMU_MACHINES_TO_DUMP="pc-i440fx-rhel7.0.0 pc-q35-rhel7.0.0 pc-q35-2.1 pc-q35-2.0 pc-q35-1.7 pc-i440fx-2.1 pc-i440fx-2.0 pc-i440fx-1.7 pc-q35-1.6 pc-i440fx-1.6 pc-q35-1.5 pc-i440fx-1.5 pc-q35-1.4 pc-i440fx-1.4 pc-1.3 pc-1.2 pc-1.1 pc-1.0 pc-0.15 pc-0.14 pc-0.13 pc-0.12 pc-0.11 pc-0.10 rhel6.0.0 rhel6.1.0 rhel6.2.0 rhel6.3.0 rhel6.4.0 rhel6.5.0"
+[ -z "$QEMU_CPUS_TO_DUMP" ] && QEMU_CPUS_TO_DUMP='
+    486
+    486,+apic
+    athlon
+    Conroe
+    core2duo
+    core2duo,-monitor
+    coreduo
+    coreduo,-monitor
+    cpu64-rhel5
+    cpu64-rhel5,-svm
+    cpu64-rhel5,-abm,-sse4a,-svm
+    cpu64-rhel6
+    cpu64-rhel6,-s
+    cpu64-rhel6,-abm,-sse4a,-svm
+    Haswell
+    kvm32
+    kvm64
+    n270
+    n270,-monitor
+    Nehalem
+    Opteron_G1
+    Opteron_G1,-svm
+    Opteron_G2
+    Opteron_G2,-svm
+    Opteron_G3
+    Opteron_G3,-svm
+    Opteron_G3,-svm,-monitor
+    Opteron_G4
+    Opteron_G4,-svm
+    Opteron_G5
+    Opteron_G5,-svm
+    Penryn
+    pentium
+    pentium,+apic
+    pentium2
+    pentium2,+apic
+    pentium3
+    pentium3,+apic
+    phenom
+    phenom,-svm,-monitor
+    qemu32
+    qemu64
+    qemu64,-svm
+    qemu64,-abm,-sse4a
+    qemu64,-abm,-sse4a,-svm
+    qemu64
+    SandyBridge
+    Westmere
+'
 
+[ -z "$QEMU_MACHINES_TO_DUMP" ] && QEMU_MACHINES_TO_DUMP='
+    pc-i440fx-rhel7.0.0
+    pc-q35-rhel7.0.0
+    pc-q35-2.1
+    pc-q35-2.0
+    pc-q35-1.7
+    pc-i440fx-2.1
+    pc-i440fx-2.0
+    pc-i440fx-1.7
+    pc-q35-1.6
+    pc-i440fx-1.6
+    pc-q35-1.5
+    pc-i440fx-1.5
+    pc-q35-1.4
+    pc-i440fx-1.4
+    pc-1.3
+    pc-1.2
+    pc-1.1
+    pc-1.0
+    pc-0.15
+    pc-0.14
+    pc-0.13
+    pc-0.12
+    pc-0.11
+    pc-0.10
+    rhel6.0.0
+    rhel6.1.0
+    rhel6.2.0
+    rhel6.3.0
+    rhel6.4.0
+    rhel6.5.0
+'
 
 for machine in $QEMU_MACHINES_TO_DUMP;do
     for cpu in $QEMU_CPUS_TO_DUMP;do
-- 
GitLab