qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Alexander Graf <agraf@suse.de>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
	Jens Freimann <jfrei@linux.vnet.ibm.com>,
	Heinz Graalfs <graalfs@linux.vnet.ibm.com>,
	qemu-devel <qemu-devel@nongnu.org>
Subject: [Qemu-devel] [PATCH 05/11] s390/sclp: add reset() functions
Date: Wed, 18 Sep 2013 12:19:26 +0200	[thread overview]
Message-ID: <1379499572-49737-6-git-send-email-borntraeger@de.ibm.com> (raw)
In-Reply-To: <1379499572-49737-1-git-send-email-borntraeger@de.ibm.com>

From: Heinz Graalfs <graalfs@linux.vnet.ibm.com>

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 <graalfs@linux.vnet.ibm.com>
Reviewed-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 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

  parent reply	other threads:[~2013-09-18 10:19 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-18 10:19 [Qemu-devel] [PATCH 00/11] sclp related fixes and sclp line mode console Christian Borntraeger
2013-09-18 10:19 ` [Qemu-devel] [PATCH 01/11] s390/sclpconsole: modify definition of input buffer Christian Borntraeger
2013-09-18 10:19 ` [Qemu-devel] [PATCH 02/11] s390/sclpconsole: Add code to support live migration for sclpconsole Christian Borntraeger
2013-09-20  3:07   ` Alexander Graf
2013-09-20  3:24     ` Anthony Liguori
2013-09-18 10:19 ` [Qemu-devel] [PATCH 03/11] s390/sclpquiesce: Add code to support live migration Christian Borntraeger
2013-09-20  3:08   ` Alexander Graf
2013-09-18 10:19 ` [Qemu-devel] [PATCH 04/11] s390/event-facility: " Christian Borntraeger
2013-09-18 10:19 ` Christian Borntraeger [this message]
2013-09-18 10:19 ` [Qemu-devel] [PATCH 06/11] s390/eventfacility: fix multiple Read Event Data sources Christian Borntraeger
2013-09-18 10:19 ` [Qemu-devel] [PATCH 07/11] s390/eventfacility: Fix receive/send masks Christian Borntraeger
2013-09-18 10:19 ` [Qemu-devel] [PATCH 08/11] s390/eventfacility: remove unused event_type variable Christian Borntraeger
2013-09-18 10:19 ` [Qemu-devel] [PATCH 09/11] s390/eventfacility: allow childs to handle more than 1 event type Christian Borntraeger
2013-09-18 10:19 ` [Qemu-devel] [PATCH 10/11] s390/ebcdic: Move conversion tables to header file Christian Borntraeger
2013-09-20  3:21   ` Alexander Graf
2013-09-18 10:19 ` [Qemu-devel] [PATCH 11/11] s390/sclplmconsole: Add support for SCLP line-mode console Christian Borntraeger
2013-09-20  3:31   ` Alexander Graf
2013-09-20  3:32 ` [Qemu-devel] [PATCH 00/11] sclp related fixes and sclp line mode console Alexander Graf

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=1379499572-49737-6-git-send-email-borntraeger@de.ibm.com \
    --to=borntraeger@de.ibm.com \
    --cc=agraf@suse.de \
    --cc=graalfs@linux.vnet.ibm.com \
    --cc=jfrei@linux.vnet.ibm.com \
    --cc=qemu-devel@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).