diff options
| author | David Hildenbrand <david@redhat.com> | 2017-10-20 13:58:03 +0200 |
|---|---|---|
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2017-10-30 08:56:28 +0100 |
| commit | e555cbe78d59f09f7e7db7703d1e91b95f2743c0 (patch) | |
| tree | 913bbb77713188c89ee5d20ec4b214f862c8f49e | |
| parent | a93ece47fd9edbd4558db24300056c9a57d3bcd4 (diff) | |
| download | qemu-e555cbe78d59f09f7e7db7703d1e91b95f2743c0.zip qemu-e555cbe78d59f09f7e7db7703d1e91b95f2743c0.tar.gz qemu-e555cbe78d59f09f7e7db7703d1e91b95f2743c0.tar.bz2 | |
target/s390x: change CPU type name to "s390x-cpu"
For now, e.g. host-s390-cpu wasn't exposed to the user. cpu-add, -cpu
and the CPU model qmp interfaces didn't care about the actual type,
as that information was hidden.
This changed with CPU hotplug via device_add. Now the type is visible to
the user. Before we get that supported in a stable version, this is our
last chance to change it.
So change it from "s390-cpu" to "s390x-cpu", to match the architecture
name. Example names are then e.g. z14-s390x-cpu or qemu-s390x-cpu.
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20171020115803.14093-1-david@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
| -rw-r--r-- | qapi-schema.json | 4 | ||||
| -rw-r--r-- | target/s390x/cpu-qom.h | 2 | ||||
| -rw-r--r-- | target/s390x/cpu_models.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index a9dd043..1845795 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3159,12 +3159,12 @@ # -> { "execute": "query-hotpluggable-cpus" } # <- {"return": [ # { -# "type": "qemu-s390-cpu", "vcpus-count": 1, +# "type": "qemu-s390x-cpu", "vcpus-count": 1, # "props": { "core-id": 1 } # }, # { # "qom-path": "/machine/unattached/device[0]", -# "type": "qemu-s390-cpu", "vcpus-count": 1, +# "type": "qemu-s390x-cpu", "vcpus-count": 1, # "props": { "core-id": 0 } # } # ]} diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h index 0510c49..b46217d 100644 --- a/target/s390x/cpu-qom.h +++ b/target/s390x/cpu-qom.h @@ -22,7 +22,7 @@ #include "qom/cpu.h" -#define TYPE_S390_CPU "s390-cpu" +#define TYPE_S390_CPU "s390x-cpu" #define S390_CPU_CLASS(klass) \ OBJECT_CLASS_CHECK(S390CPUClass, (klass), TYPE_S390_CPU) diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 9554f19..c4c37b3 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -286,7 +286,7 @@ static void s390_print_cpu_model_list_entry(gpointer data, gpointer user_data) details = "(migration-safe)"; } - /* strip off the -s390-cpu */ + /* strip off the -s390x-cpu */ g_strrstr(name, "-" TYPE_S390_CPU)[0] = 0; (*s->cpu_fprintf)(s->file, "s390 %-15s %-35s %s\n", name, scc->desc, details); @@ -390,7 +390,7 @@ static void create_cpu_model_list(ObjectClass *klass, void *opaque) char *name = g_strdup(object_class_get_name(klass)); S390CPUClass *scc = S390_CPU_CLASS(klass); - /* strip off the -s390-cpu */ + /* strip off the -s390x-cpu */ g_strrstr(name, "-" TYPE_S390_CPU)[0] = 0; info = g_new0(CpuDefinitionInfo, 1); info->name = name; |