[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 02/23] hw/tpm/tpm_passthrough: Simplify if-statemen
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 02/23] hw/tpm/tpm_passthrough: Simplify if-statements a little bit |
Date: |
Fri, 28 Oct 2016 18:18:33 +0300 |
From: Thomas Huth <address@hidden>
The condition '!A || (A && B)' is equivalent to '!A || B'
Buglink: https://bugs.launchpad.net/qemu/+bug/1464611
Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/tpm/tpm_passthrough.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index e88c0d2..9234eb3 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -165,8 +165,7 @@ static int tpm_passthrough_unix_tx_bufs(TPMPassthruState
*tpm_pt,
ret = tpm_passthrough_unix_write(tpm_pt->tpm_fd, in, in_len);
if (ret != in_len) {
- if (!tpm_pt->tpm_op_canceled ||
- (tpm_pt->tpm_op_canceled && errno != ECANCELED)) {
+ if (!tpm_pt->tpm_op_canceled || errno != ECANCELED) {
error_report("tpm_passthrough: error while transmitting data "
"to TPM: %s (%i)",
strerror(errno), errno);
@@ -178,8 +177,7 @@ static int tpm_passthrough_unix_tx_bufs(TPMPassthruState
*tpm_pt,
ret = tpm_passthrough_unix_read(tpm_pt->tpm_fd, out, out_len);
if (ret < 0) {
- if (!tpm_pt->tpm_op_canceled ||
- (tpm_pt->tpm_op_canceled && errno != ECANCELED)) {
+ if (!tpm_pt->tpm_op_canceled || errno != ECANCELED) {
error_report("tpm_passthrough: error while reading data from "
"TPM: %s (%i)",
strerror(errno), errno);
--
2.1.4
- [Qemu-trivial] [PULL 00/23] Trivial patches for 2016-10-28, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 07/23] lm32: milkymist-tmu2: fix integer overflow, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 01/23] filter-dump: add missing "[", Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 08/23] target-lm32: rewrite gen_compare(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 02/23] hw/tpm/tpm_passthrough: Simplify if-statements a little bit,
Michael Tokarev <=
- [Qemu-trivial] [PULL 05/23] target-lm32: swap operand of wcsr in LOG_DIS(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 19/23] qemu-ga: Remove stray 'q' in documentation, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 11/23] colo-compare: remove unused struct CompareChardevProps and 'props' variable, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 13/23] usb: Change *_exitfn return type from int to void, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 06/23] target-lm32: disable asm logging via LOG_DIS(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 17/23] s390: avoid always-true comparison in s390_pci_generate_fid(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 04/23] target-lm32: fix LOG_DIS operand order, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 23/23] Fix build for less common build directories names, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 20/23] monitor: deprecate 'default' option, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 03/23] target-lm32: fix style issue, Michael Tokarev, 2016/10/28