On 31.03.20 10:29, Janosch Frank wrote: > On 3/31/20 10:24 AM, David Hildenbrand wrote: >> On 31.03.20 09:14, Janosch Frank wrote: >>> Subcode 3.2.2 is handled by KVM/QEMU and should therefore be tested >>> a bit more thorough. >>> >>> In this test we set a custom name and uuid through the QEMU command >>> line. Both parameters will be passed to the guest on a stsi subcode >>> 3.2.2 call and will then be checked. >>> >>> We also compare the configured cpu numbers against the smp reported >>> numbers and if the reserved + configured add up to the total number >>> reported. >>> >>> Signed-off-by: Janosch Frank <fran...@linux.ibm.com> >>> --- >>> >>> * Tabify on struct >>> * Moved prefix_push up a bit >>> * Replaced returns with goto out to pop prefix >>> >>> --- >>> s390x/stsi.c | 73 +++++++++++++++++++++++++++++++++++++++++++++ >>> s390x/unittests.cfg | 1 + >>> 2 files changed, 74 insertions(+) >>> >>> diff --git a/s390x/stsi.c b/s390x/stsi.c >>> index e9206bca137d2edb..17ad33eefb9c948a 100644 >>> --- a/s390x/stsi.c >>> +++ b/s390x/stsi.c >>> @@ -14,7 +14,28 @@ >>> #include <asm/page.h> >>> #include <asm/asm-offsets.h> >>> #include <asm/interrupt.h> >>> +#include <smp.h> >>> >>> +struct stsi_322 { >>> + uint8_t reserved[31]; >>> + uint8_t count; >>> + struct { >>> + uint8_t reserved2[4]; >>> + uint16_t total_cpus; >>> + uint16_t conf_cpus; >>> + uint16_t standby_cpus; >>> + uint16_t reserved_cpus; >>> + uint8_t name[8]; >>> + uint32_t caf; >>> + uint8_t cpi[16]; >>> + uint8_t reserved5[3]; >>> + uint8_t ext_name_encoding; >>> + uint32_t reserved3; >>> + uint8_t uuid[16]; >>> + } vm[8]; >>> + uint8_t reserved4[1504]; >>> + uint8_t ext_names[8][256]; >> >> Sorry, still no proper use of tabs. (can fixup if you agree) >> > Sure, go ahead > >
Queued to https://github.com/davidhildenbrand/kvm-unit-tests.git s390x-next with the indentation fixed. -- Thanks, David / dhildenb