From nobody Sat Apr 27 05:09:07 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1560143385; cv=none; d=zoho.com; s=zohoarc; b=nxVSofmEc3JCbFiL0lNj7YF/W2/r2mkxK7KrIcQA9x9KaY/9q7ICtbo72ANWIslZY3/MOFiIh21jffidXcXphFQMvnnY84zU7up/h7SXX5fIHRKvflRTZE9aATN6ecMUtJpQ83l9G9vVw4KQTFpWPNhJh1FQJyPqN0Z9Jzuxlc4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560143385; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=an3nO4lploLLTlXtHhj+vPzLVGyIRg2sIKYln1gmIg4=; b=FE5xpn/habbdy6eB7CEWpxIcIpbBmPVjZgDzOnZpdS7nakJ9ASLbLFaN8ezkP2J4L0iVVf68qp9mdsGv+UJ+WYNP/VesG2ftWkDDqfGLaEmiIRvf5ED1JYLgcVMs6CyaoVJN3udJcNOgXD9rkllk52uMyBPwTkB1OkV83yIIzx4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1560143385020240.1457576712313; Sun, 9 Jun 2019 22:09:45 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1haCXS-0005VG-Op; Mon, 10 Jun 2019 05:08:10 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1haCXS-0005VB-4P for xen-devel@lists.xenproject.org; Mon, 10 Jun 2019 05:08:10 +0000 Received: from mxnavi-mail.mxnavi.com (unknown [116.90.87.199]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id b962caf4-8b3d-11e9-8980-bc764e045a96; Mon, 10 Jun 2019 05:08:07 +0000 (UTC) Received: from localhost.localdomain (61.161.186.150) by mxnavi-mail.mxnavi.com (116.90.87.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1591.10; Mon, 10 Jun 2019 13:04:53 +0800 X-Inumbo-ID: b962caf4-8b3d-11e9-8980-bc764e045a96 From: Baodong Chen To: Date: Mon, 10 Jun 2019 13:07:54 +0800 Message-ID: <1560143274-10547-1-git-send-email-chenbaodong@mxnavi.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [61.161.186.150] X-ClientProxiedBy: mxnavi-mail.mxnavi.com (116.90.87.199) To mxnavi-mail.mxnavi.com (116.90.87.199) Subject: [Xen-devel] [PATCH] xen/arm: vtimer: fix return value to void for virt_timer_[save|restore] X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Baodong Chen , Julien Grall , Stefano Stabellini Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The original type is int and not used at all so fix to void. Signed-off-by: Baodong Chen --- xen/arch/arm/vtimer.c | 6 ++---- xen/include/asm-arm/vtimer.h | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index c99dd23..e6aebda 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -136,7 +136,7 @@ void vcpu_timer_destroy(struct vcpu *v) kill_timer(&v->arch.phys_timer.timer); } =20 -int virt_timer_save(struct vcpu *v) +void virt_timer_save(struct vcpu *v) { ASSERT(!is_idle_vcpu(v)); =20 @@ -149,10 +149,9 @@ int virt_timer_save(struct vcpu *v) set_timer(&v->arch.virt_timer.timer, ticks_to_ns(v->arch.virt_time= r.cval + v->domain->arch.virt_timer_base.offset - boot_count)); } - return 0; } =20 -int virt_timer_restore(struct vcpu *v) +void virt_timer_restore(struct vcpu *v) { ASSERT(!is_idle_vcpu(v)); =20 @@ -163,7 +162,6 @@ int virt_timer_restore(struct vcpu *v) WRITE_SYSREG64(v->domain->arch.virt_timer_base.offset, CNTVOFF_EL2); WRITE_SYSREG64(v->arch.virt_timer.cval, CNTV_CVAL_EL0); WRITE_SYSREG32(v->arch.virt_timer.ctl, CNTV_CTL_EL0); - return 0; } =20 static bool vtimer_cntp_ctl(struct cpu_user_regs *regs, uint32_t *r, bool = read) diff --git a/xen/include/asm-arm/vtimer.h b/xen/include/asm-arm/vtimer.h index 91d88b3..9d4fb4c 100644 --- a/xen/include/asm-arm/vtimer.h +++ b/xen/include/asm-arm/vtimer.h @@ -24,8 +24,8 @@ extern int domain_vtimer_init(struct domain *d, struct xen_arch_domainconfig *config); extern int vcpu_vtimer_init(struct vcpu *v); extern bool vtimer_emulate(struct cpu_user_regs *regs, union hsr hsr); -extern int virt_timer_save(struct vcpu *v); -extern int virt_timer_restore(struct vcpu *v); +extern void virt_timer_save(struct vcpu *v); +extern void virt_timer_restore(struct vcpu *v); extern void vcpu_timer_destroy(struct vcpu *v); void vtimer_update_irqs(struct vcpu *v); =20 --=20 2.7.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel