From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVmih-00081Q-0N for qemu-devel@nongnu.org; Tue, 16 Feb 2016 15:59:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVmif-0006Si-2u for qemu-devel@nongnu.org; Tue, 16 Feb 2016 15:59:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45751) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVmie-0006RY-Ev for qemu-devel@nongnu.org; Tue, 16 Feb 2016 15:59:36 -0500 From: Eduardo Habkost Date: Tue, 16 Feb 2016 18:59:06 -0200 Message-Id: <1455656347-29033-4-git-send-email-ehabkost@redhat.com> In-Reply-To: <1455656347-29033-1-git-send-email-ehabkost@redhat.com> References: <1455656347-29033-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 3/4] s390x/css: Use static initialization for channel_subsys fields List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cornelia Huck , Christian Borntraeger , Richard Henderson , Alexander Graf , Marcel Apfelbaum 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 --- hw/s390x/css.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 2e9659a..15eb154 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -62,7 +62,15 @@ typedef struct ChannelSubSys { QTAILQ_HEAD(, IoAdapter) io_adapters; } 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), +}; int css_create_css_image(uint8_t cssid, bool default_image) { @@ -1514,18 +1522,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); -} -machine_init(css_init); - void css_reset_sch(SubchDev *sch) { PMCW *p = &sch->curr_status.pmcw; -- 2.1.0