From 47f3d3fa6dc77f47ac6b4d992f560ef82b714220 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Wed, 24 Feb 2016 12:06:28 +0100 Subject: [PATCH] xenoprof: drop unnecessary macro This macro doesn't really provide a benefit. When support is added the implementer can implement this how it needs to be and not conform to the macro. Additionally this change limits the output of the warning to just once instead of nrpages worth. While editing this area I dropped trailing whitespace. Signed-off-by: Doug Goldstein Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/common/xenoprof.c | 7 +++++-- xen/include/asm-x86/xenoprof.h | 8 -------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/xen/common/xenoprof.c b/xen/common/xenoprof.c index 7a3fc862e9..a5fe6204a5 100644 --- a/xen/common/xenoprof.c +++ b/xen/common/xenoprof.c @@ -177,11 +177,14 @@ xenoprof_shared_gmfn_with_guest( struct domain *d, unsigned long maddr, unsigned long gmaddr, int npages) { int i; - + for ( i = 0; i < npages; i++, maddr += PAGE_SIZE, gmaddr += PAGE_SIZE ) { BUG_ON(page_get_owner(maddr_to_page(maddr)) != d); - xenoprof_shared_gmfn(d, gmaddr, maddr); + if ( i == 0 ) + gdprintk(XENLOG_WARNING, + "xenoprof unsupported with autotranslated guests\n"); + } } diff --git a/xen/include/asm-x86/xenoprof.h b/xen/include/asm-x86/xenoprof.h index dca422336f..3a1b001edb 100644 --- a/xen/include/asm-x86/xenoprof.h +++ b/xen/include/asm-x86/xenoprof.h @@ -62,14 +62,6 @@ static inline int xenoprof_backtrace_supported(void) void xenoprof_backtrace(struct vcpu *, const struct cpu_user_regs *, unsigned long depth, int mode); -#define xenoprof_shared_gmfn(d, gmaddr, maddr) \ - do { \ - (void)(maddr); \ - gdprintk(XENLOG_WARNING, \ - "xenoprof/x86 with autotranslated mode enabled" \ - "isn't supported yet\n"); \ - } while (0) - int passive_domain_do_rdmsr(unsigned int msr, uint64_t *msr_content); int passive_domain_do_wrmsr(unsigned int msr, uint64_t msr_content); void passive_domain_destroy(struct vcpu *v); -- 2.39.5