diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-04 09:14:24 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-04 09:14:24 -0600 |
| commit | f374e826e340ea1e2de2e9b006b3ac5dbde1324f (patch) | |
| tree | b671d3bee2582bb9de531eaeb4724dfc8ddf8881 /target-i386/machine.c | |
| parent | 78728c92a4137a96f1d0c49496d02dd9aa9d71b6 (diff) | |
| parent | 6cb2996cef5e273ef370e690e84b5e1403f5c391 (diff) | |
| download | focaccia-qemu-f374e826e340ea1e2de2e9b006b3ac5dbde1324f.tar.gz focaccia-qemu-f374e826e340ea1e2de2e9b006b3ac5dbde1324f.zip | |
Merge remote branch 'qemu-kvm/uq/master' into pulls
Diffstat (limited to 'target-i386/machine.c')
| -rw-r--r-- | target-i386/machine.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/target-i386/machine.c b/target-i386/machine.c index 87704918be..b547e2ac7a 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -321,8 +321,6 @@ static void cpu_pre_save(void *opaque) CPUState *env = opaque; int i; - cpu_synchronize_state(env); - /* FPU */ env->fpus_vmstate = (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11; env->fptag_vmstate = 0; @@ -337,14 +335,6 @@ static void cpu_pre_save(void *opaque) #endif } -static int cpu_pre_load(void *opaque) -{ - CPUState *env = opaque; - - cpu_synchronize_state(env); - return 0; -} - static int cpu_post_load(void *opaque, int version_id) { CPUState *env = opaque; @@ -373,7 +363,6 @@ static const VMStateDescription vmstate_cpu = { .minimum_version_id = 3, .minimum_version_id_old = 3, .pre_save = cpu_pre_save, - .pre_load = cpu_pre_load, .post_load = cpu_post_load, .fields = (VMStateField []) { VMSTATE_UINTTL_ARRAY(regs, CPUState, CPU_NB_REGS), |