Revert "kvm: x86: Save/restore exception_index"

This reverts commit ebbc8a3d8e76d0402f8a08c10c0f32e24715d41d.

As suggested by Jan Kiszka,

  "It was obsoleted by d1793b836f8f123b961c613de1bb1c0c185c84cc and now
   saves/restores a useless field."

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit acb6685feaeea0989d29b6f12e96fea48e8ce9d9)

diff --git a/cpu-defs.h b/cpu-defs.h
index 51dc436b4f1172e6bbf22861bb5dd5812432b6c1..95068b530432ed38372d7eacfac50b7b015c52d8 100644 (file)
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -179,7 +179,7 @@ typedef struct CPUWatchpoint {
                                                                         \
     /* Core interrupt code */                                           \
     jmp_buf jmp_env;                                                    \
-    int32_t exception_index;                                            \
+    int exception_index;                                                \
                                                                         \
     CPUState *next_cpu; /* next CPU sharing TB cache */                 \
     int cpu_index; /* CPU index (informative) */                        \

diff --git a/target-i386/machine.c b/target-i386/machine.c
index 567e01ec6f24736832aa946cac09f07fd192c479..87704918beec94aaed2bace1cc57bc124fa4a3d0 100644 (file)
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -454,7 +454,6 @@ static const VMStateDescription vmstate_cpu = {
         VMSTATE_UINT8_V(nmi_pending, CPUState, 11),
         VMSTATE_UINT8_V(has_error_code, CPUState, 11),
         VMSTATE_UINT32_V(sipi_vector, CPUState, 11),
-        VMSTATE_INT32_V(exception_index, CPUState, 11),
         /* MCE */
         VMSTATE_UINT64_V(mcg_cap, CPUState, 10),
         VMSTATE_UINT64_V(mcg_status, CPUState, 10),