mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-23 11:39:53 +00:00
io/channel-tls.c: make qio_channel_tls_shutdown thread-safe
Make qio_channel_tls_shutdown thread-safe by using atomics when accessing tioc->shutdown. Signed-off-by: Lukas Straub <lukasstraub2@web.de> Acked-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <5bd8733f583f3558b32250fd0eb576b7aa756485.1609167865.git.lukasstraub2@web.de> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
b5eea99ec2
commit
e4d2bfb170
@ -23,6 +23,7 @@
|
||||
#include "qemu/module.h"
|
||||
#include "io/channel-tls.h"
|
||||
#include "trace.h"
|
||||
#include "qemu/atomic.h"
|
||||
|
||||
|
||||
static ssize_t qio_channel_tls_write_handler(const char *buf,
|
||||
@ -277,7 +278,8 @@ static ssize_t qio_channel_tls_readv(QIOChannel *ioc,
|
||||
return QIO_CHANNEL_ERR_BLOCK;
|
||||
}
|
||||
} else if (errno == ECONNABORTED &&
|
||||
(tioc->shutdown & QIO_CHANNEL_SHUTDOWN_READ)) {
|
||||
(qatomic_load_acquire(&tioc->shutdown) &
|
||||
QIO_CHANNEL_SHUTDOWN_READ)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -361,7 +363,7 @@ static int qio_channel_tls_shutdown(QIOChannel *ioc,
|
||||
{
|
||||
QIOChannelTLS *tioc = QIO_CHANNEL_TLS(ioc);
|
||||
|
||||
tioc->shutdown |= how;
|
||||
qatomic_or(&tioc->shutdown, how);
|
||||
|
||||
return qio_channel_shutdown(tioc->master, how, errp);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user