diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2016-02-16 18:59:06 -0200 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2016-03-01 12:15:29 +0100 |
| commit | bc994b74ea38579e18f9d9144021c6f8de597a34 (patch) | |
| tree | 4ce964ebbd5370cfa4f32f57092948068638fac5 /hw/s390x | |
| parent | 562f5e0b97bf36bec6c22f41f94975a20036edec (diff) | |
| download | qemu-bc994b74ea38579e18f9d9144021c6f8de597a34.zip qemu-bc994b74ea38579e18f9d9144021c6f8de597a34.tar.gz qemu-bc994b74ea38579e18f9d9144021c6f8de597a34.tar.bz2 | |
s390x/css: Use static initialization for channel_subsys fields
machine_init() will be gone, but we don't need it if we just
initialize the channel_subsys fields statically.
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Alexander Graf <agraf@suse.de>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1455656347-29033-4-git-send-email-ehabkost@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
[adapted on top of indicator changes]
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/css.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 3b16c82..55cb26a 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -63,7 +63,17 @@ typedef struct ChannelSubSys { QTAILQ_HEAD(, IndAddr) indicator_addresses; } ChannelSubSys; -static ChannelSubSys channel_subsys; +static ChannelSubSys channel_subsys = { + .pending_crws = QTAILQ_HEAD_INITIALIZER(channel_subsys.pending_crws), + .do_crw_mchk = true, + .sei_pending = false, + .do_crw_mchk = true, + .crws_lost = false, + .chnmon_active = false, + .io_adapters = QTAILQ_HEAD_INITIALIZER(channel_subsys.io_adapters), + .indicator_addresses = + QTAILQ_HEAD_INITIALIZER(channel_subsys.indicator_addresses), +}; IndAddr *get_indicator(hwaddr ind_addr, int len) { @@ -1576,19 +1586,6 @@ int subch_device_load(SubchDev *s, QEMUFile *f) return 0; } - -static void css_init(void) -{ - QTAILQ_INIT(&channel_subsys.pending_crws); - channel_subsys.sei_pending = false; - channel_subsys.do_crw_mchk = true; - channel_subsys.crws_lost = false; - channel_subsys.chnmon_active = false; - QTAILQ_INIT(&channel_subsys.io_adapters); - QTAILQ_INIT(&channel_subsys.indicator_addresses); -} -machine_init(css_init); - void css_reset_sch(SubchDev *sch) { PMCW *p = &sch->curr_status.pmcw; |