From patchwork Wed Apr 25 09:43:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 154853 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A3F63B6F6E for ; Wed, 25 Apr 2012 19:44:02 +1000 (EST) Received: from localhost ([::1]:52658 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMylU-0005rq-Hy for incoming@patchwork.ozlabs.org; Wed, 25 Apr 2012 05:44:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMylK-0005gO-Ef for qemu-devel@nongnu.org; Wed, 25 Apr 2012 05:43:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMylF-0004ET-Qg for qemu-devel@nongnu.org; Wed, 25 Apr 2012 05:43:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMylF-0004EM-Ip for qemu-devel@nongnu.org; Wed, 25 Apr 2012 05:43:45 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3P9hi6F004175 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 25 Apr 2012 05:43:44 -0400 Received: from garlic.redhat.com (vpn-202-70.tlv.redhat.com [10.35.202.70]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3P9hZBx011783; Wed, 25 Apr 2012 05:43:39 -0400 From: Alon Levy To: qemu-devel@nongnu.org, kraxel@redhat.com Date: Wed, 25 Apr 2012 12:43:31 +0300 Message-Id: <1335347011-10391-1-git-send-email-alevy@redhat.com> In-Reply-To: <1334746806-28733-1-git-send-email-alevy@redhat.com> References: <1334746806-28733-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] qxl: don't assert on guest create_guest_primary 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 Signed-off-by: Alon Levy --- hw/qxl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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);