KVM: x86 emulator: whitespace cleanups

Clean up lines longer than 80 columns.  No code changes.

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

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index e1f77de..4a5b61f 100644 (file)
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -262,42 +262,42 @@ struct gprefix {
                             "w", "r", _LO32, "r", "", "r")
 
 /* Instruction has three operands and one operand is stored in ECX register */
-#define __emulate_2op_cl(_op, _cl, _src, _dst, _eflags, _suffix, _type)        \
-       do {                                                                    \
-               unsigned long _tmp;                                             \
-               _type _clv  = (_cl).val;                                        \
-               _type _srcv = (_src).val;                                       \
-               _type _dstv = (_dst).val;                                       \
-                                                                               \
-               __asm__ __volatile__ (                                          \
-                       _PRE_EFLAGS("0", "5", "2")                              \
-                       _op _suffix " %4,%1 \n"                                 \
-                       _POST_EFLAGS("0", "5", "2")                             \
-                       : "=m" (_eflags), "+r" (_dstv), "=&r" (_tmp)            \
-                       : "c" (_clv) , "r" (_srcv), "i" (EFLAGS_MASK)           \
-                       );                                                      \
-                                                                               \
-               (_cl).val  = (unsigned long) _clv;                              \
-               (_src).val = (unsigned long) _srcv;                             \
-               (_dst).val = (unsigned long) _dstv;                             \
+#define __emulate_2op_cl(_op, _cl, _src, _dst, _eflags, _suffix, _type)        \
+       do {                                                            \
+               unsigned long _tmp;                                     \
+               _type _clv  = (_cl).val;                                \
+               _type _srcv = (_src).val;                               \
+               _type _dstv = (_dst).val;                               \
+                                                                       \
+               __asm__ __volatile__ (                                  \
+                       _PRE_EFLAGS("0", "5", "2")                      \
+                       _op _suffix " %4,%1 \n"                         \
+                       _POST_EFLAGS("0", "5", "2")                     \
+                       : "=m" (_eflags), "+r" (_dstv), "=&r" (_tmp)    \
+                       : "c" (_clv) , "r" (_srcv), "i" (EFLAGS_MASK)   \
+                       );                                              \
+                                                                       \
+               (_cl).val  = (unsigned long) _clv;                      \
+               (_src).val = (unsigned long) _srcv;                     \
+               (_dst).val = (unsigned long) _dstv;                     \
        } while (0)
 
-#define emulate_2op_cl(_op, _cl, _src, _dst, _eflags)                          \
-       do {                                                                    \
-               switch ((_dst).bytes) {                                         \
-               case 2:                                                         \
-                       __emulate_2op_cl(_op, _cl, _src, _dst, _eflags,         \
-                                               "w", unsigned short);           \
-                       break;                                                  \
-               case 4:                                                         \
-                       __emulate_2op_cl(_op, _cl, _src, _dst, _eflags,         \
-                                               "l", unsigned int);             \
-                       break;                                                  \
-               case 8:                                                         \
-                       ON64(__emulate_2op_cl(_op, _cl, _src, _dst, _eflags,    \
-                                               "q", unsigned long));           \
-                       break;                                                  \
-               }                                                               \
+#define emulate_2op_cl(_op, _cl, _src, _dst, _eflags)                  \
+       do {                                                            \
+               switch ((_dst).bytes) {                                 \
+               case 2:                                                 \
+                       __emulate_2op_cl(_op, _cl, _src, _dst, _eflags, \
+                                        "w", unsigned short);          \
+                       break;                                          \
+               case 4:                                                 \
+                       __emulate_2op_cl(_op, _cl, _src, _dst, _eflags, \
+                                        "l", unsigned int);            \
+                       break;                                          \
+               case 8:                                                 \
+                       ON64(__emulate_2op_cl(_op, _cl, _src, _dst, _eflags, \
+                                             "q", unsigned long));     \
+                       break;                                          \
+               }                                                       \
        } while (0)
 
 #define __emulate_1op(_op, _dst, _eflags, _suffix)                     \
@@ -360,13 +360,25 @@ struct gprefix {
        } while (0)
 
 /* instruction has only one source operand, destination is implicit (e.g. mul, div, imul, idiv) */
-#define emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags)                    \
-       do {                                                                    \
-               switch((_src).bytes) {                                          \
-               case 1: __emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags, "b"); break; \
-               case 2: __emulate_1op_rax_rdx(_op, _src, _rax, _rdx,  _eflags, "w"); break; \
-               case 4: __emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags, "l"); break; \
-               case 8: ON64(__emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags, "q")); break; \
+#define emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags)            \
+       do {                                                            \
+               switch((_src).bytes) {                                  \
+               case 1:                                                 \
+                       __emulate_1op_rax_rdx(_op, _src, _rax, _rdx,    \
+                                             _eflags, "b");            \
+                       break;                                          \
+               case 2:                                                 \
+                       __emulate_1op_rax_rdx(_op, _src, _rax, _rdx,    \
+                                             _eflags, "w");            \
+                       break;                                          \
+               case 4:                                                 \
+                       __emulate_1op_rax_rdx(_op, _src, _rax, _rdx,    \
+                                             _eflags, "l");            \
+                       break;                                          \
+               case 8:                                                 \
+                       ON64(__emulate_1op_rax_rdx(_op, _src, _rax, _rdx, \
+                                                  _eflags, "q"));      \
+                       break;                                          \
                }                                                       \
        } while (0)
 
@@ -402,7 +414,7 @@ struct gprefix {
        (_type)_x;                                                      \
 })
 
-#define insn_fetch_arr(_arr, _size, _eip)                                \
+#define insn_fetch_arr(_arr, _size, _eip)                              \
 ({     rc = do_insn_fetch(ctxt, ops, (_eip), _arr, (_size));           \
        if (rc != X86EMUL_CONTINUE)                                     \
                goto done;                                              \