[PATCH v21 10/20] machine: adding s390 topology to info hotpluggable-cpus

Pierre Morel posted 20 patches 2 years, 7 months ago
Maintainers: Pierre Morel <pmorel@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Paolo Bonzini <pbonzini@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Richard Henderson <richard.henderson@linaro.org>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Michael Roth <michael.roth@amd.com>, Cleber Rosa <crosa@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>
There is a newer version of this series
[PATCH v21 10/20] machine: adding s390 topology to info hotpluggable-cpus
Posted by Pierre Morel 2 years, 7 months ago
S390 topology adds books and drawers topology containers.
Let's add these to the HMP information for hotpluggable cpus.

Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
Reviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
---
 hw/core/machine-hmp-cmds.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c
index c3e55ef9e9..f247ba3206 100644
--- a/hw/core/machine-hmp-cmds.c
+++ b/hw/core/machine-hmp-cmds.c
@@ -71,6 +71,12 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict)
         if (c->has_node_id) {
             monitor_printf(mon, "    node-id: \"%" PRIu64 "\"\n", c->node_id);
         }
+        if (c->has_drawer_id) {
+            monitor_printf(mon, "    drawer-id: \"%" PRIu64 "\"\n", c->drawer_id);
+        }
+        if (c->has_book_id) {
+            monitor_printf(mon, "      book-id: \"%" PRIu64 "\"\n", c->book_id);
+        }
         if (c->has_socket_id) {
             monitor_printf(mon, "    socket-id: \"%" PRIu64 "\"\n", c->socket_id);
         }
-- 
2.31.1
Re: [PATCH v21 10/20] machine: adding s390 topology to info hotpluggable-cpus
Posted by Thomas Huth 2 years, 7 months ago
On 30/06/2023 11.17, Pierre Morel wrote:
> S390 topology adds books and drawers topology containers.
> Let's add these to the HMP information for hotpluggable cpus.
> 
> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
> Reviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
> ---
>   hw/core/machine-hmp-cmds.c | 6 ++++++
>   1 file changed, 6 insertions(+)
> 
> diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c
> index c3e55ef9e9..f247ba3206 100644
> --- a/hw/core/machine-hmp-cmds.c
> +++ b/hw/core/machine-hmp-cmds.c
> @@ -71,6 +71,12 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict)
>           if (c->has_node_id) {
>               monitor_printf(mon, "    node-id: \"%" PRIu64 "\"\n", c->node_id);
>           }
> +        if (c->has_drawer_id) {
> +            monitor_printf(mon, "    drawer-id: \"%" PRIu64 "\"\n", c->drawer_id);
> +        }
> +        if (c->has_book_id) {
> +            monitor_printf(mon, "      book-id: \"%" PRIu64 "\"\n", c->book_id);

I think the output should be left-aligned (with four spaces at the 
beginning), not right aligned to the colons?

  Thomas


> +        }
>           if (c->has_socket_id) {
>               monitor_printf(mon, "    socket-id: \"%" PRIu64 "\"\n", c->socket_id);
>           }
Re: [PATCH v21 10/20] machine: adding s390 topology to info hotpluggable-cpus
Posted by Pierre Morel 2 years, 7 months ago
On 7/4/23 14:59, Thomas Huth wrote:
> On 30/06/2023 11.17, Pierre Morel wrote:
>> S390 topology adds books and drawers topology containers.
>> Let's add these to the HMP information for hotpluggable cpus.
>>
>> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
>> Reviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
>> ---
>>   hw/core/machine-hmp-cmds.c | 6 ++++++
>>   1 file changed, 6 insertions(+)
>>
>> diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c
>> index c3e55ef9e9..f247ba3206 100644
>> --- a/hw/core/machine-hmp-cmds.c
>> +++ b/hw/core/machine-hmp-cmds.c
>> @@ -71,6 +71,12 @@ void hmp_hotpluggable_cpus(Monitor *mon, const 
>> QDict *qdict)
>>           if (c->has_node_id) {
>>               monitor_printf(mon, "    node-id: \"%" PRIu64 "\"\n", 
>> c->node_id);
>>           }
>> +        if (c->has_drawer_id) {
>> +            monitor_printf(mon, "    drawer-id: \"%" PRIu64 "\"\n", 
>> c->drawer_id);
>> +        }
>> +        if (c->has_book_id) {
>> +            monitor_printf(mon, "      book-id: \"%" PRIu64 "\"\n", 
>> c->book_id);
>
> I think the output should be left-aligned (with four spaces at the 
> beginning), not right aligned to the colons?
>
>  Thomas
>

I think you are right, core-id is not aligned on the colons.

thanks,

Pierre


>
>> +        }
>>           if (c->has_socket_id) {
>>               monitor_printf(mon, "    socket-id: \"%" PRIu64 "\"\n", 
>> c->socket_id);
>>           }
>
>