Commit 5f333d79 authored by Thomas Huth's avatar Thomas Huth Committed by Michael Tokarev
Browse files

hw/tpm/tpm_passthrough: Simplify if-statements a little bit 

The condition  '!A || (A && B)' is equivalent to '!A || B'

Buglink: https://bugs.launchpad.net/qemu/+bug/1464611


Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent c551cd52

hw/tpm/tpm_passthrough.c

+2 −4
Original line number Diff line number Diff line
@@ -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);