From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=51132 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q20Ci-0000oy-I8 for qemu-devel@nongnu.org; Tue, 22 Mar 2011 07:56:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q20Cg-0003JY-UU for qemu-devel@nongnu.org; Tue, 22 Mar 2011 07:56:52 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:42969) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q20Cg-0003JS-P8 for qemu-devel@nongnu.org; Tue, 22 Mar 2011 07:56:50 -0400 Received: from d01dlp02.pok.ibm.com (d01dlp02.pok.ibm.com [9.56.224.85]) by e9.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p2MBTqUW010089 for ; Tue, 22 Mar 2011 07:29:52 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 661B06E8036 for ; Tue, 22 Mar 2011 07:56:49 -0400 (EDT) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2MBum83451354 for ; Tue, 22 Mar 2011 07:56:49 -0400 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p2MBumgd026160 for ; Tue, 22 Mar 2011 05:56:48 -0600 Message-ID: <4D888E7F.8040700@linux.vnet.ibm.com> Date: Tue, 22 Mar 2011 07:56:47 -0400 From: Stefan Berger MIME-Version: 1.0 Subject: Re: Supsend/resume regression in c995b4 WAS: Re: [Qemu-devel] [PATCH] Fix migration uint8 arrys handled References: <1300200805-13928-1-git-send-email-quintela@redhat.com> <4D87EC8A.3010309@linux.vnet.ibm.com> <4D87FF80.6060300@us.ibm.com> <4D886BB6.80906@redhat.com> <4D8878BE.5070102@linux.vnet.ibm.com> <4D887CB3.6010505@redhat.com> <4D888CFF.5050204@linux.vnet.ibm.com> In-Reply-To: <4D888CFF.5050204@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: Jan Kiszka , Anthony Liguori , qemu-devel@nongnu.org, Juan Quintela On 03/22/2011 07:50 AM, Stefan Berger wrote: > On 03/22/2011 06:40 AM, Avi Kivity wrote: >> On 03/22/2011 12:23 PM, Stefan Berger wrote: >>> On 03/22/2011 05:28 AM, Avi Kivity wrote: >>>> On 03/22/2011 03:46 AM, Anthony Liguori wrote: >>>>> On 03/21/2011 07:25 PM, Stefan Berger wrote: >>>>>> On 03/15/2011 10:53 AM, Juan Quintela wrote: >>>>>>> commit 82fa39b75181b730d6d4d09f443bd26bcfcd045c >>>>>>> >>>>>>> only contains half of the fix. It forgots the save state fix for >>>>>>> UINT8 indexes. >>>>>>> >>>>>>> Anthony, please apply, without this migration using hpet is broken. >>>>>>> (only current user). >>>>>> I have just been bisecting the code (from the tip) due to >>>>>> suspend/resume problems and it looks like commit 82fa39b7 is >>>>>> introducing the suspend/resume problem I am seeing (frozen screen). >>>>> >>>>> It's in tip now. >>>> >>>> Great, spent some lovely time bisecting and fixing it as well. >>>> >>> It doesn't work better now than it did before... Trying a >>> suspend/resume while in grub leaves me with a black screen upon >>> resume... >> >> Well, it fixed it for me (autotest migration tests). >> >> Do you mean that 82fa39b7^ works but b784421ce4c doesn't? What about >> b784421ce4c^ with 82fa39b7 reverted? That will rule out some other bug. >> > b784421 works for me. It's the tip that is again broken for > suspend/resume, this time pointing to > > c995b495b9d6e60ab1e390bd398a22425d0b3c8c is the first bad commit > commit c995b495b9d6e60ab1e390bd398a22425d0b3c8c > Author: Jan Kiszka > Date: Tue Mar 15 12:26:22 2011 +0100 > > x86: Save/restore PAT MSR > > Signed-off-by: Jan Kiszka > Signed-off-by: Marcelo Tosatti > > diff --git a/target-i386/machine.c b/target-i386/machine.c > index d78eceb..6384f54 100644 > --- a/target-i386/machine.c > +++ b/target-i386/machine.c > @@ -491,6 +491,8 @@ static const VMStateDescription vmstate_cpu = { > VMSTATE_UINT64_V(xcr0, CPUState, 12), > VMSTATE_UINT64_V(xstate_bv, CPUState, 12), > VMSTATE_YMMH_REGS_VARS(ymmh_regs, CPUState, CPU_NB_REGS, 12), > + > + VMSTATE_UINT64_V(pat, CPUState, 13), > VMSTATE_END_OF_LIST() > /* The above list is not sorted /wrt version numbers, watch > out! */ > }, > > Doesn't look bad, but I get a black screen when resuming while in grub. > I think that patch was probably not necessary: target-i386/machine.c line 452 has this: VMSTATE_UINT64_V(pat, CPUState, 5), then again in line 495: VMSTATE_UINT64_V(pat, CPUState, 13), Stefan