From e40a01b0fb502629e345442ddb8feb07357c1de7 Mon Sep 17 00:00:00 2001 From: Don Slutz Date: Thu, 3 Apr 2014 15:07:09 -0400 Subject: [PATCH] xenctx: Fix print_ctx_32on64's print_special call. print_special() uses the width argument to both select output format and array size. So by passing 4 it expects an array of uint32_t. But an array of uint64_t is passed. So copy and mask the registers to 32 bits. Signed-off-by: Don Slutz Acked-by: Ian Campbell --- tools/xentrace/xenctx.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c index 665599049d..82bd789559 100644 --- a/tools/xentrace/xenctx.c +++ b/tools/xentrace/xenctx.c @@ -420,8 +420,15 @@ static void print_ctx_32on64(vcpu_guest_context_x86_64_t *ctx) printf(" gs: %04x\n", regs->gs); if (xenctx.disp_all) { - print_special(ctx->ctrlreg, "cr", 0x1d, cr_reg_mask, 4); - print_special(ctx->debugreg, "dr", 0xcf, dr_reg_mask, 4); + uint32_t tmp_regs[8]; + int i; + + for (i = 0; i < 5; i++) + tmp_regs[i] = ctx->ctrlreg[i]; + print_special(tmp_regs, "cr", 0x1d, cr_reg_mask, 4); + for (i = 0; i < 8; i++) + tmp_regs[i] = ctx->debugreg[i]; + print_special(tmp_regs, "dr", 0xcf, dr_reg_mask, 4); } } -- 2.30.2