Commit 0141e1b4 authored by Janosch Frank's avatar Janosch Frank Committed by Cornelia Huck
Browse files

s390x: protvirt: Add migration blocker 



Migration is not yet supported.

Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <20200319131921.2367-5-frankja@linux.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent c3347ed0

hw/s390x/s390-virtio-ccw.c

+18 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ 
#include "sysemu/sysemu.h"

#include "hw/s390x/pv.h"

#include <linux/kvm.h>

#include "migration/blocker.h"



static Error *pv_mig_blocker;



S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)

{
@@ -324,15 +327,30 @@ static void s390_machine_unprotect(S390CcwMachineState *ms) 
{

    s390_pv_vm_disable();

    ms->pv = false;

    migrate_del_blocker(pv_mig_blocker);

    error_free_or_abort(&pv_mig_blocker);

}



static int s390_machine_protect(S390CcwMachineState *ms)

{

    Error *local_err = NULL;

    int rc;



    error_setg(&pv_mig_blocker,

               "protected VMs are currently not migrateable.");

    rc = migrate_add_blocker(pv_mig_blocker, &local_err);

    if (rc) {

        error_report_err(local_err);

        error_free_or_abort(&pv_mig_blocker);

        return rc;

    }



    /* Create SE VM */

    rc = s390_pv_vm_enable();

    if (rc) {

        error_report_err(local_err);

        migrate_del_blocker(pv_mig_blocker);

        error_free_or_abort(&pv_mig_blocker);

        return rc;

    }