From patchwork Mon Jun 26 16:28:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9810129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A229C603F9 for ; Mon, 26 Jun 2017 17:00:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C2AD28546 for ; Mon, 26 Jun 2017 17:00:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90C3A2857F; Mon, 26 Jun 2017 17:00:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 42C3028546 for ; Mon, 26 Jun 2017 17:00:04 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPX9c-0008BS-Sl; Mon, 26 Jun 2017 16:46:24 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPX9b-0008Aj-Mr for xen-devel@lists.xenproject.org; Mon, 26 Jun 2017 16:46:23 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id 5B/CB-03696-F5A31595; Mon, 26 Jun 2017 16:46:23 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphkeJIrShJLcpLzFFi42JxWrohUjfOKjD SYMdSKYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNWNdh0hBr3DFtJWbWBsYW/i7GDk5JAT8JW4t v8QEYrMJKEv87OxlA7FFBPQkmg48ZwSxmQXyJM6uXsQKYgsLREms37sEzGYRUJU4dXs7M4jNK 2AusffpclaImfISu9ougtmcQPGG1dPBbCEBM4ldvX1sELaCRMf0Y0wQvYISJ2c+YYHYJSFx8M UL5gmMvLOQpGYhSS1gZFrFqFGcWlSWWqRrZKmXVJSZnlGSm5iZo2toYKaXm1pcnJiempOYVKy XnJ+7iREYOgxAsIPxwKLAQ4ySHExKorwcTwIihfiS8lMqMxKLM+KLSnNSiw8xynBwKEnwslkG RgoJFqWmp1akZeYAgxgmLcHBoyTC26UJlOYtLkjMLc5Mh0idYlSUEudlBukTAElklObBtcEi5 xKjrJQwLyPQIUI8BalFuZklqPKvGMU5GJWEeS9YAE3hycwrgZv+CmgxE9BilnkBIItLEhFSUg 2MFsyX1lus3TA/5Lzq3xaLjY8ErmzuTWvzmPT9JouR3NUsZb04BhU3g+Ph6pFPzT3n7f5RwdK SU+uybmHTE3Ojwu2/XCamTju+sjFo2/ffE+9ul8z4nJDFtv3FdsvGVoYuz+2/4q3LD/9dnRO4 xvL4pqYvl9k1BRXCFlcUGizSjrgczPLs/pJwJZbijERDLeai4kQAsoDlE5cCAAA= X-Env-Sender: prvs=343741041=wei.liu2@citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1498495580!75708086!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15907 invoked from network); 26 Jun 2017 16:46:22 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 26 Jun 2017 16:46:22 -0000 X-IronPort-AV: E=Sophos;i="5.39,396,1493683200"; d="scan'208";a="429385819" From: Wei Liu To: Xen-devel Date: Mon, 26 Jun 2017 17:28:40 +0100 Message-ID: <20170626162842.482-12-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170626162842.482-1-wei.liu2@citrix.com> References: <20170626162842.482-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH v5 11/13] x86/callback.c: slightly change {un, }register_guest_nmi_callback X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Make register_guest_nmi_callback return int and make unregister_guest_nmi_callback void. Adjust the callers where necessary. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- Can be squashed into previous patch. --- xen/arch/x86/pv/callback.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/pv/callback.c b/xen/arch/x86/pv/callback.c index 739ccb4d06..5957cb5085 100644 --- a/xen/arch/x86/pv/callback.c +++ b/xen/arch/x86/pv/callback.c @@ -31,7 +31,7 @@ #include -static long register_guest_nmi_callback(unsigned long address) +static int register_guest_nmi_callback(unsigned long address) { struct vcpu *curr = current; struct domain *d = curr->domain; @@ -57,14 +57,12 @@ static long register_guest_nmi_callback(unsigned long address) return 0; } -static long unregister_guest_nmi_callback(void) +static void unregister_guest_nmi_callback(void) { struct vcpu *curr = current; struct trap_info *t = &curr->arch.pv_vcpu.trap_ctxt[TRAP_nmi]; memset(t, 0, sizeof(*t)); - - return 0; } static long register_guest_callback(struct callback_register *reg) @@ -140,7 +138,8 @@ static long unregister_guest_callback(struct callback_unregister *unreg) break; case CALLBACKTYPE_nmi: - ret = unregister_guest_nmi_callback(); + unregister_guest_nmi_callback(); + ret = 0; break; default: @@ -279,7 +278,8 @@ static long compat_unregister_guest_callback( break; case CALLBACKTYPE_nmi: - ret = unregister_guest_nmi_callback(); + unregister_guest_nmi_callback(); + ret = 0; break; default: @@ -463,7 +463,8 @@ long do_nmi_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) rc = register_guest_nmi_callback(cb.handler_address); break; case XENNMI_unregister_callback: - rc = unregister_guest_nmi_callback(); + unregister_guest_nmi_callback(); + rc = 0; break; default: rc = -ENOSYS; @@ -487,7 +488,8 @@ int compat_nmi_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) rc = register_guest_nmi_callback(cb.handler_address); break; case XENNMI_unregister_callback: - rc = unregister_guest_nmi_callback(); + unregister_guest_nmi_callback(); + rc = 0; break; default: rc = -ENOSYS;