From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPrnN-0007aT-OH for qemu-devel@nongnu.org; Thu, 03 May 2012 04:53:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPrnK-0005EG-Vx for qemu-devel@nongnu.org; Thu, 03 May 2012 04:53:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPrnK-0005Am-Ms for qemu-devel@nongnu.org; Thu, 03 May 2012 04:53:50 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q438rnjK015569 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 3 May 2012 04:53:49 -0400 From: Gerd Hoffmann Date: Thu, 3 May 2012 10:53:46 +0200 Message-Id: <1336035226-9174-13-git-send-email-kraxel@redhat.com> In-Reply-To: <1336035226-9174-1-git-send-email-kraxel@redhat.com> References: <1336035226-9174-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 12/12] qxl: don't assert on guest create_guest_primary List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alon Levy , Gerd Hoffmann From: Alon Levy Signed-off-by: Alon Levy Signed-off-by: Gerd Hoffmann --- hw/qxl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index c614c91..6c11e70 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1191,7 +1191,10 @@ static void qxl_create_guest_primary(PCIQXLDevice *qxl, int loadvm, QXLDevSurfaceCreate surface; QXLSurfaceCreate *sc = &qxl->guest_primary.surface; - assert(qxl->mode != QXL_MODE_NATIVE); + if (qxl->mode == QXL_MODE_NATIVE) { + qxl_guest_bug(qxl, "%s: nop since already in QXL_MODE_NATIVE", + __func__); + } qxl_exit_vga_mode(qxl); surface.format = le32_to_cpu(sc->format); -- 1.7.1