[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2] qxl: remove qxl_destroy_primary()
From: |
Alon Levy |
Subject: |
[Qemu-devel] [PATCH v2] qxl: remove qxl_destroy_primary() |
Date: |
Thu, 7 Jul 2011 18:50:44 +0200 |
From: Gerd Hoffmann <address@hidden>
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 <address@hidden>
---
hw/qxl.c | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/hw/qxl.c b/hw/qxl.c
index d92d5b2..a405e50 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -120,7 +120,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);
@@ -617,7 +616,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)
@@ -714,7 +716,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);
@@ -875,18 +880,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;
@@ -1013,7 +1006,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
- [Qemu-devel] [PATCH v2] qxl: make qxl_guest_bug take variable arguments, (continued)
- [Qemu-devel] [PATCH v2] qxl: make qxl_guest_bug take variable arguments, Alon Levy, 2011/07/07
- [Qemu-devel] [PATCH v2] qxl: add QXL_IO_FLUSH_{SURFACES, RELEASE} for guest S3&S4 support, Alon Levy, 2011/07/07
- [Qemu-devel] [PATCH v2] qxl: error handling fixes and cleanups., Alon Levy, 2011/07/07
- [Qemu-devel] [PATCH v2] qxl: add io_port_to_string, Alon Levy, 2011/07/07
- [Qemu-devel] [PATCH v2] qxl: async I/O, Alon Levy, 2011/07/07
[Qemu-devel] [PATCH v2] qxl: remove qxl_destroy_primary(),
Alon Levy <=
[Qemu-devel] [PATCH v2] spice/qxl: move worker wrappers, Alon Levy, 2011/07/07
[Qemu-devel] [PATCH v2] qxl: fix surface tracking & locking, Alon Levy, 2011/07/07
[Qemu-devel] [PATCH v2] spice: add qemu_spice_display_init_common, Alon Levy, 2011/07/07
[Qemu-devel] [PATCH v2] spice: add worker wrapper functions., Alon Levy, 2011/07/07