Commit 7c713b8a authored by Janosch Frank's avatar Janosch Frank Committed by Cornelia Huck
Browse files

s390x: protvirt: Move STSI data over SIDAD 



For protected guests, we need to put the STSI emulation results into
the SIDA, so SIE will write them into the guest at the next entry.

Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <20200319131921.2367-9-frankja@linux.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 1cca8265

target/s390x/kvm.c

+9 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "exec/memattrs.h"

#include "hw/s390x/s390-virtio-ccw.h"

#include "hw/s390x/s390-virtio-hcall.h"

#include "hw/s390x/pv.h"



#ifndef DEBUG_KVM

#define DEBUG_KVM  0
@@ -1808,7 +1809,9 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar) 
    SysIB_322 sysib;

    int del, i;



    if (s390_cpu_virt_mem_read(cpu, addr, ar, &sysib, sizeof(sysib))) {

    if (s390_is_pv()) {

        s390_cpu_pv_mem_read(cpu, 0, &sysib, sizeof(sysib));

    } else if (s390_cpu_virt_mem_read(cpu, addr, ar, &sysib, sizeof(sysib))) {

        return;

    }

    /* Shift the stack of Extended Names to prepare for our own data */
@@ -1861,8 +1864,12 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar) 
    /* Insert UUID */

    memcpy(sysib.vm[0].uuid, &qemu_uuid, sizeof(sysib.vm[0].uuid));



    if (s390_is_pv()) {

        s390_cpu_pv_mem_write(cpu, 0, &sysib, sizeof(sysib));

    } else {

        s390_cpu_virt_mem_write(cpu, addr, ar, &sysib, sizeof(sysib));

    }

}



static int handle_stsi(S390CPU *cpu)

{