From: "Egger, Christoph" <chegger@amazon.de>
To: Haozhong Zhang <haozhong.zhang@intel.com>,
xen-devel@lists.xen.org, Ian Campbell <ian.campbell@citrix.com>,
Wei Liu <wei.liu2@citrix.com>, Jan Beulich <jbeulich@suse.com>,
Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Liu Jinsong <jinsong.liu@alibaba-inc.com>,
Keir Fraser <keir@xen.org>,
Ian Jackson <ian.jackson@eu.citrix.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: Re: [PATCH v2 2/4] tools/xen-mceinj: Fix code style
Date: Wed, 16 Sep 2015 10:42:05 +0200 [thread overview]
Message-ID: <55F92B5D.8000203@amazon.de> (raw)
In-Reply-To: <1442381715-30893-3-git-send-email-haozhong.zhang@intel.com>
On 2015/09/16 7:35, Haozhong Zhang wrote:
> Remove trailing whitespaces in xen-mceinj.c.
>
> Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com>
Acked-by: Christoph Egger <chegger@amazon.de>
> ---
> tools/tests/mce-test/tools/xen-mceinj.c | 66 ++++++++++++++++-----------------
> 1 file changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c
> index e2e49cb..71813c6 100644
> --- a/tools/tests/mce-test/tools/xen-mceinj.c
> +++ b/tools/tests/mce-test/tools/xen-mceinj.c
> @@ -13,7 +13,7 @@
> *
> * You should have received a copy of the GNU General Public License along with
> * this program; If not, see <http://www.gnu.org/licenses/>.
> - *
> + *
> * Authors: Yunhong Jiang <yunhong.jiang@intel.com>
> * Haicheng Li <haicheng.li@intel.com>
> * Xudong Hao <xudong.hao@intel.com>
> @@ -217,18 +217,18 @@ static uint64_t bank_addr(int bank, int type)
>
> switch ( type )
> {
> - case MCi_type_CTL:
> - case MCi_type_STATUS:
> - case MCi_type_ADDR:
> - case MCi_type_MISC:
> - addr = MSR_IA32_MC0_CTL + (bank * 4) + type;
> - break;
> - case MCi_type_CTL2:
> - addr = MSR_IA32_MC0_CTL2 + bank;
> - break;
> - default:
> - addr = INVALID_MSR;
> - break;
> + case MCi_type_CTL:
> + case MCi_type_STATUS:
> + case MCi_type_ADDR:
> + case MCi_type_MISC:
> + addr = MSR_IA32_MC0_CTL + (bank * 4) + type;
> + break;
> + case MCi_type_CTL2:
> + addr = MSR_IA32_MC0_CTL2 + bank;
> + break;
> + default:
> + addr = INVALID_MSR;
> + break;
> }
>
> return addr;
> @@ -243,7 +243,7 @@ static int add_msr_intpose(xc_interface *xc_handle,
> uint32_t count;
>
> if ( (msr_inj.mcinj_count &&
> - (cpu_nr != msr_inj.mcinj_cpunr || flags != msr_inj.mcinj_flags)) ||
> + (cpu_nr != msr_inj.mcinj_cpunr || flags != msr_inj.mcinj_flags)) ||
> msr_inj.mcinj_count == MC_MSRINJ_MAXMSRS )
> {
> flush_msr_inj(xc_handle);
> @@ -282,8 +282,8 @@ static int add_msr_bank_intpose(xc_interface *xc_handle,
> #define mfn_valid(_mfn) (_mfn != MCE_INVALID_MFN)
> #define mfn_to_pfn(_mfn) (live_m2p[(_mfn)])
> static uint64_t guest_mfn(xc_interface *xc_handle,
> - uint32_t domain,
> - uint64_t gpfn)
> + uint32_t domain,
> + uint64_t gpfn)
> {
> xen_pfn_t *live_m2p = NULL;
> int ret;
> @@ -300,8 +300,8 @@ static uint64_t guest_mfn(xc_interface *xc_handle,
> return MCE_INVALID_MFN;
>
> /* Get max gpfn */
> - max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain,
> - sizeof(domain)) + 1;
> + max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain,
> + sizeof(domain)) + 1;
> if ( max_gpfn <= 0 )
> err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn);
>
> @@ -360,8 +360,8 @@ static uint64_t mca_gpfn_to_mfn(xc_interface *xc_handle,
> if ( domain == DOMID_XEN )
> return gfn;
>
> - max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain,
> - sizeof(domain)) + 1;
> + max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain,
> + sizeof(domain)) + 1;
> if ( max_gpfn <= 0 )
> err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn);
> index = gfn % max_gpfn;
> @@ -374,7 +374,7 @@ static int inject_mcg_status(xc_interface *xc_handle,
> uint64_t val)
> {
> return add_msr_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE,
> - MSR_IA32_MCG_STATUS, val);
> + MSR_IA32_MCG_STATUS, val);
> }
>
> static int inject_mci_status(xc_interface *xc_handle,
> @@ -383,25 +383,25 @@ static int inject_mci_status(xc_interface *xc_handle,
> uint64_t val)
> {
> return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE,
> - MCi_type_STATUS, bank, val);
> + MCi_type_STATUS, bank, val);
> }
>
> static int inject_mci_misc(xc_interface *xc_handle,
> - uint32_t cpu_nr,
> - uint64_t bank,
> - uint64_t val)
> + uint32_t cpu_nr,
> + uint64_t bank,
> + uint64_t val)
> {
> return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE,
> - MCi_type_MISC, bank, val);
> + MCi_type_MISC, bank, val);
> }
>
> static int inject_mci_addr(xc_interface *xc_handle,
> - uint32_t cpu_nr,
> - uint64_t bank,
> - uint64_t val)
> + uint32_t cpu_nr,
> + uint64_t bank,
> + uint64_t val)
> {
> return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE,
> - MCi_type_ADDR, bank, val);
> + MCi_type_ADDR, bank, val);
> }
>
> static int inject(xc_interface *xc_handle, struct mce_info *mce,
> @@ -553,7 +553,7 @@ int main(int argc, char *argv[])
> return 0;
> }
> }
> -
> +
> if ( domid != DOMID_XEN ) {
> max_gpa = xs_get_dom_mem(domid);
> Lprintf("get domain %d max gpa is: 0x%lx", domid, max_gpa);
> @@ -570,7 +570,7 @@ int main(int argc, char *argv[])
> haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1));
> if ( domid == DOMID_XEN )
> Lprintf("Xen: mfn=0x%lx, haddr=0x%lx", mfn, haddr);
> - else
> + else
> Lprintf("Dom%d: gaddr=0x%lx, gpfn=0x%lx, mfn=0x%lx, haddr=0x%lx",
> domid, gaddr, gpfn, mfn, haddr);
> goto out;
> @@ -583,7 +583,7 @@ int main(int argc, char *argv[])
>
> inject(xc_handle, &mce_table[type], cpu_nr, domid, gaddr);
>
> -out:
> + out:
> xc_interface_close(xc_handle);
> return 0;
> }
>
Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B
next prev parent reply other threads:[~2015-09-16 8:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-16 5:35 [PATCH v2 0/4] Fix tools/xen-mceinj to handle >=4GB guest memory Haozhong Zhang
2015-09-16 5:35 ` [PATCH v2 1/4] x86/mce: Fix code style Haozhong Zhang
2015-09-16 8:28 ` Egger, Christoph
2015-09-16 5:35 ` [PATCH v2 2/4] tools/xen-mceinj: " Haozhong Zhang
2015-09-16 7:45 ` Wei Liu
2015-09-16 7:52 ` Haozhong Zhang
2015-09-16 7:56 ` Wei Liu
2015-09-16 7:58 ` Wei Liu
2015-09-16 8:02 ` Haozhong Zhang
2015-09-16 8:42 ` Egger, Christoph [this message]
2015-09-16 5:35 ` [PATCH v2 3/4] x86/mce: Translate passed-in GPA to host machine address Haozhong Zhang
2015-09-16 8:27 ` Egger, Christoph
2015-09-16 5:35 ` [PATCH v2 4/4] tools/xen-mceinj: Pass in GPA when injecting through MSR_MCI_ADDR Haozhong Zhang
2015-09-16 8:18 ` Egger, Christoph
2015-09-16 9:42 ` Jan Beulich
2015-09-16 10:40 ` Wei Liu
2015-09-16 10:54 ` [PATCH v2 0/4] Fix tools/xen-mceinj to handle >=4GB guest memory Ian Jackson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55F92B5D.8000203@amazon.de \
--to=chegger@amazon.de \
--cc=andrew.cooper3@citrix.com \
--cc=haozhong.zhang@intel.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=jinsong.liu@alibaba-inc.com \
--cc=keir@xen.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).