KVM: Allow passing 64-bit values to the emulated read/write API

This simplifies the API somewhat (by eliminating the special-case
cmpxchg8b on i386).

Signed-off-by: Avi Kivity <avi@qumranet.com>

1 files changed, 6 insertions, 26 deletions

diff --git a/drivers/kvm/x86_emulate.h b/drivers/kvm/x86_emulate.h
index 5d41bd55125e..ea3407d7feee 100644
--- a/drivers/kvm/x86_emulate.h
+++ b/drivers/kvm/x86_emulate.h
@@ -59,8 +59,7 @@ struct x86_emulate_ops {
          *  @val:   [OUT] Value read from memory, zero-extended to 'u_long'.
          *  @bytes: [IN ] Number of bytes to read from memory.
          */
-        int (*read_std)(unsigned long addr,
-                        unsigned long *val,
+        int (*read_std)(unsigned long addr, void *val,
                         unsigned int bytes, struct x86_emulate_ctxt * ctxt);
 
         /*
@@ -71,8 +70,7 @@ struct x86_emulate_ops {
          *                required).
          *  @bytes: [IN ] Number of bytes to write to memory.
          */
-        int (*write_std)(unsigned long addr,
-                         unsigned long val,
+        int (*write_std)(unsigned long addr, const void *val,
                          unsigned int bytes, struct x86_emulate_ctxt * ctxt);
 
         /*
@@ -82,7 +80,7 @@ struct x86_emulate_ops {
          *  @bytes: [IN ] Number of bytes to read from memory.
          */
         int (*read_emulated) (unsigned long addr,
-                              unsigned long *val,
+                              void *val,
                               unsigned int bytes,
                               struct x86_emulate_ctxt * ctxt);
 
@@ -94,7 +92,7 @@ struct x86_emulate_ops {
          *  @bytes: [IN ] Number of bytes to write to memory.
          */
         int (*write_emulated) (unsigned long addr,
-                               unsigned long val,
+                               const void *val,
                                unsigned int bytes,
                                struct x86_emulate_ctxt * ctxt);
 
@@ -107,29 +105,11 @@ struct x86_emulate_ops {
          *  @bytes: [IN ] Number of bytes to access using CMPXCHG.
          */
         int (*cmpxchg_emulated) (unsigned long addr,
-                                 unsigned long old,
-                                 unsigned long new,
+                                 const void *old,
+                                 const void *new,
                                  unsigned int bytes,
                                  struct x86_emulate_ctxt * ctxt);
 
-        /*
-         * cmpxchg8b_emulated: Emulate an atomic (LOCKed) CMPXCHG8B operation on an
-         *                     emulated/special memory area.
-         *  @addr:  [IN ] Linear address to access.
-         *  @old:   [IN ] Value expected to be current at @addr.
-         *  @new:   [IN ] Value to write to @addr.
-         * NOTES:
-         *  1. This function is only ever called when emulating a real CMPXCHG8B.
-         *  2. This function is *never* called on x86/64 systems.
-         *  2. Not defining this function (i.e., specifying NULL) is equivalent
-         *     to defining a function that always returns X86EMUL_UNHANDLEABLE.
-         */
-        int (*cmpxchg8b_emulated) (unsigned long addr,
-                                   unsigned long old_lo,
-                                   unsigned long old_hi,
-                                   unsigned long new_lo,
-                                   unsigned long new_hi,
-                                   struct x86_emulate_ctxt * ctxt);
 };
 
 struct cpu_user_regs;