From patchwork Tue Aug 30 09:15:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9305125 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 6800C60756 for ; Tue, 30 Aug 2016 09:25:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5372D28B50 for ; Tue, 30 Aug 2016 09:25:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4375B28B58; Tue, 30 Aug 2016 09:25:36 +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 BFD2628B50 for ; Tue, 30 Aug 2016 09:25:35 +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 1bef8y-0008K6-VW; Tue, 30 Aug 2016 09:15:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bef8x-0008Jz-Mn for xen-devel@lists.xenproject.org; Tue, 30 Aug 2016 09:15:43 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 99/E2-19922-EBE45C75; Tue, 30 Aug 2016 09:15:42 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMIsWRWlGSWpSXmKPExsXS6fjDS3ef39F wg9/bBSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozZz28zFbwUq9h3fAdLA+NvgS5GDg4hgTyJ z9t9uxg5OXgF7CQeHDjABGJLCBhKPH1/nQ3EZhFQlZjT/YsVxGYTUJdoe7adFaRVRMBA4tzRp C5GLg5mgc9MEm1rz4LVCAs4SBz//osNpIZXQFDi7w5hkDAz0PhNB8+wTWDkmoWQmYUkA2FrST z8dYsFwtaWWLbwNTNIObOAtMTyfxwQYWuJt++Ps2IqcZN4sZNtASPHKkb14tSistQiXSO9pKL M9IyS3MTMHF1DA1O93NTi4sT01JzEpGK95PzcTYzAwGMAgh2M3/84HWKU5GBSEuWdGn8kXIgv KT+lMiOxOCO+qDQntfgQowwHh5IEL6Pv0XAhwaLU9NSKtMwcYAzApCU4eJREeF1B0rzFBYm5x ZnpEKlTjIpS4rzPfYASAiCJjNI8uDZY3F1ilJUS5mUEOkSIpyC1KDezBFX+FaM4B6OSMG8UyH iezLwSuOmvgBYzAS0uuHMYZHFJIkJKqoEx9xZnjdHiZ+Gi9nk+dTu4GRYrhfXN0ON1+bTkx4m X7X+e3D/5M6bh1b/UUwLbmk7YPDTvDZ18qYD5/osE991JXLb2rHKVd66E/XocfuOX+bfaaf1c r29dvWdw8KKB3vsHvKoFL4KN7t2wjuJyYD4ZcKRRMGaqnNt9BrMTUe7v/R/0W7pMUAtRYinOS DTUYi4qTgQAY3jncbYCAAA= X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1472548540!55232198!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 57041 invoked from network); 30 Aug 2016 09:15:41 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-5.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 30 Aug 2016 09:15:41 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Tue, 30 Aug 2016 03:15:39 -0600 Message-Id: <57C56AD8020000780010A125@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.1 Date: Tue, 30 Aug 2016 03:15:36 -0600 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Cc: Stefano Stabellini , Wei Liu , Razvan Cojocaru , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , tamas@tklengyel.com Subject: [Xen-devel] [PATCH] memory: fix compat handling of XENMEM_access_op 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 Within compat_memory_op() this needs to be placed in the first switch() statement, or it ends up being dead code (as that first switch() has a default case chaining to compat_arch_memory_op()). Signed-off-by: Jan Beulich Tested-by: Razvan Cojocaru Reviewed-by: Andrew Cooper --- Compile tested only. memory: fix compat handling of XENMEM_access_op Within compat_memory_op() this needs to be placed in the first switch() statement, or it ends up being dead code (as that first switch() has a default case chaining to compat_arch_memory_op()). Signed-off-by: Jan Beulich --- Compile tested only. --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -320,6 +320,11 @@ int compat_memory_op(unsigned int cmd, X break; } + case XENMEM_access_op: + return mem_access_memop(cmd, + guest_handle_cast(compat, + xen_mem_access_op_t)); + case XENMEM_get_vnumainfo: { enum XLAT_vnuma_topology_info_vdistance vdistance = @@ -495,10 +500,6 @@ int compat_memory_op(unsigned int cmd, X break; } - case XENMEM_access_op: - rc = mem_access_memop(cmd, guest_handle_cast(compat, xen_mem_access_op_t)); - break; - case XENMEM_add_to_physmap_batch: start_extent = end_extent; break; --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -320,6 +320,11 @@ int compat_memory_op(unsigned int cmd, X break; } + case XENMEM_access_op: + return mem_access_memop(cmd, + guest_handle_cast(compat, + xen_mem_access_op_t)); + case XENMEM_get_vnumainfo: { enum XLAT_vnuma_topology_info_vdistance vdistance = @@ -495,10 +500,6 @@ int compat_memory_op(unsigned int cmd, X break; } - case XENMEM_access_op: - rc = mem_access_memop(cmd, guest_handle_cast(compat, xen_mem_access_op_t)); - break; - case XENMEM_add_to_physmap_batch: start_extent = end_extent; break;