mirror of https://github.com/xemu-project/xemu.git
spice: Convert core to QEMU thread API
No need to use pthread directly, we have proper abstractions for identity checking. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
026f773f56
commit
f9ab6091b0
|
@ -19,10 +19,10 @@
|
||||||
#include <spice-experimental.h>
|
#include <spice-experimental.h>
|
||||||
|
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <pthread.h>
|
|
||||||
|
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "qemu-spice.h"
|
#include "qemu-spice.h"
|
||||||
|
#include "qemu-thread.h"
|
||||||
#include "qemu-timer.h"
|
#include "qemu-timer.h"
|
||||||
#include "qemu-queue.h"
|
#include "qemu-queue.h"
|
||||||
#include "qemu-x509.h"
|
#include "qemu-x509.h"
|
||||||
|
@ -45,7 +45,7 @@ static char *auth_passwd;
|
||||||
static time_t auth_expires = TIME_MAX;
|
static time_t auth_expires = TIME_MAX;
|
||||||
int using_spice = 0;
|
int using_spice = 0;
|
||||||
|
|
||||||
static pthread_t me;
|
static QemuThread me;
|
||||||
|
|
||||||
struct SpiceTimer {
|
struct SpiceTimer {
|
||||||
QEMUTimer *timer;
|
QEMUTimer *timer;
|
||||||
|
@ -229,7 +229,7 @@ static void channel_event(int event, SpiceChannelEventInfo *info)
|
||||||
* thread and grab the iothread lock if so before calling qemu
|
* thread and grab the iothread lock if so before calling qemu
|
||||||
* functions.
|
* functions.
|
||||||
*/
|
*/
|
||||||
bool need_lock = !pthread_equal(me, pthread_self());
|
bool need_lock = !qemu_thread_is_self(&me);
|
||||||
if (need_lock) {
|
if (need_lock) {
|
||||||
qemu_mutex_lock_iothread();
|
qemu_mutex_lock_iothread();
|
||||||
}
|
}
|
||||||
|
@ -556,7 +556,7 @@ void qemu_spice_init(void)
|
||||||
spice_image_compression_t compression;
|
spice_image_compression_t compression;
|
||||||
spice_wan_compression_t wan_compr;
|
spice_wan_compression_t wan_compr;
|
||||||
|
|
||||||
me = pthread_self();
|
qemu_thread_get_self(&me);
|
||||||
|
|
||||||
if (!opts) {
|
if (!opts) {
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue