From mboxrd@z Thu Jan 1 00:00:00 1970 From: Don Slutz Subject: [PATCH v3 08/16] xenctx: Change print_symbol to do the space before. Date: Mon, 11 Nov 2013 13:15:14 -0500 Message-ID: <1384193722-2916-9-git-send-email-dslutz@terremark.com> References: <1384193722-2916-1-git-send-email-dslutz@terremark.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1384193722-2916-1-git-send-email-dslutz@terremark.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Ian Campbell , Stefano Stabellini , George Dunlap , Don Slutz , Ian Jackson , Jan Beulich List-Id: xen-devel@lists.xenproject.org From: Don Slutz This stops the output of an extra space at the end of the line. Signed-off-by: Don Slutz Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- tools/xentrace/xenctx.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c index a88c347..c0d7bf6 100644 --- a/tools/xentrace/xenctx.c +++ b/tools/xentrace/xenctx.c @@ -164,9 +164,9 @@ static void print_symbol(guest_word_t addr) return; if (addr==s->address) - printf("%s ", s->name); + printf(" %s", s->name); else - printf("%s+%#x ", s->name, (unsigned int)(addr - s->address)); + printf(" %s+%#x", s->name, (unsigned int)(addr - s->address)); } static void read_symbol_table(const char *symtab) @@ -293,7 +293,7 @@ static void print_ctx_32(vcpu_guest_context_x86_32_t *ctx) { struct cpu_user_regs_x86_32 *regs = &ctx->user_regs; - printf("cs:eip: %04x:%08x ", regs->cs, regs->eip); + printf("cs:eip: %04x:%08x", regs->cs, regs->eip); print_symbol(regs->eip); print_flags(regs->eflags); printf("ss:esp: %04x:%08x\n", regs->ss, regs->esp); @@ -322,7 +322,7 @@ static void print_ctx_32on64(vcpu_guest_context_x86_64_t *ctx) { struct cpu_user_regs_x86_64 *regs = &ctx->user_regs; - printf("cs:eip: %04x:%08x ", regs->cs, (uint32_t)regs->eip); + printf("cs:eip: %04x:%08x", regs->cs, (uint32_t)regs->eip); print_symbol((uint32_t)regs->eip); print_flags((uint32_t)regs->eflags); printf("ss:esp: %04x:%08x\n", regs->ss, (uint32_t)regs->esp); @@ -351,7 +351,7 @@ static void print_ctx_64(vcpu_guest_context_x86_64_t *ctx) { struct cpu_user_regs_x86_64 *regs = &ctx->user_regs; - printf("rip: %016"PRIx64" ", regs->rip); + printf("rip: %016"PRIx64, regs->rip); print_symbol(regs->rip); print_flags(regs->rflags); printf("rsp: %016"PRIx64"\n", regs->rsp); @@ -449,7 +449,7 @@ static void print_ctx_32(vcpu_guest_context_t *ctx) { vcpu_guest_core_regs_t *regs = &ctx->user_regs; - printf("PC: %08"PRIx32" ", regs->pc32); + printf("PC: %08"PRIx32, regs->pc32); print_symbol(regs->pc32); printf("\n"); printf("CPSR: %08"PRIx32"\n", regs->cpsr); @@ -501,7 +501,7 @@ static void print_ctx_64(vcpu_guest_context_t *ctx) { vcpu_guest_core_regs_t *regs = &ctx->user_regs; - printf("PC: %016"PRIx64" ", regs->pc64); + printf("PC: %016"PRIx64, regs->pc64); print_symbol(regs->pc64); printf("\n"); @@ -713,7 +713,7 @@ static int print_stack(vcpu_guest_context_any_t *ctx, int vcpu, int width) printf("Call Trace:\n"); printf("%c [<", xenctx.stack_trace ? '*' : ' '); print_stack_word(instr_pointer(ctx), width); - printf(">] "); + printf(">]"); print_symbol(instr_pointer(ctx)); printf(" <--\n"); @@ -753,7 +753,7 @@ static int print_stack(vcpu_guest_context_any_t *ctx, int vcpu, int width) word = read_stack_word(p, width); printf("%c [<", xenctx.stack_trace ? '|' : ' '); print_stack_word(word, width); - printf(">] "); + printf(">]"); print_symbol(word); printf("\n"); stack += width; @@ -769,7 +769,7 @@ static int print_stack(vcpu_guest_context_any_t *ctx, int vcpu, int width) if (is_kernel_text(word)) { printf(" [<"); print_stack_word(word, width); - printf(">] "); + printf(">]"); print_symbol(word); printf("\n"); } else if (xenctx.stack_trace) { -- 1.8.4