Re: [Qemu-devel] [PATCH v4 12/21] target/s390x: set cpu->id for linux user when realizing

[Igor Mammedov]

On Mon, 11 Sep 2017 17:21:41 +0200
David Hildenbrand  wrote:

> scc->next_cpu_id is updated when realizing. Setting it just before that
> point looks cleaner.
> 
> Reviewed-by: Matthew Rosato 
> Signed-off-by: David Hildenbrand 
Reviewed-by: Igor Mammedov 

> ---
>  target/s390x/cpu.c | 11 ---
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
> index 74b3e4fd0d..5f9315fb16 100644
> --- a/target/s390x/cpu.c
> +++ b/target/s390x/cpu.c
> @@ -194,7 +194,11 @@ static void s390_cpu_realizefn(DeviceState *dev, Error 
> **errp)
> ", max allowed: %d", cpu->id, max_cpus - 1);
>  goto out;
>  }
> +#else
> +/* implicitly set for linux-user only */
> +cpu->id = scc->next_cpu_id;
>  #endif
> +
>  if (cpu_exists(cpu->id)) {
>  error_setg(, "Unable to add CPU: %" PRIi64
> ", it already exists", cpu->id);
> @@ -306,13 +310,6 @@ static void s390_cpu_initfn(Object *obj)
>  inited = true;
>  s390x_translate_init();
>  }
> -
> -#if defined(CONFIG_USER_ONLY)
> -{
> -S390CPUClass *scc = S390_CPU_GET_CLASS(obj);
> -cpu->id = scc->next_cpu_id;
> -}
> -#endif
>  }
>  
>  static void s390_cpu_finalize(Object *obj)

[Qemu-devel] [PATCH v4 12/21] target/s390x: set cpu->id for linux user when realizing

[David Hildenbrand]

scc->next_cpu_id is updated when realizing. Setting it just before that
point looks cleaner.

Reviewed-by: Matthew Rosato 
Signed-off-by: David Hildenbrand 
---
 target/s390x/cpu.c | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 74b3e4fd0d..5f9315fb16 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -194,7 +194,11 @@ static void s390_cpu_realizefn(DeviceState *dev, Error 
**errp)
", max allowed: %d", cpu->id, max_cpus - 1);
 goto out;
 }
+#else
+/* implicitly set for linux-user only */
+cpu->id = scc->next_cpu_id;
 #endif
+
 if (cpu_exists(cpu->id)) {
 error_setg(, "Unable to add CPU: %" PRIi64
", it already exists", cpu->id);
@@ -306,13 +310,6 @@ static void s390_cpu_initfn(Object *obj)
 inited = true;
 s390x_translate_init();
 }
-
-#if defined(CONFIG_USER_ONLY)
-{
-S390CPUClass *scc = S390_CPU_GET_CLASS(obj);
-cpu->id = scc->next_cpu_id;
-}
-#endif
 }
 
 static void s390_cpu_finalize(Object *obj)
-- 
2.13.5