summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2009-10-09 15:03:10 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2009-10-13 14:01:05 -0300
commit4885099532eb41d40f538a5ff5c6af306610d1ff (patch)
tree84981fce5f2e45e75386ba31e8913b45435f9c70 /qemu-kvm-x86.c
parentuse a more upstream friendly version of irqchip-in-kernel test (diff)
downloadqemu-kvm-4885099532eb41d40f538a5ff5c6af306610d1ff.tar.gz
qemu-kvm-4885099532eb41d40f538a5ff5c6af306610d1ff.tar.bz2
qemu-kvm-4885099532eb41d40f538a5ff5c6af306610d1ff.zip
drop kvm_mmio_read and write
they are just a tiny wrapper around qemu memory functions. Drop' em Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'qemu-kvm-x86.c')
-rw-r--r--qemu-kvm-x86.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index a44ae67ed..e8ec59d1c 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -364,7 +364,6 @@ void kvm_show_code(kvm_vcpu_context_t vcpu)
unsigned char code;
char code_str[SHOW_CODE_LEN * 3 + 1];
unsigned long rip;
- kvm_context_t kvm = vcpu->kvm;
r = ioctl(fd, KVM_GET_SREGS, &sregs);
if (r == -1) {
@@ -384,11 +383,7 @@ void kvm_show_code(kvm_vcpu_context_t vcpu)
for (n = -back_offset; n < SHOW_CODE_LEN-back_offset; ++n) {
if (n == 0)
strcat(code_str, " -->");
- r = kvm_mmio_read(kvm->opaque, rip + n, &code, 1);
- if (r < 0) {
- strcat(code_str, " xx");
- continue;
- }
+ cpu_physical_memory_rw(rip + n, &code, 1, 1);
sprintf(code_str + strlen(code_str), " %02x", code);
}
fprintf(stderr, "code:%s\n", code_str);