OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/s390x/cpu topology: Fix ordering and creation of TLEs

Browse Source 
In case of horizontal polarization entitlement has no effect on
ordering.
Moreover, since the comparison is used to insert CPUs at the correct
position in the TLE list, this affects the creation of TLEs and now
correctly collapses horizontally polarized CPUs into one TLE.

Fixes: f4f54b582f ("target/s390x/cpu topology: handle STSI(15) and build the SYSIB")
Signed-off-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Message-ID: <20231027163637.3060537-1-nsg@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Nina Schoetterl-Glausch 2023-10-27 18:36:37 +02:00 committed by Thomas Huth
parent d7e61d6b39
commit 3e19fbc0c5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/s390x/kvm/stsi-topology.c
View File

@ -210,6 +210,9 @@ static S390TopologyId s390_topology_from_cpu(S390CPU *cpu)
static int s390_topology_id_cmp(const S390TopologyId *l, static int s390_topology_id_cmp(const S390TopologyId *l,
const S390TopologyId *r) const S390TopologyId *r)
{ {
int l_polarization = l->vertical ? l->entitlement : 0;
int r_polarization = r->vertical ? r->entitlement : 0;
/* /*
* lexical order, compare less significant values only if more significant * lexical order, compare less significant values only if more significant
* ones are equal * ones are equal
@ -219,9 +222,8 @@ static int s390_topology_id_cmp(const S390TopologyId *l,
l->book - r->book ?: l->book - r->book ?:
l->socket - r->socket ?: l->socket - r->socket ?:
l->type - r->type ?: l->type - r->type ?:
/* logic is inverted for the next three */ /* logic is inverted for the next two */
r->vertical - l->vertical ?: r_polarization - l_polarization ?:
r->entitlement - l->entitlement ?:
r->dedicated - l->dedicated ?: r->dedicated - l->dedicated ?:
l->origin - r->origin; l->origin - r->origin;
} }