[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 43/49] x86: factor out cpu_pre_save()
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 43/49] x86: factor out cpu_pre_save() |
Date: |
Tue, 29 Sep 2009 22:49:02 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
target-i386/machine.c | 53 +++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/target-i386/machine.c b/target-i386/machine.c
index 35de2fb..5694a5c 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -31,19 +31,13 @@ static void cpu_get_seg(QEMUFile *f, SegmentCache *dt)
vmstate_load_state(f, &vmstate_segment, dt, vmstate_segment.version_id);
}
-void cpu_save(QEMUFile *f, void *opaque)
+static void cpu_pre_save(void *opaque)
{
CPUState *env = opaque;
int i, bit;
cpu_synchronize_state(env);
- for(i = 0; i < CPU_NB_REGS; i++)
- qemu_put_betls(f, &env->regs[i]);
- qemu_put_betls(f, &env->eip);
- qemu_put_betls(f, &env->eflags);
- qemu_put_be32s(f, &env->hflags);
-
/* FPU */
env->fpus_vmstate = (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11;
env->fptag_vmstate = 0;
@@ -51,15 +45,42 @@ void cpu_save(QEMUFile *f, void *opaque)
env->fptag_vmstate |= ((!env->fptags[i]) << i);
}
- qemu_put_be16s(f, &env->fpuc);
- qemu_put_be16s(f, &env->fpus_vmstate);
- qemu_put_be16s(f, &env->fptag_vmstate);
-
#ifdef USE_X86LDOUBLE
env->fpregs_format_vmstate = 0;
#else
env->fpregs_format_vmstate = 1;
#endif
+
+ /* There can only be one pending IRQ set in the bitmap at a time, so try
+ to find it and save its number instead (-1 for none). */
+ env->pending_irq_vmstate = -1;
+ for (i = 0; i < ARRAY_SIZE(env->interrupt_bitmap); i++) {
+ if (env->interrupt_bitmap[i]) {
+ bit = ctz64(env->interrupt_bitmap[i]);
+ env->pending_irq_vmstate = i * 64 + bit;
+ break;
+ }
+ }
+}
+
+void cpu_save(QEMUFile *f, void *opaque)
+{
+ CPUState *env = opaque;
+ int i;
+
+ cpu_pre_save(opaque);
+
+ for(i = 0; i < CPU_NB_REGS; i++)
+ qemu_put_betls(f, &env->regs[i]);
+ qemu_put_betls(f, &env->eip);
+ qemu_put_betls(f, &env->eflags);
+ qemu_put_be32s(f, &env->hflags);
+
+ /* FPU */
+ qemu_put_be16s(f, &env->fpuc);
+ qemu_put_be16s(f, &env->fpus_vmstate);
+ qemu_put_be16s(f, &env->fptag_vmstate);
+
qemu_put_be16s(f, &env->fpregs_format_vmstate);
for(i = 0; i < 8; i++) {
@@ -146,16 +167,6 @@ void cpu_save(QEMUFile *f, void *opaque)
/* KVM-related states */
- /* There can only be one pending IRQ set in the bitmap at a time, so try
- to find it and save its number instead (-1 for none). */
- env->pending_irq_vmstate = -1;
- for (i = 0; i < ARRAY_SIZE(env->interrupt_bitmap); i++) {
- if (env->interrupt_bitmap[i]) {
- bit = ctz64(env->interrupt_bitmap[i]);
- env->pending_irq_vmstate = i * 64 + bit;
- break;
- }
- }
qemu_put_sbe32s(f, &env->pending_irq_vmstate);
qemu_put_be32s(f, &env->mp_state);
qemu_put_be64s(f, &env->tsc);
--
1.6.2.5
- [Qemu-devel] [PATCH 33/49] x86: add fptag_vmstate to the state, (continued)
- [Qemu-devel] [PATCH 33/49] x86: add fptag_vmstate to the state, Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 34/49] x86: add pending_irq_vmstate to the state, Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 35/49] x86: add fpregs_format_vmstate, Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 36/49] x86: mce_banks always have the same size, Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 37/49] x86: send mce_banks as an array, Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 39/49] x86: split FPReg union, Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 38/49] x86: mcg_cap is never 0, Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 40/49] x86: split MTRRVar union, Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 41/49] Add *TL functions to vmstate, Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 42/49] x86: port segments to vmstate, Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 43/49] x86: factor out cpu_pre_save(),
Juan Quintela <=
- [Qemu-devel] [PATCH 44/49] x86: factor out cpu_pre/post_load(), Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 45/49] x86: factor out cpu_get/put_xmm_reg(), Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 46/49] x86: factor out cpu_get/put_mttr_var(), Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 48/49] vmstate: Add suppot for field_exist() test, Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 47/49] x86: factor out cpu_get/put_fpreg(), Juan Quintela, 2009/09/29
- [Qemu-devel] [PATCH 49/49] x86: port cpu to vmstate, Juan Quintela, 2009/09/29