* [Qemu-devel] [PATCH v1] target/s390x: change CPU type name to "s390x-cpu"
@ 2017-10-20 11:58 David Hildenbrand
2017-10-20 12:44 ` Thomas Huth
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: David Hildenbrand @ 2017-10-20 11:58 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-s390x, Thomas Huth, Richard Henderson, Alexander Graf,
cohuck, borntraeger, Igor Mammedov, David Hildenbrand
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 form "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>
---
qapi-schema.json | 4 ++--
target/s390x/cpu-qom.h | 2 +-
target/s390x/cpu_models.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index a9dd043f65..18457954a8 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 0510c49e07..b46217dc31 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 9554f19eb4..c4c37b3b15 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;
--
2.13.6
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v1] target/s390x: change CPU type name to "s390x-cpu"
2017-10-20 11:58 [Qemu-devel] [PATCH v1] target/s390x: change CPU type name to "s390x-cpu" David Hildenbrand
@ 2017-10-20 12:44 ` Thomas Huth
2017-10-20 15:23 ` David Hildenbrand
2017-10-20 15:26 ` Eric Blake
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Thomas Huth @ 2017-10-20 12:44 UTC (permalink / raw)
To: David Hildenbrand, qemu-devel
Cc: qemu-s390x, Richard Henderson, Alexander Graf, cohuck,
borntraeger, Igor Mammedov
On 20.10.2017 13:58, David Hildenbrand wrote:
> 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 form "s390-cpu" to "s390x-cpu", to match the architecture
> name. Example names are then e.g. z14-s390x-cpu or qemu-s390x-cpu.
Basically fine for me ... but just to be sure: Did you test whether
migration still works fine from older versions to a version that
contains this patch?
Thomas
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v1] target/s390x: change CPU type name to "s390x-cpu"
2017-10-20 12:44 ` Thomas Huth
@ 2017-10-20 15:23 ` David Hildenbrand
0 siblings, 0 replies; 7+ messages in thread
From: David Hildenbrand @ 2017-10-20 15:23 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: qemu-s390x, Richard Henderson, Alexander Graf, cohuck,
borntraeger, Igor Mammedov
On 20.10.2017 14:44, Thomas Huth wrote:
> On 20.10.2017 13:58, David Hildenbrand wrote:
>> 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 form "s390-cpu" to "s390x-cpu", to match the architecture
>> name. Example names are then e.g. z14-s390x-cpu or qemu-s390x-cpu.
>
> Basically fine for me ... but just to be sure: Did you test whether
> migration still works fine from older versions to a version that
> contains this patch?
>
> Thomas
>
Very basic migration testing (initrd guest with 4 cpus). That name
should not pup up in the migration stream.
--
Thanks,
David
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v1] target/s390x: change CPU type name to "s390x-cpu"
2017-10-20 11:58 [Qemu-devel] [PATCH v1] target/s390x: change CPU type name to "s390x-cpu" David Hildenbrand
2017-10-20 12:44 ` Thomas Huth
@ 2017-10-20 15:26 ` Eric Blake
2017-10-25 9:39 ` [Qemu-devel] [qemu-s390x] " David Hildenbrand
2017-10-25 9:52 ` [Qemu-devel] " Cornelia Huck
2017-10-25 10:12 ` Christian Borntraeger
3 siblings, 1 reply; 7+ messages in thread
From: Eric Blake @ 2017-10-20 15:26 UTC (permalink / raw)
To: David Hildenbrand, qemu-devel
Cc: Thomas Huth, cohuck, Alexander Graf, borntraeger, qemu-s390x,
Igor Mammedov, Richard Henderson
[-- Attachment #1: Type: text/plain, Size: 779 bytes --]
On 10/20/2017 06:58 AM, David Hildenbrand wrote:
> 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 form "s390-cpu" to "s390x-cpu", to match the architecture
s/form/from/
> name. Example names are then e.g. z14-s390x-cpu or qemu-s390x-cpu.
>
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [qemu-s390x] [PATCH v1] target/s390x: change CPU type name to "s390x-cpu"
2017-10-20 15:26 ` Eric Blake
@ 2017-10-25 9:39 ` David Hildenbrand
0 siblings, 0 replies; 7+ messages in thread
From: David Hildenbrand @ 2017-10-25 9:39 UTC (permalink / raw)
To: Eric Blake, qemu-devel, borntraeger
Cc: Thomas Huth, cohuck, Alexander Graf, qemu-s390x, Igor Mammedov,
Richard Henderson
On 20.10.2017 17:26, Eric Blake wrote:
> On 10/20/2017 06:58 AM, David Hildenbrand wrote:
>> 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 form "s390-cpu" to "s390x-cpu", to match the architecture
>
> s/form/from/
>
>> name. Example names are then e.g. z14-s390x-cpu or qemu-s390x-cpu.
>>
>> Signed-off-by: David Hildenbrand <david@redhat.com>
>> ---
>
>
If there are no objections, Christian can you pick this up (fixing the
typo) so we get this into 2.11?
--
Thanks,
David
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v1] target/s390x: change CPU type name to "s390x-cpu"
2017-10-20 11:58 [Qemu-devel] [PATCH v1] target/s390x: change CPU type name to "s390x-cpu" David Hildenbrand
2017-10-20 12:44 ` Thomas Huth
2017-10-20 15:26 ` Eric Blake
@ 2017-10-25 9:52 ` Cornelia Huck
2017-10-25 10:12 ` Christian Borntraeger
3 siblings, 0 replies; 7+ messages in thread
From: Cornelia Huck @ 2017-10-25 9:52 UTC (permalink / raw)
To: David Hildenbrand
Cc: qemu-devel, qemu-s390x, Thomas Huth, Richard Henderson,
Alexander Graf, borntraeger, Igor Mammedov
On Fri, 20 Oct 2017 13:58:03 +0200
David Hildenbrand <david@redhat.com> wrote:
> 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 form "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>
> ---
> qapi-schema.json | 4 ++--
> target/s390x/cpu-qom.h | 2 +-
> target/s390x/cpu_models.c | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
Acked-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v1] target/s390x: change CPU type name to "s390x-cpu"
2017-10-20 11:58 [Qemu-devel] [PATCH v1] target/s390x: change CPU type name to "s390x-cpu" David Hildenbrand
` (2 preceding siblings ...)
2017-10-25 9:52 ` [Qemu-devel] " Cornelia Huck
@ 2017-10-25 10:12 ` Christian Borntraeger
3 siblings, 0 replies; 7+ messages in thread
From: Christian Borntraeger @ 2017-10-25 10:12 UTC (permalink / raw)
To: David Hildenbrand, qemu-devel
Cc: qemu-s390x, Thomas Huth, Richard Henderson, Alexander Graf,
cohuck, Igor Mammedov
On 10/20/2017 01:58 PM, David Hildenbrand wrote:
> 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 form "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>
Thanks applied (with the typo fixed)
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-10-25 10:13 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-20 11:58 [Qemu-devel] [PATCH v1] target/s390x: change CPU type name to "s390x-cpu" David Hildenbrand
2017-10-20 12:44 ` Thomas Huth
2017-10-20 15:23 ` David Hildenbrand
2017-10-20 15:26 ` Eric Blake
2017-10-25 9:39 ` [Qemu-devel] [qemu-s390x] " David Hildenbrand
2017-10-25 9:52 ` [Qemu-devel] " Cornelia Huck
2017-10-25 10:12 ` Christian Borntraeger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.