From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeR4y-0001dQ-Sr for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:19:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QeR4x-0005CM-1L for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:19:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14412) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeR4w-0005Bx-2s for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:19:42 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p66CJfFf020636 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 6 Jul 2011 08:19:41 -0400 From: Alon Levy Date: Wed, 6 Jul 2011 14:19:16 +0200 Message-Id: <1309954766-9728-8-git-send-email-alevy@redhat.com> In-Reply-To: <1309954766-9728-1-git-send-email-alevy@redhat.com> References: <1309954766-9728-1-git-send-email-alevy@redhat.com> Subject: [Qemu-devel] [PATCH] qxl: remove qxl_destroy_primary() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: yhalperi@redhat.com, kraxel@redhat.com From: Gerd Hoffmann We'll have to move qemu_spice_destroy_primary_surface() out of qxl_destroy_primary(). That makes the function pretty pointless, so zap it and open code the two lines instead. Signed-off-by: Gerd Hoffmann --- hw/qxl.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 22714bb..018ed54 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -135,7 +135,6 @@ static QXLMode qxl_modes[] = { static PCIQXLDevice *qxl0; static void qxl_send_events(PCIQXLDevice *d, uint32_t events); -static void qxl_destroy_primary(PCIQXLDevice *d); static void qxl_reset_memslots(PCIQXLDevice *d); static void qxl_reset_surfaces(PCIQXLDevice *d); static void qxl_ring_set_dirty(PCIQXLDevice *qxl); @@ -632,7 +631,10 @@ static void qxl_exit_vga_mode(PCIQXLDevice *d) return; } dprint(d, 1, "%s\n", __FUNCTION__); - qxl_destroy_primary(d); + if (d->mode != QXL_MODE_UNDEFINED) { + d->mode = QXL_MODE_UNDEFINED; + qemu_spice_destroy_primary_surface(&d->ssd, 0); + } } static void qxl_set_irq(PCIQXLDevice *d) @@ -729,7 +731,10 @@ static void qxl_vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) if (qxl->mode != QXL_MODE_VGA) { dprint(qxl, 1, "%s\n", __FUNCTION__); - qxl_destroy_primary(qxl); + if (qxl->mode != QXL_MODE_UNDEFINED) { + qxl->mode = QXL_MODE_UNDEFINED; + qemu_spice_destroy_primary_surface(&qxl->ssd, 0); + } qxl_soft_reset(qxl); } vga_ioport_write(opaque, addr, val); @@ -888,18 +893,6 @@ static void qxl_create_guest_primary(PCIQXLDevice *qxl, int loadvm, qxl_render_resize(qxl); } -static void qxl_destroy_primary(PCIQXLDevice *d) -{ - if (d->mode == QXL_MODE_UNDEFINED) { - return; - } - - dprint(d, 1, "%s\n", __FUNCTION__); - - d->mode = QXL_MODE_UNDEFINED; - qemu_spice_destroy_primary_surface(&d->ssd, 0); -} - static void qxl_set_mode(PCIQXLDevice *d, int modenr, int loadvm) { pcibus_t start = d->pci.io_regions[QXL_RAM_RANGE_INDEX].addr; @@ -1040,7 +1033,10 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) case QXL_IO_DESTROY_PRIMARY: PANIC_ON(val != 0); dprint(d, 1, "QXL_IO_DESTROY_PRIMARY (%s)\n", qxl_mode_to_string(d->mode)); - qxl_destroy_primary(d); + if (d->mode != QXL_MODE_UNDEFINED) { + d->mode = QXL_MODE_UNDEFINED; + qemu_spice_destroy_primary_surface(&d->ssd, 0); + } break; case QXL_IO_DESTROY_SURFACE_WAIT: qemu_spice_destroy_surface_wait(&d->ssd, val); -- 1.7.5.4