Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 264025 Details for
Bug 355513
app-emulation/qemu-kvm-0.14.1 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
fix-spice-assert-crash-1.patch
4de1ee2754ceb5a6a33e6db9f1924f8f46029ab2.patch (text/plain), 4.67 KB, created by
Tiziano Müller (RETIRED)
on 2011-02-27 09:56:11 UTC
(
hide
)
Description:
fix-spice-assert-crash-1.patch
Filename:
MIME Type:
Creator:
Tiziano Müller (RETIRED)
Created:
2011-02-27 09:56:11 UTC
Size:
4.67 KB
patch
obsolete
>From 4de1ee2754ceb5a6a33e6db9f1924f8f46029ab2 Mon Sep 17 00:00:00 2001 >From: Gerd Hoffmann <kraxel@redhat.com> >Date: Fri, 21 Jan 2011 09:41:07 +0000 >Subject: locking fix #2 > >--- >diff --git a/hw/qxl.c b/hw/qxl.c >index 0cb4fe9..a5af690 100644 >--- a/hw/qxl.c >+++ b/hw/qxl.c >@@ -125,6 +125,27 @@ static void qxl_reset_memslots(PCIQXLDevice *d); > static void qxl_reset_surfaces(PCIQXLDevice *d); > static void qxl_ring_set_dirty(PCIQXLDevice *qxl); > >+/* qemu-kvm locking ... */ >+void qxl_unlock_iothread(SimpleSpiceDisplay *ssd) >+{ >+ if (cpu_single_env) { >+ assert(ssd->env == NULL); >+ ssd->env = cpu_single_env; >+ cpu_single_env = NULL; >+ } >+ qemu_mutex_unlock_iothread(); >+} >+ >+void qxl_lock_iothread(SimpleSpiceDisplay *ssd) >+{ >+ qemu_mutex_lock_iothread(); >+ if (ssd->env) { >+ assert(cpu_single_env == NULL); >+ cpu_single_env = ssd->env; >+ ssd->env = NULL; >+ } >+} >+ > static inline uint32_t msb_mask(uint32_t val) > { > uint32_t mask; >@@ -662,10 +683,10 @@ static void qxl_hard_reset(PCIQXLDevice *d, int loadvm) > dprint(d, 1, "%s: start%s\n", __FUNCTION__, > loadvm ? " (loadvm)" : ""); > >- qemu_mutex_unlock_iothread(); >+ qxl_unlock_iothread(&d->ssd); > d->ssd.worker->reset_cursor(d->ssd.worker); > d->ssd.worker->reset_image_cache(d->ssd.worker); >- qemu_mutex_lock_iothread(); >+ qxl_lock_iothread(&d->ssd); > qxl_reset_surfaces(d); > qxl_reset_memslots(d); > >@@ -795,9 +816,9 @@ static void qxl_reset_surfaces(PCIQXLDevice *d) > { > dprint(d, 1, "%s:\n", __FUNCTION__); > d->mode = QXL_MODE_UNDEFINED; >- qemu_mutex_unlock_iothread(); >+ qxl_unlock_iothread(&d->ssd); > d->ssd.worker->destroy_surfaces(d->ssd.worker); >- qemu_mutex_lock_iothread(); >+ qxl_lock_iothread(&d->ssd); > memset(&d->guest_surfaces.cmds, 0, sizeof(d->guest_surfaces.cmds)); > } > >@@ -866,9 +887,9 @@ static void qxl_destroy_primary(PCIQXLDevice *d) > dprint(d, 1, "%s\n", __FUNCTION__); > > d->mode = QXL_MODE_UNDEFINED; >- qemu_mutex_unlock_iothread(); >+ qxl_unlock_iothread(&d->ssd); > d->ssd.worker->destroy_primary_surface(d->ssd.worker, 0); >- qemu_mutex_lock_iothread(); >+ qxl_lock_iothread(&d->ssd); > } > > static void qxl_set_mode(PCIQXLDevice *d, int modenr, int loadvm) >@@ -938,10 +959,10 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) > case QXL_IO_UPDATE_AREA: > { > QXLRect update = d->ram->update_area; >- qemu_mutex_unlock_iothread(); >+ qxl_unlock_iothread(&d->ssd); > d->ssd.worker->update_area(d->ssd.worker, d->ram->update_surface, > &update, NULL, 0, 0); >- qemu_mutex_lock_iothread(); >+ qxl_lock_iothread(&d->ssd); > break; > } > case QXL_IO_NOTIFY_CMD: >diff --git a/ui/spice-display.c b/ui/spice-display.c >index 020b423..defe652 100644 >--- a/ui/spice-display.c >+++ b/ui/spice-display.c >@@ -186,18 +186,18 @@ void qemu_spice_create_host_primary(SimpleSpiceDisplay *ssd) > surface.mem = (intptr_t)ssd->buf; > surface.group_id = MEMSLOT_GROUP_HOST; > >- qemu_mutex_unlock_iothread(); >+ qxl_unlock_iothread(ssd); > ssd->worker->create_primary_surface(ssd->worker, 0, &surface); >- qemu_mutex_lock_iothread(); >+ qxl_lock_iothread(ssd); > } > > void qemu_spice_destroy_host_primary(SimpleSpiceDisplay *ssd) > { > dprint(1, "%s:\n", __FUNCTION__); > >- qemu_mutex_unlock_iothread(); >+ qxl_unlock_iothread(ssd); > ssd->worker->destroy_primary_surface(ssd->worker, 0); >- qemu_mutex_lock_iothread(); >+ qxl_lock_iothread(ssd); > } > > void qemu_spice_vm_change_state_handler(void *opaque, int running, int reason) >@@ -207,9 +207,9 @@ void qemu_spice_vm_change_state_handler(void *opaque, int running, int reason) > if (running) { > ssd->worker->start(ssd->worker); > } else { >- qemu_mutex_unlock_iothread(); >+ qxl_unlock_iothread(ssd); > ssd->worker->stop(ssd->worker); >- qemu_mutex_lock_iothread(); >+ qxl_lock_iothread(ssd); > } > ssd->running = running; > } >diff --git a/ui/spice-display.h b/ui/spice-display.h >index aef0464..df74828 100644 >--- a/ui/spice-display.h >+++ b/ui/spice-display.h >@@ -43,6 +43,9 @@ typedef struct SimpleSpiceDisplay { > QXLRect dirty; > int notify; > int running; >+ >+ /* qemu-kvm locking ... */ >+ void *env; > } SimpleSpiceDisplay; > > typedef struct SimpleSpiceUpdate { >@@ -52,6 +55,9 @@ typedef struct SimpleSpiceUpdate { > uint8_t *bitmap; > } SimpleSpiceUpdate; > >+void qxl_unlock_iothread(SimpleSpiceDisplay *ssd); >+void qxl_lock_iothread(SimpleSpiceDisplay *ssd); >+ > int qemu_spice_rect_is_empty(const QXLRect* r); > void qemu_spice_rect_union(QXLRect *dest, const QXLRect *r); > >-- >cgit v0.8.3-6-g21f6
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 355513
:
263605
|
263649
| 264025 |
264027