[tip:tools/kvm] kvm tools: arm: fix fallout from debug_fd refactoring

[tip-bot for Will Deacon <will.deacon@xxxxxxx>]

Commit-ID:  a5dd60f43546249efb7dd872787cbc4817c1dc57
Gitweb:     http://git.kernel.org/tip/a5dd60f43546249efb7dd872787cbc4817c1dc57
Author:     Will Deacon <will.deacon@xxxxxxx>
AuthorDate: Sun, 3 Feb 2013 15:37:48 +0000
Committer:  Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Mon, 4 Feb 2013 16:24:46 +0200

kvm tools: arm: fix fallout from debug_fd refactoring

Commit 21692d19f744 ("kvm tools: Beautify debug output") changed the
kvm__dump_mem prototype but only fixed up calls from x86.

This patch fixes arm to pass the debug_fd as required.

Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
 tools/kvm/arm/aarch32/kvm-cpu.c | 11 +++++------
 tools/kvm/arm/aarch64/kvm-cpu.c | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/tools/kvm/arm/aarch32/kvm-cpu.c b/tools/kvm/arm/aarch32/kvm-cpu.c
index a528789..6a012db 100644
--- a/tools/kvm/arm/aarch32/kvm-cpu.c
+++ b/tools/kvm/arm/aarch32/kvm-cpu.c
@@ -54,25 +54,24 @@ void kvm_cpu__show_code(struct kvm_cpu *vcpu)
 {
 	struct kvm_one_reg reg;
 	u32 data;
+	int debug_fd = kvm_cpu__get_debug_fd();
 
 	reg.addr = (u64)(unsigned long)&data;
 
-	printf("*pc:\n");
+	dprintf(debug_fd, "\n*pc:\n");
 	reg.id = ARM_CORE_REG(usr_regs.ARM_pc);
 	if (ioctl(vcpu->vcpu_fd, KVM_GET_ONE_REG, &reg) < 0)
 		die("KVM_GET_ONE_REG failed (show_code @ PC)");
 
-	kvm__dump_mem(vcpu->kvm, data, 32);
-	printf("\n");
+	kvm__dump_mem(vcpu->kvm, data, 32, debug_fd);
 
-	printf("*lr (svc):\n");
+	dprintf(debug_fd, "\n*lr (svc):\n");
 	reg.id = ARM_CORE_REG(svc_regs[1]);
 	if (ioctl(vcpu->vcpu_fd, KVM_GET_ONE_REG, &reg) < 0)
 		die("KVM_GET_ONE_REG failed (show_code @ LR_svc)");
 	data &= ~0x1;
 
-	kvm__dump_mem(vcpu->kvm, data, 32);
-	printf("\n");
+	kvm__dump_mem(vcpu->kvm, data, 32, debug_fd);
 }
 
 void kvm_cpu__show_registers(struct kvm_cpu *vcpu)
diff --git a/tools/kvm/arm/aarch64/kvm-cpu.c b/tools/kvm/arm/aarch64/kvm-cpu.c
index 2eb06ea..7cdcb70 100644
--- a/tools/kvm/arm/aarch64/kvm-cpu.c
+++ b/tools/kvm/arm/aarch64/kvm-cpu.c
@@ -109,24 +109,23 @@ void kvm_cpu__show_code(struct kvm_cpu *vcpu)
 {
 	struct kvm_one_reg reg;
 	unsigned long data;
+	int debug_fd = kvm_cpu__get_debug_fd();
 
 	reg.addr = (u64)&data;
 
-	printf("*pc:\n");
+	dprintf(debug_fd, "\n*pc:\n");
 	reg.id = ARM64_CORE_REG(regs.pc);
 	if (ioctl(vcpu->vcpu_fd, KVM_GET_ONE_REG, &reg) < 0)
 		die("KVM_GET_ONE_REG failed (show_code @ PC)");
 
-	kvm__dump_mem(vcpu->kvm, data, 32);
-	printf("\n");
+	kvm__dump_mem(vcpu->kvm, data, 32, debug_fd);
 
-	printf("*lr:\n");
+	dprintf(debug_fd, "\n*lr:\n");
 	reg.id = ARM64_CORE_REG(regs.regs[30]);
 	if (ioctl(vcpu->vcpu_fd, KVM_GET_ONE_REG, &reg) < 0)
 		die("KVM_GET_ONE_REG failed (show_code @ LR)");
 
-	kvm__dump_mem(vcpu->kvm, data, 32);
-	printf("\n");
+	kvm__dump_mem(vcpu->kvm, data, 32, debug_fd);
 }
 
 void kvm_cpu__show_registers(struct kvm_cpu *vcpu)
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html