From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvKXU-0003TM-0M for qemu-devel@nongnu.org; Fri, 13 Jun 2014 02:00:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WvKXD-0002Sd-Vp for qemu-devel@nongnu.org; Fri, 13 Jun 2014 02:00:35 -0400 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:38779) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvKXD-0002SG-Mi for qemu-devel@nongnu.org; Fri, 13 Jun 2014 02:00:19 -0400 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 13 Jun 2014 07:00:18 +0100 Date: Fri, 13 Jun 2014 08:00:11 +0200 From: Cornelia Huck Message-ID: <20140613080011.7048ce6c.cornelia.huck@de.ibm.com> In-Reply-To: <1402630619-4408-4-git-send-email-aik@ozlabs.ru> References: <1402630619-4408-1-git-send-email-aik@ozlabs.ru> <1402630619-4408-4-git-send-email-aik@ozlabs.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v7 3/4] s390x: Migrate to new NMI interface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy Cc: Peter Maydell , qemu-devel@nongnu.org, Alexander Graf , Christian Borntraeger , qemu-ppc@nongnu.org, Paolo Bonzini , Luiz Capitulino , Richard Henderson On Fri, 13 Jun 2014 13:36:58 +1000 Alexey Kardashevskiy 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 > --- > 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_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