| Message ID | 20230630091752.67190-11-pmorel@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x: CPU Topology | expand |
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); > }
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); >> } > >
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); }