From 319a437e47374258c7629b541f95e455b5840951 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Tue, 20 Nov 2007 12:49:31 +0200
Subject: [PATCH] --- yaml --- r: 80761 b: refs/heads/master c:
 93a0039c8d93074d5f92dfb69f6a7d453905d002 h: refs/heads/master i:   80759:
 4ea904b873a4f63e7ae817889b81939527eab54a v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/kvm/x86.c         | 10 ----------
 trunk/drivers/kvm/x86_emulate.h | 11 -----------
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 13fc00424e53..6f638f23ae33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4231d61807cac8d9d257eb6979c1685fa9a171f
+refs/heads/master: 93a0039c8d93074d5f92dfb69f6a7d453905d002
diff --git a/trunk/drivers/kvm/x86.c b/trunk/drivers/kvm/x86.c
index 6212984a2e6c..5a54e328088d 100644
--- a/trunk/drivers/kvm/x86.c
+++ b/trunk/drivers/kvm/x86.c
@@ -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,
@@ -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,
diff --git a/trunk/drivers/kvm/x86_emulate.h b/trunk/drivers/kvm/x86_emulate.h
index e34868b42c33..a62bf14bbf89 100644
--- a/trunk/drivers/kvm/x86_emulate.h
+++ b/trunk/drivers/kvm/x86_emulate.h
@@ -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.