From patchwork Fri Sep 22 15:19:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Federico Serafini X-Patchwork-Id: 13395930 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 137B0E6FE41 for ; Fri, 22 Sep 2023 15:19:36 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.606931.945028 (Exim 4.92) (envelope-from ) id 1qjhw4-0004fH-SB; Fri, 22 Sep 2023 15:19:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 606931.945028; Fri, 22 Sep 2023 15:19:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjhw4-0004fA-ND; Fri, 22 Sep 2023 15:19:16 +0000 Received: by outflank-mailman (input) for mailman id 606931; Fri, 22 Sep 2023 15:19:15 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qjhw3-0004f4-Fv for xen-devel@lists.xenproject.org; Fri, 22 Sep 2023 15:19:15 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 62dcdbb7-595b-11ee-9b0d-b553b5be7939; Fri, 22 Sep 2023 17:19:13 +0200 (CEST) Received: from Dell.bugseng.com (unknown [37.160.108.56]) by support.bugseng.com (Postfix) with ESMTPSA id B0EE64EE0739; Fri, 22 Sep 2023 17:19:11 +0200 (CEST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 62dcdbb7-595b-11ee-9b0d-b553b5be7939 From: Federico Serafini To: xen-devel@lists.xenproject.org Cc: consulting@bugseng.com, Federico Serafini , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu Subject: [XEN PATCH v2] xen/emul-i8254: remove forward declarations and re-order functions Date: Fri, 22 Sep 2023 17:19:04 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Remove forward declarations, including one that violates MISRA C Rule 8.3 ("All declarations of an object or function shall use the same names and type qualifiers"), and re-order functions. No functional change. Signed-off-by: Federico Serafini Acked-by: Jan Beulich --- xen/arch/x86/emul-i8254.c | 129 ++++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 67 deletions(-) diff --git a/xen/arch/x86/emul-i8254.c b/xen/arch/x86/emul-i8254.c index 41ec4a1ef1..8157428d94 100644 --- a/xen/arch/x86/emul-i8254.c +++ b/xen/arch/x86/emul-i8254.c @@ -48,11 +48,6 @@ #define RW_STATE_WORD0 3 #define RW_STATE_WORD1 4 -static int cf_check handle_pit_io( - int dir, unsigned int port, unsigned int bytes, uint32_t *val); -static int cf_check handle_speaker_io( - int dir, unsigned int port, unsigned int bytes, uint32_t *val); - #define get_guest_time(v) \ (is_hvm_vcpu(v) ? hvm_get_guest_time(v) : (u64)get_s_time()) @@ -466,68 +461,7 @@ static int cf_check pit_load(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(PIT, pit_save, pit_load, 1, HVMSR_PER_DOM); #endif -void pit_reset(struct domain *d) -{ - PITState *pit = domain_vpit(d); - struct hvm_hw_pit_channel *s; - int i; - - if ( !has_vpit(d) ) - return; - - if ( is_hvm_domain(d) ) - { - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); - destroy_periodic_time(&pit->pt0); - pit->pt0.source = PTSRC_isa; - } - - spin_lock(&pit->lock); - - for ( i = 0; i < 3; i++ ) - { - s = &pit->hw.channels[i]; - s->mode = 0xff; /* the init mode */ - s->gate = (i != 2); - pit_load_count(pit, i, 0); - } - - spin_unlock(&pit->lock); -} - -void pit_init(struct domain *d) -{ - PITState *pit = domain_vpit(d); - - if ( !has_vpit(d) ) - return; - - spin_lock_init(&pit->lock); - - if ( is_hvm_domain(d) ) - { - register_portio_handler(d, PIT_BASE, 4, handle_pit_io); - register_portio_handler(d, 0x61, 1, handle_speaker_io); - } - - pit_reset(d); -} - -void pit_deinit(struct domain *d) -{ - PITState *pit = domain_vpit(d); - - if ( !has_vpit(d) ) - return; - - if ( is_hvm_domain(d) ) - { - TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); - destroy_periodic_time(&pit->pt0); - } -} - -/* the intercept action for PIT DM retval:0--not handled; 1--handled */ +/* the intercept action for PIT DM retval:0--not handled; 1--handled */ static int cf_check handle_pit_io( int dir, unsigned int port, unsigned int bytes, uint32_t *val) { @@ -620,6 +554,67 @@ int pv_pit_handler(int port, int data, int write) return !write ? ioreq.data : 0; } +void pit_reset(struct domain *d) +{ + PITState *pit = domain_vpit(d); + struct hvm_hw_pit_channel *s; + int i; + + if ( !has_vpit(d) ) + return; + + if ( is_hvm_domain(d) ) + { + TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + destroy_periodic_time(&pit->pt0); + pit->pt0.source = PTSRC_isa; + } + + spin_lock(&pit->lock); + + for ( i = 0; i < 3; i++ ) + { + s = &pit->hw.channels[i]; + s->mode = 0xff; /* the init mode */ + s->gate = (i != 2); + pit_load_count(pit, i, 0); + } + + spin_unlock(&pit->lock); +} + +void pit_init(struct domain *d) +{ + PITState *pit = domain_vpit(d); + + if ( !has_vpit(d) ) + return; + + spin_lock_init(&pit->lock); + + if ( is_hvm_domain(d) ) + { + register_portio_handler(d, PIT_BASE, 4, handle_pit_io); + register_portio_handler(d, 0x61, 1, handle_speaker_io); + } + + pit_reset(d); +} + +void pit_deinit(struct domain *d) +{ + PITState *pit = domain_vpit(d); + + if ( !has_vpit(d) ) + return; + + if ( is_hvm_domain(d) ) + { + TRACE_0D(TRC_HVM_EMUL_PIT_STOP_TIMER); + destroy_periodic_time(&pit->pt0); + } +} + /* * Local variables: * mode: C