From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52281) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWOYy-0006Ed-4Y for qemu-devel@nongnu.org; Mon, 21 May 2012 05:06:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SWOYr-0006sQ-SE for qemu-devel@nongnu.org; Mon, 21 May 2012 05:05:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23351) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWOYr-0006pm-Ge for qemu-devel@nongnu.org; Mon, 21 May 2012 05:05:53 -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 q4L95qNR010146 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 21 May 2012 05:05:52 -0400 From: Alon Levy Date: Mon, 21 May 2012 12:04:47 +0300 Message-Id: <1337591088-18667-1-git-send-email-alevy@redhat.com> Subject: [Qemu-devel] [RFC 1/2] hw/qxl: ignore guest from guestbug until reset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kraxel@redhat.com reset only by a guest QXL_IO_RESET Signed-off-by: Alon Levy --- hw/qxl.c | 9 ++++++++- hw/qxl.h | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/hw/qxl.c b/hw/qxl.c index 6c11e70..a9a7778 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -141,6 +141,7 @@ static void qxl_ring_set_dirty(PCIQXLDevice *qxl); void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg, ...) { qxl_send_events(qxl, QXL_INTERRUPT_ERROR); + qxl->guest_bug = 1; if (qxl->guestdebug) { va_list ap; va_start(ap, msg); @@ -571,7 +572,7 @@ static int interface_get_command(QXLInstance *sin, struct QXLCommandExt *ext) case QXL_MODE_NATIVE: case QXL_MODE_UNDEFINED: ring = &qxl->ram->cmd_ring; - if (SPICE_RING_IS_EMPTY(ring)) { + if (qxl->guest_bug || SPICE_RING_IS_EMPTY(ring)) { return false; } SPICE_RING_CONS_ITEM(qxl, ring, cmd); @@ -1291,6 +1292,10 @@ static void ioport_write(void *opaque, target_phys_addr_t addr, qxl_async_io async = QXL_SYNC; uint32_t orig_io_port = io_port; + if (d->guest_bug && !io_port == QXL_IO_RESET) { + return; + } + switch (io_port) { case QXL_IO_RESET: case QXL_IO_SET_MODE: @@ -1399,6 +1404,7 @@ async_common: } break; case QXL_IO_RESET: + d->guest_bug = 0; qxl_hard_reset(d, 0); break; case QXL_IO_MEMSLOT_ADD: @@ -1742,6 +1748,7 @@ static int qxl_init_common(PCIQXLDevice *qxl) qemu_mutex_init(&qxl->track_lock); qemu_mutex_init(&qxl->async_lock); qxl->current_async = QXL_UNDEFINED_IO; + qxl->guest_bug = 0; switch (qxl->revision) { case 1: /* spice 0.4 -- qxl-1 */ diff --git a/hw/qxl.h b/hw/qxl.h index ec0cb1a..4e14643 100644 --- a/hw/qxl.h +++ b/hw/qxl.h @@ -35,6 +35,8 @@ typedef struct PCIQXLDevice { uint32_t cmdlog; uint32_t revision; + uint32_t guest_bug; + enum qxl_mode mode; uint32_t cmdflags; int generation; -- 1.7.10.1