From patchwork Thu Sep 8 13:19:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9321391 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 2777C607D3 for ; Thu, 8 Sep 2016 13:21:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 184C329880 for ; Thu, 8 Sep 2016 13:21:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CB7029888; Thu, 8 Sep 2016 13:21:46 +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 189B029883 for ; Thu, 8 Sep 2016 13:21:41 +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 1bhzEt-0001xv-RF; Thu, 08 Sep 2016 13:19:35 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bhzEs-0001xZ-Ku for xen-devel@lists.xenproject.org; Thu, 08 Sep 2016 13:19:34 +0000 Received: from [85.158.143.35] by server-7.bemta-6.messagelabs.com id 20/75-15404-56561D75; Thu, 08 Sep 2016 13:19:33 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrFIsWRWlGSWpSXmKPExsXS6fjDSzc19WK 4wax2HovvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPvtf+sBROVKyYdecLUwHhUoouRk0NIIE/i 6PV21i5GDg5eATuJy7OSQcISAoYST99fZwMJswioSqycrgYSZhNQl2h7th2sWkTAQOLc0SQQk 1lAX2LbOhaQCmGBQIlnaz6zQcy2k3h26iBYnFPAXuJL6xxGiD2CEn93CIOEmYFKmpZdYZnAyD MLITMLSQbC1pJ4+OsWlK0tsWzha+ZZYHulJZb/44AIW0h869/DhqoExHaWOPzrIusCRo5VjBr FqUVlqUW6hkZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTmJScV6yfm5mxiBYcoABDsYL28MOMQo ycGkJMrrU3whXIgvKT+lMiOxOCO+qDQntfgQowwHh5IEr17KxXAhwaLU9NSKtMwcYMTApCU4e JREeFVA0rzFBYm5xZnpEKlTjIpS4rw/k4ESAiCJjNI8uDZYlF5ilJUS5mUEOkSIpyC1KDezBF X+FaM4B6OSMK8fyHiezLwSuOmvgBYzAS0WOnUeZHFJIkJKqoFxwV0xNzmeBvsj1yRP2xyeVx7 tLWC4/KdvXqx7W9vRREcRzkzf5wKSiV7Gi24mLWjmYtKybRQrPuYzf4LD8waz0rN9GpdvOtnf 2x7odXn3CbFD0w01Dj+TT3Eodw2vybviEj59+6IHjw2/3QoVNRW61bNwuuHUP9GPfq73T6+q3 sn3+I12i78SS3FGoqEWc1FxIgAbo1lMzQIAAA== X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1473340771!31682999!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 24343 invoked from network); 8 Sep 2016 13:19:32 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-3.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Sep 2016 13:19:32 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Thu, 08 Sep 2016 07:19:31 -0600 Message-Id: <57D18183020000780010D1E2@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.1 Date: Thu, 08 Sep 2016 07:19:31 -0600 From: "Jan Beulich" To: "xen-devel" References: <57D17C78020000780010D127@prv-mh.provo.novell.com> In-Reply-To: <57D17C78020000780010D127@prv-mh.provo.novell.com> Mime-Version: 1.0 Cc: Andrew Cooper Subject: [Xen-devel] [PATCH 15/17] x86emul: sort opcode 0f01 special case switch() statement 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 Sort the special case opcode 0f01 entries numerically, insert blank lines between each of the cases, and properly place opening braces. Signed-off-by: Jan Beulich x86emul: sort opcode 0f01 special case switch() statement Sort the special case opcode 0f01 entries numerically, insert blank lines between each of the cases, and properly place opening braces. Signed-off-by: Jan Beulich --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -4192,6 +4192,14 @@ x86_emulate( } #endif + case 0xd4: /* vmfunc */ + generate_exception_if(lock_prefix | rep_prefix() | (vex.pfx == vex_66), + EXC_UD, -1); + fail_if(ops->vmfunc == NULL); + if ( (rc = ops->vmfunc(ctxt) != X86EMUL_OKAY) ) + goto done; + goto no_writeback; + case 0xdf: /* invlpga */ generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1); generate_exception_if(!mode_ring0(), EXC_GP, 0); @@ -4200,7 +4208,9 @@ x86_emulate( ctxt)) ) goto done; goto no_writeback; - case 0xf9: /* rdtscp */ { + + case 0xf9: /* rdtscp */ + { uint64_t tsc_aux; fail_if(ops->read_msr == NULL); if ( (rc = ops->read_msr(MSR_TSC_AUX, &tsc_aux, ctxt)) != 0 ) @@ -4208,14 +4218,9 @@ x86_emulate( _regs.ecx = (uint32_t)tsc_aux; goto rdtsc; } - case 0xd4: /* vmfunc */ - generate_exception_if(lock_prefix | rep_prefix() | (vex.pfx == vex_66), - EXC_UD, -1); - fail_if(ops->vmfunc == NULL); - if ( (rc = ops->vmfunc(ctxt) != X86EMUL_OKAY) ) - goto done; - goto no_writeback; - case 0xfc: /* clzero */ { + + case 0xfc: /* clzero */ + { unsigned int eax = 1, ebx = 0, dummy = 0; unsigned long zero = 0; --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -4192,6 +4192,14 @@ x86_emulate( } #endif + case 0xd4: /* vmfunc */ + generate_exception_if(lock_prefix | rep_prefix() | (vex.pfx == vex_66), + EXC_UD, -1); + fail_if(ops->vmfunc == NULL); + if ( (rc = ops->vmfunc(ctxt) != X86EMUL_OKAY) ) + goto done; + goto no_writeback; + case 0xdf: /* invlpga */ generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1); generate_exception_if(!mode_ring0(), EXC_GP, 0); @@ -4200,7 +4208,9 @@ x86_emulate( ctxt)) ) goto done; goto no_writeback; - case 0xf9: /* rdtscp */ { + + case 0xf9: /* rdtscp */ + { uint64_t tsc_aux; fail_if(ops->read_msr == NULL); if ( (rc = ops->read_msr(MSR_TSC_AUX, &tsc_aux, ctxt)) != 0 ) @@ -4208,14 +4218,9 @@ x86_emulate( _regs.ecx = (uint32_t)tsc_aux; goto rdtsc; } - case 0xd4: /* vmfunc */ - generate_exception_if(lock_prefix | rep_prefix() | (vex.pfx == vex_66), - EXC_UD, -1); - fail_if(ops->vmfunc == NULL); - if ( (rc = ops->vmfunc(ctxt) != X86EMUL_OKAY) ) - goto done; - goto no_writeback; - case 0xfc: /* clzero */ { + + case 0xfc: /* clzero */ + { unsigned int eax = 1, ebx = 0, dummy = 0; unsigned long zero = 0;