a447edb5e5
- Include upstream patches targeted for the next stable release (bug fixes only) block-io-fix-bdrv_co_do_copy_on_readv.patch compat-disable-edid-on-correct-virtio-gp.patch target-ppc-Fix-rlwinm-on-ppc64.patch vhost-correctly-turn-on-VIRTIO_F_IOMMU_P.patch - s390x Protected Virtualization support - start and control guest in secure mode. (note: binary patch from patch series dropped since for s390x we rebuild the patched binary anyways) (bsc#1167075 jsc#SLE-7407) s390-sclp-improve-special-wait-psw-logic.patch s390x-Add-missing-vcpu-reset-functions.patch s390x-Add-SIDA-memory-ops.patch s390x-Add-unpack-facility-feature-to-GA1.patch s390x-Beautify-diag308-handling.patch s390x-Don-t-do-a-normal-reset-on-the-ini.patch s390x-ipl-Consolidate-iplb-validity-chec.patch s390x-kvm-Make-kvm_sclp_service_call-voi.patch s390x-Move-clear-reset.patch s390x-Move-diagnose-308-subcodes-and-rcs.patch s390x-Move-initial-reset.patch s390x-Move-reset-normal-to-shared-reset-.patch s390x-protvirt-Add-migration-blocker.patch s390x-protvirt-Disable-address-checks-fo.patch s390x-protvirt-Handle-SIGP-store-status-.patch s390x-protvirt-Inhibit-balloon-when-swit.patch s390x-protvirt-KVM-intercept-changes.patch s390x-protvirt-Move-diag-308-data-over-S.patch s390x-protvirt-Move-IO-control-structure.patch s390x-protvirt-Move-STSI-data-over-SIDAD.patch s390x-protvirt-SCLP-interpretation.patch s390x-protvirt-Set-guest-IPL-PSW.patch s390x-protvirt-Support-unpack-facility.patch Sync-pv.patch OBS-URL: https://build.opensuse.org/request/show/787000 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=538
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 5149030d2216040c396a02d977c8..ed910a099627dae96ab5da747fb3 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)
|
|
{
|
|
@@ -325,15 +328,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;
|
|
}
|
|
|