1. Patchew
  2. QEMU
  3. View series

[PATCH] hw/core/machine: Add the missing delimiter in cpu_slot_to_string()

Yanan Wang posted 1 patch 2 years, 6 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20211008075040.18028-1-wangyanan55@huawei.com
Maintainers: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Eduardo Habkost <ehabkost@redhat.com>
hw/core/machine.c | 3 +++
1 file changed, 3 insertions(+)
[PATCH] hw/core/machine: Add the missing delimiter in cpu_slot_to_string()
Posted by Yanan Wang 2 years, 6 months ago 
The expected output string from cpu_slot_to_string() ought to be
like "socket-id: *, die-id: *, core-id: *, thread-id: *", so add
the missing ", " before "die-id". This affects the readability
of the error message.

Fixes: 176d2cda0d ("i386/cpu: Consolidate die-id validity in smp context")
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
---
 hw/core/machine.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/core/machine.c b/hw/core/machine.c
index b8d95eec32..0a23ae3106 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -1157,6 +1157,9 @@ static char *cpu_slot_to_string(const CPUArchId *cpu)
         g_string_append_printf(s, "socket-id: %"PRId64, cpu->props.socket_id);
     }
     if (cpu->props.has_die_id) {
+        if (s->len) {
+            g_string_append_printf(s, ", ");
+        }
         g_string_append_printf(s, "die-id: %"PRId64, cpu->props.die_id);
     }
     if (cpu->props.has_core_id) {
-- 
2.19.1
Re: [PATCH] hw/core/machine: Add the missing delimiter in cpu_slot_to_string()
Posted by wangyanan (Y) 2 years, 6 months ago 
Cc'ing qemu-trivial@nongnu.org. What about this simple one ?

Before this patch, with "-smp 4, dies=2" for a PC machine, we will 
generate warn strings like:
qemu-system-x86_64: warning: CPU(s) not present in any NUMA nodes: CPU 0 
[socket-id: 0die-id: 0, core-id: 0, thread-id: 0]

After we will get,
qemu-system-x86_64: warning: CPU(s) not present in any NUMA nodes: CPU 0 
[socket-id: 0, die-id: 0, core-id: 0, thread-id: 0]

Thanks,
Yanan

On 2021/10/8 15:50, Yanan Wang wrote:
> The expected output string from cpu_slot_to_string() ought to be
> like "socket-id: *, die-id: *, core-id: *, thread-id: *", so add
> the missing ", " before "die-id". This affects the readability
> of the error message.
>
> Fixes: 176d2cda0d ("i386/cpu: Consolidate die-id validity in smp context")
> Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
> ---
>   hw/core/machine.c | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index b8d95eec32..0a23ae3106 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -1157,6 +1157,9 @@ static char *cpu_slot_to_string(const CPUArchId *cpu)
>           g_string_append_printf(s, "socket-id: %"PRId64, cpu->props.socket_id);
>       }
>       if (cpu->props.has_die_id) {
> +        if (s->len) {
> +            g_string_append_printf(s, ", ");
> +        }
>           g_string_append_printf(s, "die-id: %"PRId64, cpu->props.die_id);
>       }
>       if (cpu->props.has_core_id) {
Re: [PATCH] hw/core/machine: Add the missing delimiter in cpu_slot_to_string()
Posted by Laurent Vivier 2 years, 6 months ago 
Le 08/10/2021 à 09:50, Yanan Wang a écrit :
> The expected output string from cpu_slot_to_string() ought to be
> like "socket-id: *, die-id: *, core-id: *, thread-id: *", so add
> the missing ", " before "die-id". This affects the readability
> of the error message.
> 
> Fixes: 176d2cda0d ("i386/cpu: Consolidate die-id validity in smp context")
> Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
> ---
>  hw/core/machine.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index b8d95eec32..0a23ae3106 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -1157,6 +1157,9 @@ static char *cpu_slot_to_string(const CPUArchId *cpu)
>          g_string_append_printf(s, "socket-id: %"PRId64, cpu->props.socket_id);
>      }
>      if (cpu->props.has_die_id) {
> +        if (s->len) {
> +            g_string_append_printf(s, ", ");
> +        }
>          g_string_append_printf(s, "die-id: %"PRId64, cpu->props.die_id);
>      }
>      if (cpu->props.has_core_id) {
> 

Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Re: [PATCH] hw/core/machine: Add the missing delimiter in cpu_slot_to_string()
Posted by wangyanan (Y) 2 years, 6 months ago 
On 2021/10/19 16:23, Laurent Vivier wrote:
> Le 08/10/2021 à 09:50, Yanan Wang a écrit :
>> The expected output string from cpu_slot_to_string() ought to be
>> like "socket-id: *, die-id: *, core-id: *, thread-id: *", so add
>> the missing ", " before "die-id". This affects the readability
>> of the error message.
>>
>> Fixes: 176d2cda0d ("i386/cpu: Consolidate die-id validity in smp context")
>> Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
>> ---
>>   hw/core/machine.c | 3 +++
>>   1 file changed, 3 insertions(+)
>>
>> diff --git a/hw/core/machine.c b/hw/core/machine.c
>> index b8d95eec32..0a23ae3106 100644
>> --- a/hw/core/machine.c
>> +++ b/hw/core/machine.c
>> @@ -1157,6 +1157,9 @@ static char *cpu_slot_to_string(const CPUArchId *cpu)
>>           g_string_append_printf(s, "socket-id: %"PRId64, cpu->props.socket_id);
>>       }
>>       if (cpu->props.has_die_id) {
>> +        if (s->len) {
>> +            g_string_append_printf(s, ", ");
>> +        }
>>           g_string_append_printf(s, "die-id: %"PRId64, cpu->props.die_id);
>>       }
>>       if (cpu->props.has_core_id) {
>>
> Reviewed-by: Laurent Vivier <laurent@vivier.eu>
> .
Thanks! Will you take this one in the trivial branch ?

Thanks,
Yanan
Re: [PATCH] hw/core/machine: Add the missing delimiter in cpu_slot_to_string()
Posted by Laurent Vivier 2 years, 6 months ago 
Le 26/10/2021 à 14:55, wangyanan (Y) a écrit :
> 
> On 2021/10/19 16:23, Laurent Vivier wrote:
>> Le 08/10/2021 à 09:50, Yanan Wang a écrit :
>>> The expected output string from cpu_slot_to_string() ought to be
>>> like "socket-id: *, die-id: *, core-id: *, thread-id: *", so add
>>> the missing ", " before "die-id". This affects the readability
>>> of the error message.
>>>
>>> Fixes: 176d2cda0d ("i386/cpu: Consolidate die-id validity in smp context")
>>> Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
>>> ---
>>>   hw/core/machine.c | 3 +++
>>>   1 file changed, 3 insertions(+)
>>>
>>> diff --git a/hw/core/machine.c b/hw/core/machine.c
>>> index b8d95eec32..0a23ae3106 100644
>>> --- a/hw/core/machine.c
>>> +++ b/hw/core/machine.c
>>> @@ -1157,6 +1157,9 @@ static char *cpu_slot_to_string(const CPUArchId *cpu)
>>>           g_string_append_printf(s, "socket-id: %"PRId64, cpu->props.socket_id);
>>>       }
>>>       if (cpu->props.has_die_id) {
>>> +        if (s->len) {
>>> +            g_string_append_printf(s, ", ");
>>> +        }
>>>           g_string_append_printf(s, "die-id: %"PRId64, cpu->props.die_id);
>>>       }
>>>       if (cpu->props.has_core_id) {
>>>
>> Reviewed-by: Laurent Vivier <laurent@vivier.eu>
>> .
> Thanks! Will you take this one in the trivial branch ?


yes, sorry, I missed that one in my last collect. Thank you for the heads-up.

Applied to my trivial-patches branch.

Thanks,
Laurent

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.