From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M9a7u-0008VA-6f for qemu-devel@nongnu.org; Thu, 28 May 2009 03:34:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M9a7p-0008Ui-Jl for qemu-devel@nongnu.org; Thu, 28 May 2009 03:34:09 -0400 Received: from [199.232.76.173] (port=39985 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M9a7p-0008Uf-Cz for qemu-devel@nongnu.org; Thu, 28 May 2009 03:34:05 -0400 Received: from mx20.gnu.org ([199.232.41.8]:3830) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1M9a7o-0001l0-QH for qemu-devel@nongnu.org; Thu, 28 May 2009 03:34:05 -0400 Received: from mail-ew0-f213.google.com ([209.85.219.213]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M9a7n-0008W4-UN for qemu-devel@nongnu.org; Thu, 28 May 2009 03:34:04 -0400 Received: by ewy9 with SMTP id 9so4705335ewy.34 for ; Thu, 28 May 2009 00:34:02 -0700 (PDT) Message-ID: <4A1E3E67.7030607@codemonkey.ws> Date: Thu, 28 May 2009 02:33:59 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <4A1E3DF9.5080607@web.de> In-Reply-To: <4A1E3DF9.5080607@web.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH] KVM: x86: Refactor persistent CPU state List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jan Kiszka Cc: Avi Kivity , qemu-devel Jan Kiszka wrote: > This patch aligns the KVM-related layout and encoding of the CPU state > to be saved to disk or migrated with qemu-kvm. The major differences are > reordering of fields and a compressed interrupt_bitmap into a single > number as there can be no more than one pending IRQ at a time. > > Signed-off-by: Jan Kiszka > We need a version bump, no? Regards, Anthony Liguori > --- > > target-i386/machine.c | 30 +++++++++++++++++++++++------- > 1 files changed, 23 insertions(+), 7 deletions(-) > > diff --git a/target-i386/machine.c b/target-i386/machine.c > index bb8b9db..259302c 100644 > --- a/target-i386/machine.c > +++ b/target-i386/machine.c > @@ -28,7 +28,8 @@ void cpu_save(QEMUFile *f, void *opaque) > uint16_t fptag, fpus, fpuc, fpregs_format; > uint32_t hflags; > int32_t a20_mask; > - int i; > + int32_t pending_irq; > + int i, bit; > > cpu_synchronize_state(env, 0); > > @@ -141,11 +142,21 @@ void cpu_save(QEMUFile *f, void *opaque) > qemu_put_be64s(f, &env->mtrr_var[i].mask); > } > > - for (i = 0; i < sizeof(env->interrupt_bitmap)/8; i++) { > - qemu_put_be64s(f, &env->interrupt_bitmap[i]); > + /* 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). */ > + pending_irq = -1; > + for (i = 0; i < ARRAY_SIZE(env->interrupt_bitmap); i++) { > + bit = ffsll(env->interrupt_bitmap[i]); > + if (bit) { > + pending_irq = i * 64 + bit - 1; > + break; > + } > } > - qemu_put_be64s(f, &env->tsc); > + qemu_put_sbe32s(f, &pending_irq); > qemu_put_be32s(f, &env->mp_state); > + qemu_put_be64s(f, &env->tsc); > } > > #ifdef USE_X86LDOUBLE > @@ -179,6 +190,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) > uint32_t hflags; > uint16_t fpus, fpuc, fptag, fpregs_format; > int32_t a20_mask; > + int32_t pending_irq; > > if (version_id < 3 || version_id > CPU_SAVE_VERSION) > return -EINVAL; > @@ -324,12 +336,16 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) > qemu_get_be64s(f, &env->mtrr_var[i].mask); > } > } > + > if (version_id >= 9) { > - for (i = 0; i < sizeof(env->interrupt_bitmap)/8; i++) { > - qemu_get_be64s(f, &env->interrupt_bitmap[i]); > + qemu_get_sbe32s(f, &pending_irq); > + memset(&env->interrupt_bitmap, 0, sizeof(env->interrupt_bitmap)); > + if (pending_irq >= 0) { > + env->interrupt_bitmap[pending_irq / 64] |= > + (uint64_t)1 << (pending_irq % 64); > } > - qemu_get_be64s(f, &env->tsc); > qemu_get_be32s(f, &env->mp_state); > + qemu_get_be64s(f, &env->tsc); > } > > /* XXX: ensure compatiblity for halted bit ? */ > >