From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VMEqz-0002jB-NR for qemu-devel@nongnu.org; Wed, 18 Sep 2013 06:19:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VMEqq-0008VC-KP for qemu-devel@nongnu.org; Wed, 18 Sep 2013 06:19:25 -0400 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:59427) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VMEqq-0008Ta-Ac for qemu-devel@nongnu.org; Wed, 18 Sep 2013 06:19:16 -0400 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 18 Sep 2013 11:19:14 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id BF38F17D805C for ; Wed, 18 Sep 2013 11:19:22 +0100 (BST) Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by b06cxnps3075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r8IAIxe964487640 for ; Wed, 18 Sep 2013 10:18:59 GMT Received: from d06av08.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r8IAJBD6012333 for ; Wed, 18 Sep 2013 04:19:11 -0600 From: Christian Borntraeger Date: Wed, 18 Sep 2013 12:19:26 +0200 Message-Id: <1379499572-49737-6-git-send-email-borntraeger@de.ibm.com> In-Reply-To: <1379499572-49737-1-git-send-email-borntraeger@de.ibm.com> References: <1379499572-49737-1-git-send-email-borntraeger@de.ibm.com> Subject: [Qemu-devel] [PATCH 05/11] s390/sclp: add reset() functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Graf Cc: Christian Borntraeger , Jens Freimann , Heinz Graalfs , qemu-devel From: Heinz Graalfs Add reset() functions for event-facility, sclpconsole, and sclpquiesce. The reset() functions perform variable initialization at IPL and e.g. when monitor system_reset is called. Signed-off-by: Heinz Graalfs Reviewed-by: Thomas Huth Signed-off-by: Christian Borntraeger --- hw/char/sclpconsole.c | 17 +++++++++++++---- hw/s390x/event-facility.c | 9 +++++++++ hw/s390x/sclpquiesce.c | 9 +++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index 856230f..138b017 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -228,10 +228,6 @@ static int console_init(SCLPEvent *event) return -1; } console_available = true; - scon->iov_sclp = 0; - scon->iov_bs = 0; - scon->iov_data_len = 0; - scon->iov_sclp_rest = 0; event->event_type = SCLP_EVENT_ASCII_CONSOLE_DATA; if (scon->chr) { qemu_chr_add_handlers(scon->chr, chr_can_read, @@ -243,6 +239,18 @@ static int console_init(SCLPEvent *event) return vmstate_register(NULL, 0, &vmstate_sclpconsole, scon); } +static void console_reset(DeviceState *dev) +{ + SCLPEvent *event = SCLP_EVENT(dev); + SCLPConsole *scon = DO_UPCAST(SCLPConsole, event, event); + + event->event_pending = false; + scon->iov_sclp = 0; + scon->iov_bs = 0; + scon->iov_data_len = 0; + scon->iov_sclp_rest = 0; +} + static int console_exit(SCLPEvent *event) { return 0; @@ -259,6 +267,7 @@ static void console_class_init(ObjectClass *klass, void *data) SCLPEventClass *ec = SCLP_EVENT_CLASS(klass); dc->props = console_properties; + dc->reset = console_reset; ec->init = console_init; ec->exit = console_exit; ec->get_send_mask = send_mask; diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 225b42c..c8f62bf 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -349,10 +349,19 @@ static int init_event_facility(S390SCLPDevice *sdev) return vmstate_register(NULL, 0, &vmstate_eventfacility, sdev->ef); } +static void reset_event_facility(DeviceState *dev) +{ + S390SCLPDevice *sdev = SCLP_S390_DEVICE(dev); + + sdev->ef->receive_mask = 0; +} + static void init_event_facility_class(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); S390SCLPDeviceClass *k = SCLP_S390_DEVICE_CLASS(klass); + dc->reset = reset_event_facility; k->init = init_event_facility; } diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c index eba0e6e..8981f4a 100644 --- a/hw/s390x/sclpquiesce.c +++ b/hw/s390x/sclpquiesce.c @@ -105,10 +105,19 @@ static int quiesce_init(SCLPEvent *event) return vmstate_register(NULL, 0, &vmstate_sclpquiesce, event); } +static void quiesce_reset(DeviceState *dev) +{ + SCLPEvent *event = SCLP_EVENT(dev); + + event->event_pending = false; +} + static void quiesce_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); SCLPEventClass *k = SCLP_EVENT_CLASS(klass); + dc->reset = quiesce_reset; k->init = quiesce_init; k->get_send_mask = send_mask; -- 1.8.3.1