[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/20] backends/tpm: Replace qemu_mutex_lock calls with QEMU_LOCK_
From: |
Paolo Bonzini |
Subject: |
[PULL 05/20] backends/tpm: Replace qemu_mutex_lock calls with QEMU_LOCK_GUARD |
Date: |
Mon, 17 May 2021 07:19:46 -0400 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Simplify the tpm_emulator_ctrlcmd() handler by replacing a pair of
qemu_mutex_lock/qemu_mutex_unlock calls by the WITH_QEMU_LOCK_GUARD
macro.
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210512070713.3286188-1-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
backends/tpm/tpm_emulator.c | 34 +++++++++++++++-------------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c
index a012adc193..e5f1063ab6 100644
--- a/backends/tpm/tpm_emulator.c
+++ b/backends/tpm/tpm_emulator.c
@@ -30,6 +30,7 @@
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qemu/sockets.h"
+#include "qemu/lockable.h"
#include "io/channel-socket.h"
#include "sysemu/tpm_backend.h"
#include "sysemu/tpm_util.h"
@@ -124,31 +125,26 @@ static int tpm_emulator_ctrlcmd(TPMEmulator *tpm,
unsigned long cmd, void *msg,
uint32_t cmd_no = cpu_to_be32(cmd);
ssize_t n = sizeof(uint32_t) + msg_len_in;
uint8_t *buf = NULL;
- int ret = -1;
- qemu_mutex_lock(&tpm->mutex);
+ WITH_QEMU_LOCK_GUARD(&tpm->mutex) {
+ buf = g_alloca(n);
+ memcpy(buf, &cmd_no, sizeof(cmd_no));
+ memcpy(buf + sizeof(cmd_no), msg, msg_len_in);
- buf = g_alloca(n);
- memcpy(buf, &cmd_no, sizeof(cmd_no));
- memcpy(buf + sizeof(cmd_no), msg, msg_len_in);
-
- n = qemu_chr_fe_write_all(dev, buf, n);
- if (n <= 0) {
- goto end;
- }
-
- if (msg_len_out != 0) {
- n = qemu_chr_fe_read_all(dev, msg, msg_len_out);
+ n = qemu_chr_fe_write_all(dev, buf, n);
if (n <= 0) {
- goto end;
+ return -1;
}
- }
- ret = 0;
+ if (msg_len_out != 0) {
+ n = qemu_chr_fe_read_all(dev, msg, msg_len_out);
+ if (n <= 0) {
+ return -1;
+ }
+ }
+ }
-end:
- qemu_mutex_unlock(&tpm->mutex);
- return ret;
+ return 0;
}
static int tpm_emulator_unix_tx_bufs(TPMEmulator *tpm_emu,
--
2.27.0
- [PULL 00/20] Misc patches for 2020-05-17, Paolo Bonzini, 2021/05/17
- [PULL 08/20] object: add more commands to preconfig mode, Paolo Bonzini, 2021/05/17
- [PULL 02/20] configure: check for submodules if --with-git-submodules=ignore, Paolo Bonzini, 2021/05/17
- [PULL 05/20] backends/tpm: Replace qemu_mutex_lock calls with QEMU_LOCK_GUARD,
Paolo Bonzini <=
- [PULL 03/20] configure: simplify assignment to GIT_SUBMODULES, Paolo Bonzini, 2021/05/17
- [PULL 04/20] hw/mem/nvdimm: Use Kconfig 'imply' instead of 'depends on', Paolo Bonzini, 2021/05/17
- [PULL 01/20] configure: Only clone softfloat-3 repositories if TCG is enabled, Paolo Bonzini, 2021/05/17
- [PULL 07/20] meson: bump submodule to 0.57.2, Paolo Bonzini, 2021/05/17
- [PULL 10/20] KVM: do not allow setting properties at runtime, Paolo Bonzini, 2021/05/17
- [PULL 09/20] qtest: add a QOM object for qtest, Paolo Bonzini, 2021/05/17
- [PULL 06/20] i386/cpu: Expose AVX_VNNI instruction to guest, Paolo Bonzini, 2021/05/17
- [PULL 11/20] memory: Introduce log_sync_global() to memory listener, Paolo Bonzini, 2021/05/17
- [PULL 12/20] KVM: Use a big lock to replace per-kml slots_lock, Paolo Bonzini, 2021/05/17
- [PULL 13/20] KVM: Create the KVMSlot dirty bitmap on flag changes, Paolo Bonzini, 2021/05/17