Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 80761
b: refs/heads/master
c: 93a0039
h: refs/heads/master
i:
  80759: 4ea904b
v: v3
  • Loading branch information
Avi Kivity committed Jan 30, 2008
1 parent 83b90e1 commit 319a437
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b4231d61807cac8d9d257eb6979c1685fa9a171f
refs/heads/master: 93a0039c8d93074d5f92dfb69f6a7d453905d002
10 changes: 0 additions & 10 deletions trunk/drivers/kvm/x86.c
Original file line number Diff line number Diff line change
Expand Up @@ -1162,15 +1162,6 @@ int emulator_read_std(unsigned long addr,
}
EXPORT_SYMBOL_GPL(emulator_read_std);

static int emulator_write_std(unsigned long addr,
const void *val,
unsigned int bytes,
struct kvm_vcpu *vcpu)
{
pr_unimpl(vcpu, "emulator_write_std: addr %lx n %d\n", addr, bytes);
return X86EMUL_UNHANDLEABLE;
}

static int emulator_read_emulated(unsigned long addr,
void *val,
unsigned int bytes,
Expand Down Expand Up @@ -1367,7 +1358,6 @@ EXPORT_SYMBOL_GPL(kvm_report_emulation_failure);

struct x86_emulate_ops emulate_ops = {
.read_std = emulator_read_std,
.write_std = emulator_write_std,
.read_emulated = emulator_read_emulated,
.write_emulated = emulator_write_emulated,
.cmpxchg_emulated = emulator_cmpxchg_emulated,
Expand Down
11 changes: 0 additions & 11 deletions trunk/drivers/kvm/x86_emulate.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,6 @@ struct x86_emulate_ops {
int (*read_std)(unsigned long addr, void *val,
unsigned int bytes, struct kvm_vcpu *vcpu);

/*
* write_std: Write bytes of standard (non-emulated/special) memory.
* Used for stack operations, and others.
* @addr: [IN ] Linear address to which to write.
* @val: [IN ] Value to write to memory (low-order bytes used as
* required).
* @bytes: [IN ] Number of bytes to write to memory.
*/
int (*write_std)(unsigned long addr, const void *val,
unsigned int bytes, struct kvm_vcpu *vcpu);

/*
* read_emulated: Read bytes from emulated/special memory area.
* @addr: [IN ] Linear address from which to read.
Expand Down

0 comments on commit 319a437

Please sign in to comment.