From: Janosch Frank <frankja@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, mihajlov@linux.ibm.com, david@redhat.com,
cohuck@redhat.com
Subject: [PATCH v4 04/16] s390x: protvirt: Add migration blocker
Date: Thu, 20 Feb 2020 07:56:26 -0500 [thread overview]
Message-ID: <20200220125638.7241-5-frankja@linux.ibm.com> (raw)
In-Reply-To: <20200220125638.7241-1-frankja@linux.ibm.com>
Migration is not yet supported.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index aa974d294e..6fba8d9331 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -42,6 +42,9 @@
#include "hw/s390x/tod.h"
#include "sysemu/sysemu.h"
#include "hw/s390x/pv.h"
+#include "migration/blocker.h"
+
+static Error *pv_mig_blocker;
S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)
{
@@ -387,6 +390,7 @@ static void s390_machine_reset(MachineState *machine)
CPUState *cs, *t;
S390CPU *cpu;
S390CcwMachineState *ms = S390_CCW_MACHINE(machine);
+ static Error *local_err;
/* get the reset parameters, reset them once done */
s390_ipl_get_reset_request(&cs, &reset_type);
@@ -436,13 +440,20 @@ static void s390_machine_reset(MachineState *machine)
}
run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL);
- if (s390_machine_protect(ms)) {
+ if (!pv_mig_blocker) {
+ error_setg(&pv_mig_blocker,
+ "protected VMs are currently not migrateable.");
+ }
+ migrate_add_blocker(pv_mig_blocker, &local_err);
+ if (!local_err && s390_machine_protect(ms)) {
s390_machine_inject_pv_error(cs);
- s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu);
- return;
+ migrate_del_blocker(pv_mig_blocker);
+ goto pv_err;
}
run_on_cpu(cs, s390_do_cpu_load_normal, RUN_ON_CPU_NULL);
+pv_err:
+ s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu);
break;
default:
g_assert_not_reached();
--
2.20.1
next prev parent reply other threads:[~2020-02-20 13:04 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-20 12:56 [PATCH v4 00/16] s390x: Protected Virtualization support Janosch Frank
2020-02-20 12:56 ` [PATCH v4 01/16] Sync pv Janosch Frank
2020-02-25 9:42 ` David Hildenbrand
2020-02-25 11:10 ` Janosch Frank
2020-02-20 12:56 ` [PATCH v4 02/16] s390x: protvirt: Add diag308 subcodes 8 - 10 Janosch Frank
2020-02-21 9:49 ` Cornelia Huck
2020-02-21 11:42 ` Janosch Frank
2020-02-20 12:56 ` [PATCH v4 03/16] s390x: protvirt: Support unpack facility Janosch Frank
2020-02-24 14:13 ` Christian Borntraeger
2020-02-24 14:25 ` Janosch Frank
2020-02-20 12:56 ` Janosch Frank [this message]
2020-02-25 9:50 ` [PATCH v4 04/16] s390x: protvirt: Add migration blocker David Hildenbrand
2020-02-25 11:21 ` Janosch Frank
2020-02-20 12:56 ` [PATCH v4 05/16] s390x: protvirt: Handle diag 308 subcodes 0,1,3,4 Janosch Frank
2020-02-20 12:56 ` [PATCH v4 06/16] s390x: protvirt: KVM intercept changes Janosch Frank
2020-02-25 10:01 ` David Hildenbrand
2020-02-25 11:33 ` Janosch Frank
2020-02-20 12:56 ` [PATCH v4 07/16] s390x: Add SIDA memory ops Janosch Frank
2020-02-25 9:59 ` David Hildenbrand
2020-02-25 11:27 ` Janosch Frank
2020-02-20 12:56 ` [PATCH v4 08/16] s390x: protvirt: Move STSI data over SIDAD Janosch Frank
2020-02-25 10:05 ` David Hildenbrand
2020-02-20 12:56 ` [PATCH v4 09/16] s390x: protvirt: SCLP interpretation Janosch Frank
2020-02-20 12:56 ` [PATCH v4 10/16] s390x: protvirt: Set guest IPL PSW Janosch Frank
2020-02-20 12:56 ` [PATCH v4 11/16] s390x: protvirt: Move diag 308 data over SIDAD Janosch Frank
2020-02-20 12:56 ` [PATCH v4 12/16] s390x: protvirt: Disable address checks for PV guest IO emulation Janosch Frank
2020-02-20 12:56 ` [PATCH v4 13/16] s390x: protvirt: Move IO control structures over SIDA Janosch Frank
2020-02-20 12:56 ` [PATCH v4 14/16] s390x: protvirt: Handle SIGP store status correctly Janosch Frank
2020-02-20 12:56 ` [PATCH v4 15/16] s390x: Add unpack feature to GA1 Janosch Frank
2020-02-25 9:53 ` David Hildenbrand
2020-02-20 12:56 ` [PATCH v4 16/16] docs: Add protvirt docs Janosch Frank
2020-02-21 10:00 ` Cornelia Huck
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=20200220125638.7241-5-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=mihajlov@linux.ibm.com \
--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).