qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Janosch Frank <frankja@linux.ibm.com>,
	David Hildenbrand <david@redhat.com>,
	Cornelia Huck <cohuck@redhat.com>,
	qemu-devel@nongnu.org,
	Christian Borntraeger <borntraeger@de.ibm.com>,
	qemu-s390x@nongnu.org, Claudio Imbrenda <imbrenda@linux.ibm.com>
Subject: [PULL 05/20] s390x: protvirt: Add migration blocker
Date: Thu, 30 Apr 2020 11:44:30 +0200	[thread overview]
Message-ID: <20200430094445.25943-6-cohuck@redhat.com> (raw)
In-Reply-To: <20200430094445.25943-1-cohuck@redhat.com>

From: Janosch Frank <frankja@linux.ibm.com>

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>
---
 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 b4d681da43af..e00040a00ba6 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;
     }
 
-- 
2.21.1



  parent reply	other threads:[~2020-04-30  9:50 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-30  9:44 [PULL 00/20] first set of s390x patches for 5.1 Cornelia Huck
2020-04-30  9:44 ` [PULL 01/20] virtio-net: fix rsc_ext compat handling Cornelia Huck
2020-04-30  9:44 ` [PULL 02/20] linux-headers: update against Linux 5.7-rc3 Cornelia Huck
2020-04-30  9:44 ` [PULL 03/20] s390x: Move diagnose 308 subcodes and rcs into ipl.h Cornelia Huck
2020-04-30  9:44 ` [PULL 04/20] s390x: protvirt: Support unpack facility Cornelia Huck
2020-04-30  9:44 ` Cornelia Huck [this message]
2020-04-30  9:44 ` [PULL 06/20] s390x: protvirt: Inhibit balloon when switching to protected mode Cornelia Huck
2020-04-30  9:44 ` [PULL 07/20] s390x: protvirt: KVM intercept changes Cornelia Huck
2020-04-30  9:44 ` [PULL 08/20] s390x: Add SIDA memory ops Cornelia Huck
2020-04-30  9:44 ` [PULL 09/20] s390x: protvirt: Move STSI data over SIDAD Cornelia Huck
2020-04-30  9:44 ` [PULL 10/20] s390x: protvirt: SCLP interpretation Cornelia Huck
2020-04-30  9:44 ` [PULL 11/20] s390x: protvirt: Set guest IPL PSW Cornelia Huck
2020-04-30  9:44 ` [PULL 12/20] s390x: protvirt: Move diag 308 data over SIDA Cornelia Huck
2020-04-30  9:44 ` [PULL 13/20] s390x: protvirt: Disable address checks for PV guest IO emulation Cornelia Huck
2020-04-30  9:44 ` [PULL 14/20] s390x: protvirt: Move IO control structures over SIDA Cornelia Huck
2020-04-30  9:44 ` [PULL 15/20] s390x: protvirt: Handle SIGP store status correctly Cornelia Huck
2020-04-30  9:44 ` [PULL 16/20] docs: system: Add protvirt docs Cornelia Huck
2020-04-30  9:44 ` [PULL 17/20] s390x: Add unpack facility feature to GA1 Cornelia Huck
2020-04-30  9:44 ` [PULL 18/20] s390x: protvirt: Fix stray error_report_err in s390_machine_protect Cornelia Huck
2020-04-30  9:44 ` [PULL 19/20] s390x/pv: Retry ioctls on -EINTR Cornelia Huck
2020-04-30  9:44 ` [PULL 20/20] s390x/s390-virtio-ccw: Fix build on systems without KVM Cornelia Huck
2020-04-30 13:54 ` [PULL 00/20] first set of s390x patches for 5.1 Peter Maydell
2020-04-30 15:36 ` no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200430094445.25943-6-cohuck@redhat.com \
    --to=cohuck@redhat.com \
    --cc=borntraeger@de.ibm.com \
    --cc=david@redhat.com \
    --cc=frankja@linux.ibm.com \
    --cc=imbrenda@linux.ibm.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).