| Message ID | 20230425161456.21031-11-pmorel@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x: CPU Topology | expand |
On Tue, 2023-04-25 at 18:14 +0200, 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> if you fix the nits below. > --- > 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..971212242d 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); use - instead here ^ unless there is some reason to be inconsistent. > + } > + if (c->has_book_id) { > + monitor_printf(mon, " book_id: \"%" PRIu64 "\"\n", c->book_id); Same here. > + } > if (c->has_socket_id) { > monitor_printf(mon, " socket-id: \"%" PRIu64 "\"\n", c->socket_id); > }
On 5/8/23 21:49, Nina Schoetterl-Glausch wrote: > On Tue, 2023-04-25 at 18:14 +0200, 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> Thanks > > if you fix the nits below. >> --- >> 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..971212242d 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); > use - instead here ^ unless there is some reason to be inconsistent. Oh, yes, thanks. >> + } >> + if (c->has_book_id) { >> + monitor_printf(mon, " book_id: \"%" PRIu64 "\"\n", c->book_id); > Same here. > >> + } >> if (c->has_socket_id) { >> monitor_printf(mon, " socket-id: \"%" PRIu64 "\"\n", c->socket_id); >> } Regards, Pierre
diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c index c3e55ef9e9..971212242d 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); }
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> --- hw/core/machine-hmp-cmds.c | 6 ++++++ 1 file changed, 6 insertions(+)