[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v11 04/16] s390x: protvirt: Add migration blocker
From: |
Janosch Frank |
Subject: |
[PATCH v11 04/16] s390x: protvirt: Add migration blocker |
Date: |
Thu, 19 Mar 2020 09:19:09 -0400 |
Migration is not yet supported.
Signed-off-by: Janosch Frank <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-by: Christian Borntraeger <address@hidden>
Reviewed-by: Claudio Imbrenda <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index afd499c59fffc848..8013c82236a36724 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -44,6 +44,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)
{
@@ -323,15 +326,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;
}
--
2.25.1
[PATCH v11 06/16] s390x: protvirt: KVM intercept changes, Janosch Frank, 2020/03/19
[PATCH v11 08/16] s390x: protvirt: Move STSI data over SIDAD, Janosch Frank, 2020/03/19
[PATCH v11 10/16] s390x: protvirt: Set guest IPL PSW, Janosch Frank, 2020/03/19