openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390x: protvirt: Add migration blocker 

Migration is not yet supported.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20200319131921.2367-5-frankja@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Janosch Frank 2020-03-19 09:19:09 -04:00 committed by Cornelia Huck
parent c3347ed0d2
commit 0141e1b477
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/s390x/s390-virtio-ccw.c
View File

@ -45,6 +45,9 @@
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "hw/s390x/pv.h" #include "hw/s390x/pv.h"
#include <linux/kvm.h> #include <linux/kvm.h>
#include "migration/blocker.h"
static Error *pv_mig_blocker;
S390CPU *s390_cpu_addr2state(uint16_t cpu_addr) S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)
{ {
@ -324,15 +327,30 @@ static void s390_machine_unprotect(S390CcwMachineState *ms)
{ {
s390_pv_vm_disable(); s390_pv_vm_disable();
ms->pv = false; ms->pv = false;
migrate_del_blocker(pv_mig_blocker);
error_free_or_abort(&pv_mig_blocker);
} }
static int s390_machine_protect(S390CcwMachineState *ms) static int s390_machine_protect(S390CcwMachineState *ms)
{ {
Error *local_err = NULL;
int rc; 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 */ /* Create SE VM */
rc = s390_pv_vm_enable(); rc = s390_pv_vm_enable();
if (rc) { if (rc) {
error_report_err(local_err);
migrate_del_blocker(pv_mig_blocker);
error_free_or_abort(&pv_mig_blocker);
return rc; return rc;
} }