42aeb20e68
Update to v5.0.0 OBS-URL: https://build.opensuse.org/request/show/798748 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=547
65 lines
1.9 KiB
Diff
65 lines
1.9 KiB
Diff
From: Janosch Frank <frankja@linux.ibm.com>
|
|
Date: Fri, 6 Mar 2020 06:40:13 -0500
|
|
Subject: s390x: protvirt: Add migration blocker
|
|
|
|
References: bsc#1167075
|
|
|
|
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>
|
|
(cherry picked from commit e721e55a3dabb2897081614b17dd4565e85249ac)
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
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 b4d681da43af43f23f66206cacf6..e00040a00ba60b20b42ee26a299b 100644
|
|
--- a/hw/s390x/s390-virtio-ccw.c
|
|
+++ b/hw/s390x/s390-virtio-ccw.c
|
|
@@ -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;
|
|
}
|
|
|