From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aais4-0005A2-EX for qemu-devel@nongnu.org; Tue, 01 Mar 2016 06:53:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aais1-0000Qi-HI for qemu-devel@nongnu.org; Tue, 01 Mar 2016 06:53:44 -0500 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:45850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aais1-0000QQ-90 for qemu-devel@nongnu.org; Tue, 01 Mar 2016 06:53:41 -0500 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 1 Mar 2016 11:53:40 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id AF9C717D8062 for ; Tue, 1 Mar 2016 11:53:35 +0000 (GMT) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u21BrBD154001884 for ; Tue, 1 Mar 2016 11:53:11 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u21ArCuQ008352 for ; Tue, 1 Mar 2016 03:53:13 -0700 From: Cornelia Huck Date: Tue, 1 Mar 2016 12:52:59 +0100 Message-Id: <1456833183-27244-11-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1456833183-27244-1-git-send-email-cornelia.huck@de.ibm.com> References: <1456833183-27244-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PULL 10/14] s390x/css: Use static initialization for channel_subsys fields List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: Eduardo Habkost , qemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, Cornelia Huck , Richard Henderson From: Eduardo Habkost machine_init() will be gone, but we don't need it if we just initialize the channel_subsys fields statically. Cc: Cornelia Huck Cc: Christian Borntraeger Cc: Richard Henderson Cc: Alexander Graf Signed-off-by: Eduardo Habkost Message-Id: <1455656347-29033-4-git-send-email-ehabkost@redhat.com> Reviewed-by: Cornelia Huck [adapted on top of indicator changes] Signed-off-by: Cornelia Huck --- hw/s390x/css.c | 25 +++++++++++-------------- 1 file 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; -- 2.7.2