qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	amarnath.valluri@intel.com, marcandre.lureau@gmail.com,
	Stefan Berger <stefanb@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PULL v3 01/11] tpm: Use EMSGSIZE instead of EBADMSG to compile on OpenBSD
Date: Fri, 13 Oct 2017 07:44:50 -0400	[thread overview]
Message-ID: <1507895100-26457-2-git-send-email-stefanb@linux.vnet.ibm.com> (raw)
In-Reply-To: <1507895100-26457-1-git-send-email-stefanb@linux.vnet.ibm.com>

EBADMSG was only added to OpenBSD very recently. To make QEMU compilable
on older OpenBSD versions use EMSGSIZE instead when a mismatch between
number of received bytes and message size indicated in the header was
found.

Return -EMSGSIZE and convert all other errnos in the same functions to
return the negative errno.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 hw/tpm/tpm_util.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c
index 7b35429..4484207 100644
--- a/hw/tpm/tpm_util.c
+++ b/hw/tpm/tpm_util.c
@@ -43,10 +43,10 @@ static int tpm_util_test(int fd,
 
     n = write(fd, request, requestlen);
     if (n < 0) {
-        return errno;
+        return -errno;
     }
     if (n != requestlen) {
-        return EFAULT;
+        return -EFAULT;
     }
 
     FD_ZERO(&readfds);
@@ -55,18 +55,18 @@ static int tpm_util_test(int fd,
     /* wait for a second */
     n = select(fd + 1, &readfds, NULL, NULL, &tv);
     if (n != 1) {
-        return errno;
+        return -errno;
     }
 
     n = read(fd, &buf, sizeof(buf));
     if (n < sizeof(struct tpm_resp_hdr)) {
-        return EFAULT;
+        return -EFAULT;
     }
 
     resp = (struct tpm_resp_hdr *)buf;
     /* check the header */
     if (be32_to_cpu(resp->len) != n) {
-        return EBADMSG;
+        return -EMSGSIZE;
     }
 
     *return_tag = be16_to_cpu(resp->tag);
-- 
2.5.5

  reply	other threads:[~2017-10-13 11:45 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-13 11:44 [Qemu-devel] [PULL v3 00/11] Merge tpm 2017/10/04 Stefan Berger
2017-10-13 11:44 ` Stefan Berger [this message]
2017-10-13 11:44 ` [Qemu-devel] [PULL v3 02/11] tpm-backend: Remove unneeded member variable from backend class Stefan Berger
2017-10-13 11:44 ` [Qemu-devel] [PULL v3 03/11] tpm-backend: Move thread handling inside TPMBackend Stefan Berger
2017-10-13 11:44 ` [Qemu-devel] [PULL v3 04/11] tpm-backend: Initialize and free data members in it's own methods Stefan Berger
2017-10-13 11:44 ` [Qemu-devel] [PULL v3 05/11] tpm-backend: Made few interface methods optional Stefan Berger
2017-10-13 11:44 ` [Qemu-devel] [PULL v3 06/11] tpm-backend: Add new API to read backend TpmInfo Stefan Berger
2017-10-13 11:44 ` [Qemu-devel] [PULL v3 07/11] tpm-backend: Move realloc_buffer() implementation to tpm-tis model Stefan Berger
2017-10-13 11:44 ` [Qemu-devel] [PULL v3 08/11] tpm-passthrough: move reusable code to utils Stefan Berger
2017-10-13 11:44 ` [Qemu-devel] [PULL v3 09/11] tpm: Added support for TPM emulator Stefan Berger
2017-10-16 13:40   ` Marc-André Lureau
2017-10-16 13:45     ` Marc-André Lureau
2017-10-13 11:44 ` [Qemu-devel] [PULL v3 10/11] tpm: Move tpm_cleanup() to right place Stefan Berger
2017-10-13 11:45 ` [Qemu-devel] [PULL v3 11/11] specs: Describe the TPM support in QEMU Stefan Berger
2017-10-16 13:27 ` [Qemu-devel] [PULL v3 00/11] Merge tpm 2017/10/04 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1507895100-26457-2-git-send-email-stefanb@linux.vnet.ibm.com \
    --to=stefanb@linux.vnet.ibm.com \
    --cc=amarnath.valluri@intel.com \
    --cc=marcandre.lureau@gmail.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).