[Qemu-devel] [PATCH 05/11] s390/sclp: add reset() functions

[Christian Borntraeger]

From: Heinz Graalfs <address@hidden>

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 <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
 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