[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv3] qxl: use track_lock instead of wlock for guest_su
From: |
Alon Levy |
Subject: |
[Qemu-devel] [PATCHv3] qxl: use track_lock instead of wlock for guest_surfaces |
Date: |
Wed, 29 Jun 2011 13:57:09 +0200 |
---
hw/qxl.c | 7 +++++--
hw/qxl.h | 2 ++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/qxl.c b/hw/qxl.c
index 3f84b0c..49d7b10 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -150,10 +150,12 @@ void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t
surface_id,
void qxl_spice_destroy_surface_wait(PCIQXLDevice *qxl, uint32_t id)
{
qemu_mutex_lock(&qxl->ssd.wlock);
+ qemu_mutex_lock(&qxl->track_lock);
PANIC_ON(id >= NUM_SURFACES);
qxl->ssd.worker->destroy_surface_wait(qxl->ssd.worker, id);
qxl->guest_surfaces.cmds[id] = 0;
qxl->guest_surfaces.count--;
+ qemu_mutex_unlock(&qxl->track_lock);
qemu_mutex_unlock(&qxl->ssd.wlock);
}
@@ -348,7 +350,7 @@ static void qxl_track_command(PCIQXLDevice *qxl, struct
QXLCommandExt *ext)
QXLSurfaceCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id);
uint32_t id = le32_to_cpu(cmd->surface_id);
PANIC_ON(id >= NUM_SURFACES);
- qemu_mutex_lock(&qxl->ssd.wlock);
+ qemu_mutex_lock(&qxl->track_lock);
if (cmd->type == QXL_SURFACE_CMD_CREATE) {
qxl->guest_surfaces.cmds[id] = ext->cmd.data;
qxl->guest_surfaces.count++;
@@ -359,7 +361,7 @@ static void qxl_track_command(PCIQXLDevice *qxl, struct
QXLCommandExt *ext)
qxl->guest_surfaces.cmds[id] = 0;
qxl->guest_surfaces.count--;
}
- qemu_mutex_unlock(&qxl->ssd.wlock);
+ qemu_mutex_unlock(&qxl->track_lock);
break;
}
case QXL_CMD_CURSOR:
@@ -1432,6 +1434,7 @@ static int qxl_init_common(PCIQXLDevice *qxl)
qxl->generation = 1;
qxl->num_memslots = NUM_MEMSLOTS;
qxl->num_surfaces = NUM_SURFACES;
+ qemu_mutex_init(&qxl->track_lock);
switch (qxl->revision) {
case 1: /* spice 0.4 -- qxl-1 */
diff --git a/hw/qxl.h b/hw/qxl.h
index f005943..7df594e 100644
--- a/hw/qxl.h
+++ b/hw/qxl.h
@@ -58,6 +58,8 @@ typedef struct PCIQXLDevice {
} guest_surfaces;
QXLPHYSICAL guest_cursor;
+ QemuMutex track_lock;
+
/* thread signaling */
pthread_t main;
int pipe[2];
--
1.7.5.4
- [Qemu-devel] [PATCHv3] qxl S3&S4 (suspend and hibernate) support, Alon Levy, 2011/06/29
- [Qemu-devel] [PATCHv3] async io: suggested fixes, Alon Levy, 2011/06/29
- [Qemu-devel] [PATCHv3] async thread fix - handle EAGAIN/EINTR, remove fprintf, Alon Levy, 2011/06/29
- [Qemu-devel] [PATCHv3] qxl: use track_lock instead of wlock for guest_surfaces,
Alon Levy <=
- [Qemu-devel] [PATCHv3] qxl: add mode to debugprint on destroy primary, Alon Levy, 2011/06/29
- [Qemu-devel] [PATCHv3] qxl: allow QXL_IO_LOG also in vga, Alon Levy, 2011/06/29
- [Qemu-devel] [PATCHv3] qxl: abort on panic instead of exit, Alon Levy, 2011/06/29
- [Qemu-devel] [PATCHv3] qxl-logger: add timestamp to command log, Alon Levy, 2011/06/29
- [Qemu-devel] [PATCHv3] qxl: update and add debug prints, Alon Levy, 2011/06/29