Message ID | 20200311132151.172389-4-frankja@linux.ibm.com |
---|---|
State | New |
Headers | show |
Series | s390x: Protected Virtualization support | expand |
On 11.03.20 14:21, Janosch Frank wrote: > Migration is not yet supported. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > Reviewed-by: David Hildenbrand <david@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 9569b777a0e1abd6..deb31e060052d279 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) > { > @@ -321,15 +324,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 (local_err) { Shall we rather use rc here? local_err should also work I guess. Anyway Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> > + 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; > } > >
On 3/12/20 9:42 AM, Christian Borntraeger wrote: > > > On 11.03.20 14:21, Janosch Frank wrote: >> Migration is not yet supported. >> >> Signed-off-by: Janosch Frank <frankja@linux.ibm.com> >> Reviewed-by: David Hildenbrand <david@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 9569b777a0e1abd6..deb31e060052d279 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) >> { >> @@ -321,15 +324,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 (local_err) { > > Shall we rather use rc here? local_err should also work I guess. > > Anyway > Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> > Hmm, yeah I guess that would make more sense. Thanks! > >> + 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; >> } >> >>
On Wed, 11 Mar 2020 09:21:39 -0400 Janosch Frank <frankja@linux.ibm.com> wrote: > Migration is not yet supported. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > Reviewed-by: David Hildenbrand <david@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 9569b777a0e1abd6..deb31e060052d279 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) > { > @@ -321,15 +324,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 (local_err) { > + 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; > } > looks rather straightforward Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
On Wed, 11 Mar 2020 09:21:39 -0400 Janosch Frank <frankja@linux.ibm.com> wrote: > Migration is not yet supported. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > Reviewed-by: David Hildenbrand <david@redhat.com> > --- > hw/s390x/s390-virtio-ccw.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) Reviewed-by: Cornelia Huck <cohuck@redhat.com>
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 9569b777a0e1abd6..deb31e060052d279 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) { @@ -321,15 +324,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 (local_err) { + 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; }