From patchwork Tue Mar 22 11:50:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 87900 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 434541007D2 for ; Tue, 22 Mar 2011 22:51:30 +1100 (EST) Received: from localhost ([127.0.0.1]:54151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q207R-00045m-OH for incoming@patchwork.ozlabs.org; Tue, 22 Mar 2011 07:51:25 -0400 Received: from [140.186.70.92] (port=59209 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q206l-0003yh-Lo for qemu-devel@nongnu.org; Tue, 22 Mar 2011 07:50:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q206k-0001xa-0c for qemu-devel@nongnu.org; Tue, 22 Mar 2011 07:50:43 -0400 Received: from e2.ny.us.ibm.com ([32.97.182.142]:44321) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q206j-0001wE-U5 for qemu-devel@nongnu.org; Tue, 22 Mar 2011 07:50:41 -0400 Received: from d01dlp01.pok.ibm.com (d01dlp01.pok.ibm.com [9.56.224.56]) by e2.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p2MBVkeq017788 for ; Tue, 22 Mar 2011 07:31:46 -0400 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 1951A38C803B for ; Tue, 22 Mar 2011 07:50:23 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2MBoOkh355042 for ; Tue, 22 Mar 2011 07:50:27 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p2MBoOJZ031197 for ; Tue, 22 Mar 2011 07:50:24 -0400 Received: from [9.59.241.154] (d941e-10.watson.ibm.com [9.59.241.154]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p2MBoNXD031190; Tue, 22 Mar 2011 07:50:23 -0400 Message-ID: <4D888CFF.5050204@linux.vnet.ibm.com> Date: Tue, 22 Mar 2011 07:50:23 -0400 From: Stefan Berger User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14 Lightning/1.0b3pre Thunderbird/3.1.7 MIME-Version: 1.0 To: Avi Kivity Subject: 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> In-Reply-To: <4D887CB3.6010505@redhat.com> X-Content-Scanned: Fidelis XPS MAILER X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.182.142 Cc: Jan Kiszka , Anthony Liguori , qemu-devel@nongnu.org, Juan Quintela X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 }, Doesn't look bad, but I get a black screen when resuming while in grub. Stefan 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! */