summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-09-21 15:51:16 +0300
committerAvi Kivity <avi@redhat.com>2009-09-21 15:51:16 +0300
commit1048448d30182b6bea2eda8a1d3885d4262e762d (patch)
tree7250a3da887282fa79c44f45e01238317fc75e44 /kvm-all.c
parentMerge commit '5e520a7d500ec2569d22d80f9ef4272a34cb3c80' into upstream-merge (diff)
parentioports: remove unused env parameter and compile only once (diff)
downloadqemu-kvm-1048448d30182b6bea2eda8a1d3885d4262e762d.tar.gz
qemu-kvm-1048448d30182b6bea2eda8a1d3885d4262e762d.tar.bz2
qemu-kvm-1048448d30182b6bea2eda8a1d3885d4262e762d.zip
Merge commit 'afcea8cbdea8180b42093377b2c700d1b7f20b7c' into upstream-merge
* commit 'afcea8cbdea8180b42093377b2c700d1b7f20b7c': ioports: remove unused env parameter and compile only once Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'kvm-all.c')
-rw-r--r--kvm-all.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/kvm-all.c b/kvm-all.c
index f78f178a6..d45bd46ac 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -519,8 +519,8 @@ err:
return ret;
}
-static int kvm_handle_io(CPUState *env, uint16_t port, void *data,
- int direction, int size, uint32_t count)
+static int kvm_handle_io(uint16_t port, void *data, int direction, int size,
+ uint32_t count)
{
int i;
uint8_t *ptr = data;
@@ -529,25 +529,25 @@ static int kvm_handle_io(CPUState *env, uint16_t port, void *data,
if (direction == KVM_EXIT_IO_IN) {
switch (size) {
case 1:
- stb_p(ptr, cpu_inb(env, port));
+ stb_p(ptr, cpu_inb(port));
break;
case 2:
- stw_p(ptr, cpu_inw(env, port));
+ stw_p(ptr, cpu_inw(port));
break;
case 4:
- stl_p(ptr, cpu_inl(env, port));
+ stl_p(ptr, cpu_inl(port));
break;
}
} else {
switch (size) {
case 1:
- cpu_outb(env, port, ldub_p(ptr));
+ cpu_outb(port, ldub_p(ptr));
break;
case 2:
- cpu_outw(env, port, lduw_p(ptr));
+ cpu_outw(port, lduw_p(ptr));
break;
case 4:
- cpu_outl(env, port, ldl_p(ptr));
+ cpu_outl(port, ldl_p(ptr));
break;
}
}
@@ -627,7 +627,7 @@ int kvm_cpu_exec(CPUState *env)
switch (run->exit_reason) {
case KVM_EXIT_IO:
dprintf("handle_io\n");
- ret = kvm_handle_io(env, run->io.port,
+ ret = kvm_handle_io(run->io.port,
(uint8_t *)run + run->io.data_offset,
run->io.direction,
run->io.size,