On Fri, 13 Jun 2014 13:36:58 +1000 Alexey Kardashevskiy <a...@ozlabs.ru> wrote:
> This implements an NMI interface for s390 and s390-ccw machines. > > This removes #ifdef s390 branch in qmp_inject_nmi so new s390's > nmi_monitor_handler() callback is going to be used for NMI. > > Since nmi_monitor_handler()-calling code is platform independent, > CPUState::cpu_index is used instead of S390CPU::env.cpu_num. > There should not be any change in behaviour as both @cpu_index and > @cpu_num are global CPU numbers. > > Also, s390_cpu_restart() takes care of preforming operations in > the specific CPU thread so no extra measure is required here either. I find this paragraph a bit confusing; I'd just remove it. > > Since the only error s390_cpu_restart() can return is ENOSYS, convert > it to QERR_UNSUPPORTED. > > Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru> > --- > Changes: > v7: > * since now s390' are QOM'ed, add interface to them and do not create > new object > > v6: > * supported NMI interface > > v5: > * added ENOSYS -> QERR_UNSUPPORTED, qapi/qmp/qerror.h was added for this > > v4: > * s/\<nmi\>/nmi_monitor_handler/ > > v3: > * now contains both old code removal and new code insertion, easier to > track changes > > Conflicts: > hw/s390x/s390-virtio.c > --- > cpus.c | 14 -------------- > hw/s390x/s390-virtio-ccw.c | 6 ++++++ > hw/s390x/s390-virtio.c | 15 +++++++++++++++ > hw/s390x/s390-virtio.h | 3 +++ > 4 files changed, 24 insertions(+), 14 deletions(-) > Reviewed-by: Cornelia Huck <cornelia.h...@de.ibm.com>
