Both the spice server and the qemu (iothread/main loop) context
can access the cursor field in struct SimpleSpiceDisplay.
Add the mutex lock before accessing cursor in
qxl_spice_reset_cursor().
Signed-off-by: Hyman Huang <yong.huang@smartx.com>
---
hw/display/qxl.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index ae2d983299..07e171cb5d 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -28,6 +28,7 @@
#include "qemu/atomic.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
+#include "qemu/lockable.h"
#include "hw/qdev-properties.h"
#include "sysemu/runstate.h"
#include "migration/vmstate.h"
@@ -298,10 +299,12 @@ void qxl_spice_reset_cursor(PCIQXLDevice *qxl)
qemu_mutex_lock(&qxl->track_lock);
qxl->guest_cursor = 0;
qemu_mutex_unlock(&qxl->track_lock);
- if (qxl->ssd.cursor) {
- cursor_unref(qxl->ssd.cursor);
+ WITH_QEMU_LOCK_GUARD(&qxl->ssd.lock) {
+ if (qxl->ssd.cursor) {
+ cursor_unref(qxl->ssd.cursor);
+ }
+ qxl->ssd.cursor = cursor_builtin_hidden();
}
- qxl->ssd.cursor = cursor_builtin_hidden();
}
static uint32_t qxl_crc32(const uint8_t *p, unsigned len)
--
2.39.1