From patchwork Tue Oct 18 15:26:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 120449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 56954B6F97 for ; Wed, 19 Oct 2011 02:29:04 +1100 (EST) Received: from localhost ([::1]:57865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGBb9-0004y0-P1 for incoming@patchwork.ozlabs.org; Tue, 18 Oct 2011 11:28:59 -0400 Received: from eggs.gnu.org ([140.186.70.92]:47505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGBax-0004xY-Qq for qemu-devel@nongnu.org; Tue, 18 Oct 2011 11:28:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RGBaw-0007mA-DM for qemu-devel@nongnu.org; Tue, 18 Oct 2011 11:28:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40586) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGBaw-0007lZ-42 for qemu-devel@nongnu.org; Tue, 18 Oct 2011 11:28:46 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9IFSi8U002137 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 18 Oct 2011 11:28:44 -0400 Received: from bow.tlv.redhat.com (dhcp-3-73.tlv.redhat.com [10.35.3.73]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p9IFSgwo019003; Tue, 18 Oct 2011 11:28:43 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Tue, 18 Oct 2011 17:26:06 +0200 Message-Id: <1318951567-12418-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: yhalperi@redhat.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH 1/2] qxl: create slots on post_load in any state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If we migrate when the device is not in a native state the guest still believes the slots are created, and will cause operations that reference the slots, causing a "panic: virtual address out of range" on the first of them. Easy to see by migrating in vga mode (with a driver loaded, for instance windows cmd window in full screen mode) and then exiting vga mode back to native mode will cause said panic. Fixed by doing the slot recreation unconditionally at post_load, and using the delta value. Next patch makes sure we actually migrate that delta. RHBZ: 740547 Signed-off-by: Alon Levy --- hw/qxl.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 03848ed..4e9f39f 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1684,6 +1684,14 @@ static int qxl_post_load(void *opaque, int version) qxl_mode_to_string(d->mode)); newmode = d->mode; d->mode = QXL_MODE_UNDEFINED; + for (i = 0; i < NUM_MEMSLOTS; i++) { + if (!d->guest_slots[i].active) { + continue; + } + dprint(d, 1, "%s: restoring guest slot %d delta %"PRIu64"\n", + __func__, i, d->guest_slots[i].delta); + qxl_add_memslot(d, i, d->guest_slots[i].delta, QXL_SYNC); + } switch (newmode) { case QXL_MODE_UNDEFINED: break; @@ -1691,12 +1699,6 @@ static int qxl_post_load(void *opaque, int version) qxl_enter_vga_mode(d); break; case QXL_MODE_NATIVE: - for (i = 0; i < NUM_MEMSLOTS; i++) { - if (!d->guest_slots[i].active) { - continue; - } - qxl_add_memslot(d, i, 0, QXL_SYNC); - } qxl_create_guest_primary(d, 1, QXL_SYNC); /* replay surface-create and cursor-set commands */