Patchwork qxl: Drop phread_yield on OOM

login
register
mail settings
Submitter Jan Kiszka
Date Sept. 20, 2011, 3:21 p.m.
Message ID <4E78AF63.4060204@siemens.com>
Download mbox | patch
Permalink /patch/115577/
State New
Headers show

Comments

Jan Kiszka - Sept. 20, 2011, 3:21 p.m.
This was only a best-effort attempt, by far not guaranteed to have an
effect. Drop it so that also no direct pthread usage remain in the
device model.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Depends on the previous qxl patch I just sent.

 hw/qxl.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
Gerd Hoffmann - Sept. 20, 2011, 3:37 p.m.
On 09/20/11 17:21, Jan Kiszka wrote:
> This was only a best-effort attempt, by far not guaranteed to have an
> effect. Drop it so that also no direct pthread usage remain in the
> device model.
>
> Signed-off-by: Jan Kiszka<jan.kiszka@siemens.com>

All three patches are fine.

I'll go queue it up in the spice queue when I'm back from vacation in 
2-3 weeks (unless they find their way upstream through a another tree 
meanwhile).

cheers,
   Gerd

Patch

diff --git a/hw/qxl.c b/hw/qxl.c
index 082b940..3e9052f 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -18,8 +18,6 @@ 
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <pthread.h>
-
 #include "qemu-common.h"
 #include "qemu-timer.h"
 #include "qemu-queue.h"
@@ -1215,10 +1213,6 @@  async_common:
         if (!SPICE_RING_IS_EMPTY(&d->ram->release_ring)) {
             break;
         }
-        pthread_yield();
-        if (!SPICE_RING_IS_EMPTY(&d->ram->release_ring)) {
-            break;
-        }
         d->oom_running = 1;
         qxl_spice_oom(d);
         d->oom_running = 0;