diff options
author | Avi Kivity <avi@qumranet.com> | 2007-11-20 05:49:31 -0500 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 10:53:09 -0500 |
commit | 93a0039c8d93074d5f92dfb69f6a7d453905d002 (patch) | |
tree | 23a693083f2bfcf85e161f64a2500bb7b13ad014 | |
parent | b4231d61807cac8d9d257eb6979c1685fa9a171f (diff) |
KVM: x86 emulator: retire ->write_std()
Theoretically used to acccess memory known to be ordinary RAM, it was
never implemented. It is questionable whether it is possible to implement
it correctly.
Signed-off-by: Avi Kivity <avi@qumranet.com>
-rw-r--r-- | drivers/kvm/x86.c | 10 | ||||
-rw-r--r-- | drivers/kvm/x86_emulate.h | 11 |
2 files changed, 0 insertions, 21 deletions
diff --git a/drivers/kvm/x86.c b/drivers/kvm/x86.c index 6212984a2e6c..5a54e328088d 100644 --- a/drivers/kvm/x86.c +++ b/drivers/kvm/x86.c | |||
@@ -1162,15 +1162,6 @@ int emulator_read_std(unsigned long addr, | |||
1162 | } | 1162 | } |
1163 | EXPORT_SYMBOL_GPL(emulator_read_std); | 1163 | EXPORT_SYMBOL_GPL(emulator_read_std); |
1164 | 1164 | ||
1165 | static int emulator_write_std(unsigned long addr, | ||
1166 | const void *val, | ||
1167 | unsigned int bytes, | ||
1168 | struct kvm_vcpu *vcpu) | ||
1169 | { | ||
1170 | pr_unimpl(vcpu, "emulator_write_std: addr %lx n %d\n", addr, bytes); | ||
1171 | return X86EMUL_UNHANDLEABLE; | ||
1172 | } | ||
1173 | |||
1174 | static int emulator_read_emulated(unsigned long addr, | 1165 | static int emulator_read_emulated(unsigned long addr, |
1175 | void *val, | 1166 | void *val, |
1176 | unsigned int bytes, | 1167 | unsigned int bytes, |
@@ -1367,7 +1358,6 @@ EXPORT_SYMBOL_GPL(kvm_report_emulation_failure); | |||
1367 | 1358 | ||
1368 | struct x86_emulate_ops emulate_ops = { | 1359 | struct x86_emulate_ops emulate_ops = { |
1369 | .read_std = emulator_read_std, | 1360 | .read_std = emulator_read_std, |
1370 | .write_std = emulator_write_std, | ||
1371 | .read_emulated = emulator_read_emulated, | 1361 | .read_emulated = emulator_read_emulated, |
1372 | .write_emulated = emulator_write_emulated, | 1362 | .write_emulated = emulator_write_emulated, |
1373 | .cmpxchg_emulated = emulator_cmpxchg_emulated, | 1363 | .cmpxchg_emulated = emulator_cmpxchg_emulated, |
diff --git a/drivers/kvm/x86_emulate.h b/drivers/kvm/x86_emulate.h index e34868b42c33..a62bf14bbf89 100644 --- a/drivers/kvm/x86_emulate.h +++ b/drivers/kvm/x86_emulate.h | |||
@@ -63,17 +63,6 @@ struct x86_emulate_ops { | |||
63 | unsigned int bytes, struct kvm_vcpu *vcpu); | 63 | unsigned int bytes, struct kvm_vcpu *vcpu); |
64 | 64 | ||
65 | /* | 65 | /* |
66 | * write_std: Write bytes of standard (non-emulated/special) memory. | ||
67 | * Used for stack operations, and others. | ||
68 | * @addr: [IN ] Linear address to which to write. | ||
69 | * @val: [IN ] Value to write to memory (low-order bytes used as | ||
70 | * required). | ||
71 | * @bytes: [IN ] Number of bytes to write to memory. | ||
72 | */ | ||
73 | int (*write_std)(unsigned long addr, const void *val, | ||
74 | unsigned int bytes, struct kvm_vcpu *vcpu); | ||
75 | |||
76 | /* | ||
77 | * read_emulated: Read bytes from emulated/special memory area. | 66 | * read_emulated: Read bytes from emulated/special memory area. |
78 | * @addr: [IN ] Linear address from which to read. | 67 | * @addr: [IN ] Linear address from which to read. |
79 | * @val: [OUT] Value read from memory, zero-extended to 'u_long'. | 68 | * @val: [OUT] Value read from memory, zero-extended to 'u_long'. |