From ec8e705cc8f5ce640e90137a3a75bc09014d03bc Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Alon Levy Date: Sun, 7 Oct 2012 15:31:55 +0200 Subject: [PATCH 18/27] hw/qxl: ignore guest from guestbug until reset RH-Author: Alon Levy Message-id: <1349623920-19894-12-git-send-email-alevy@redhat.com> Patchwork-id: 42787 O-Subject: [PATCH RHEL-6.4 v2 11/16] hw/qxl: ignore guest from guestbug until reset Bugzilla: 770842 RH-Acked-by: Gerd Hoffmann RH-Acked-by: Paolo Bonzini RH-Acked-by: Arnon Gilboa soft_reset is called from any of: * QXL_IO_RESET * vga io * pci reset handler Signed-off-by: Alon Levy Signed-off-by: Gerd Hoffmann Upstream: 087e6a42ed6ddba524a343563611d2a7b78f15a8 --- hw/qxl.c | 13 ++++++++++++- hw/qxl.h | 3 +++ 2 files changed, 15 insertions(+), 1 deletion(-) Signed-off-by: Michal Novotny --- hw/qxl.c | 13 ++++++++++++- hw/qxl.h | 3 +++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/hw/qxl.c b/hw/qxl.c index e3204ed..60324bb 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -144,6 +144,7 @@ static void qxl_ring_set_dirty(PCIQXLDevice *qxl); void qxl_set_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); @@ -154,6 +155,10 @@ void qxl_set_guest_bug(PCIQXLDevice *qxl, const char *msg, ...) } } +static void qxl_clear_guest_bug(PCIQXLDevice *qxl) +{ + qxl->guest_bug = 0; +} void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t surface_id, struct QXLRect *area, struct QXLRect *dirty_rects, @@ -581,7 +586,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); @@ -1025,6 +1030,7 @@ static void qxl_soft_reset(PCIQXLDevice *d) { trace_qxl_soft_reset(d->id); qxl_check_state(d); + qxl_clear_guest_bug(d); if (d->id == 0) { qxl_enter_vga_mode(d); @@ -1325,6 +1331,10 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) 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: @@ -1781,6 +1791,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 a9061b9..4d891eb 100644 --- a/hw/qxl.h +++ b/hw/qxl.h @@ -26,6 +26,9 @@ typedef struct PCIQXLDevice { uint32_t debug; uint32_t guestdebug; uint32_t cmdlog; + + uint32_t guest_bug; + enum qxl_mode mode; uint32_t cmdflags; int generation; -- 1.7.11.7