1f88dea66c
- Updating to Sphinx v3.1.2 in Factory is exposing an issue in qemu doc sources. Fix it docs-fix-trace-docs-build-with-sphinx-3..patch - Fix DoS possibility in ati-vga emulation (CVE-2020-13800 bsc#1172495) ati-vga-check-mm_index-before-recursive-.patch - Fix DoS possibility in Network Block Device (nbd) support infrastructure (CVE-2020-10761 bsc#1172710) nbd-server-Avoid-long-error-message-asse.patch - Fix null pointer dereference possibility (DoS) in MegaRAID SAS 8708EM2 emulation (CVE-2020-13659 bsc#1172386) exec-set-map-length-to-zero-when-returni.patch - Fix OOB access possibility in MegaRAID SAS 8708EM2 emulation (CVE-2020-13362 bsc#1172383) megasas-use-unsigned-type-for-reply_queu.patch - Fix legacy IGD passthrough hw-vfio-pci-quirks-Fix-broken-legacy-IGD.patch - The latest gcc10 available in Factory has the fix for the issue this patch was created to avoid, so drop it build-Work-around-gcc10-bug-by-not-using.patch - Switch to upstream versions of some patches we carry add-enum-cast-to-avoid-gcc10-warning.patch -> golan-Add-explicit-type-casts-for-nodnic.patch Be-explicit-about-fcommon-compiler-direc.patch -> build-Be-explicit-about-fcommon-compiler.patch Do-not-apply-WORKAROUND_CFLAGS-for-host-.patch -> build-Do-not-apply-WORKAROUND_CFLAGS-for.patch Fix-s-directive-argument-is-null-error.patch -> build-Fix-s-directive-argument-is-null-e.patch Workaround-compilation-error-with-gcc-9..patch -> build-Workaround-compilation-error-with-.patch work-around-gcc10-problem-with-zero-leng.patch -> intel-Avoid-spurious-compiler-warning-on.patch - Fix vgabios issue for cirrus graphics emulation, which effectively downgraded it to standard VGA behavior vga-fix-cirrus-bios.patch - Fix OOB access possibility in ES1370 audio device emulation (CVE-2020-13361 bsc#1172384) es1370-check-total-frame-count-against-c.patch OBS-URL: https://build.opensuse.org/request/show/822154 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=553
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
|
|
|
|
Git-commit: e721e55a3dabb2897081614b17dd4565e85249ac
|
|
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>
|
|
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;
|
|
}
|
|
|